From patchwork Mon May 10 10:22:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 433133 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2809798jao; Mon, 10 May 2021 05:51:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJkR9GLuoU++W6ODc58A1xP/VfJzDXGEzZ6G9hVyFwGoq7cIgVWdtExpUGhp2G15w9Qhgy X-Received: by 2002:a17:906:7e51:: with SMTP id z17mr26080007ejr.92.1620651061865; Mon, 10 May 2021 05:51:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620651061; cv=none; d=google.com; s=arc-20160816; b=Su7sYkKpL1tO2TW0ZKRYoYjx1G73bxg2afsN9Lsb2cNSCISfWr2Z+huEbRhFCW3+M+ jfJrNvsdubZcRaAWT7B8rBLeme8HhS61A0DUHe/wbZKipoy8AFChSRX64xGzPRNo7QpR BU8JqSmAyQkE+MNmxsHzdIEvuowF+U3wNKDkgw1ups6mFAp/ExhWLxKckXTNKr2LgBV1 Wb3Ah0eYScU4MOmpRAdD/yN+vrJRxkjncIrtodPK3PbaHHF2hKdYy5Ays0/ilYb2AgGd 6J7MenxLQj/bMOyA62NOiGmf+rWKt+MsH/wiXEWuyTHY7bxx/zAUBO3v0v4kyO9BiQ1n y5JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AfNbeNLm7/O2BEXTzpeO+6NhuXjx6FwcDQYM9g4VbZs=; b=Anf3xkbh2AgOdb3SdPlAHyKMx4eSYkdovcVPHMzxbL/VW+gWASuEBY12rnzkklhxgR Gi7wYeyyV8p8mub7C91elwBxvd4S6/sazHkrn7q4CGQpJ46/L9ZJxxkBdWzLxKBX54Ly rmk9SHxIHsuzeYabeJd6cN1vvp99icU1aS5fj96wDaqisy8La+d6oX/4ZwOIWzN2791L ISTHJQh3Ani9aVj2LM9DDSS5v3WOyuICgIpylGyX7LZ24DQxOHi44EqSSR9F729ZOsQH uVzVUyrkO7SKyEOLLttACokJoJuGLVqXAyi2+QtruL4flDebo2C0C+CVVuwJxMyThska CLpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Vs8RKTyI; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si13500365edw.273.2021.05.10.05.51.01; Mon, 10 May 2021 05:51:01 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Vs8RKTyI; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237619AbhEJLZa (ORCPT + 12 others); Mon, 10 May 2021 07:25:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:56146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237839AbhEJLQS (ORCPT ); Mon, 10 May 2021 07:16:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D77FA6121E; Mon, 10 May 2021 11:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620645103; bh=Xxto7Mn+feCmue7/GFmefvMv7poktspTATqO55nPEhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vs8RKTyIN0dpfd2MD6/m5KNhlNIWo5YD+MKAGZ6g354Vkks6Eb1oBhb+vpkh8NsNk 6pom6/FZAng7yZNRmbrBg8sS6rwxMZAaOvaTy+5HvAlLZZgU1G6Igs8YngbgT6NvM2 Ia3b5fnTMBbxK7VozyCzHNl5wpspAJ/nBV3NOMKE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stanimir Varbanov , Bryan ODonoghue , Mauro Carvalho Chehab Subject: [PATCH 5.12 354/384] media: venus: pm_helpers: Set opp clock name for v1 Date: Mon, 10 May 2021 12:22:23 +0200 Message-Id: <20210510102026.425573254@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stanimir Varbanov commit 3215887167af7db9af9fa23d61321ebfbd6ed6d3 upstream. The rate of the core clock is set through devm_pm_opp_set_rate and to avoid errors from it we have to set the name of the clock via dev_pm_opp_set_clkname. Fixes: 9a538b83612c ("media: venus: core: Add support for opp tables/perf voting") Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Stanimir Varbanov Tested-by: Bryan O'Donoghue Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/qcom/venus/pm_helpers.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -279,7 +279,22 @@ set_freq: static int core_get_v1(struct venus_core *core) { - return core_clks_get(core); + int ret; + + ret = core_clks_get(core); + if (ret) + return ret; + + core->opp_table = dev_pm_opp_set_clkname(core->dev, "core"); + if (IS_ERR(core->opp_table)) + return PTR_ERR(core->opp_table); + + return 0; +} + +static void core_put_v1(struct venus_core *core) +{ + dev_pm_opp_put_clkname(core->opp_table); } static int core_power_v1(struct venus_core *core, int on) @@ -296,6 +311,7 @@ static int core_power_v1(struct venus_co static const struct venus_pm_ops pm_ops_v1 = { .core_get = core_get_v1, + .core_put = core_put_v1, .core_power = core_power_v1, .load_scale = load_scale_v1, }; @@ -368,6 +384,7 @@ static int venc_power_v3(struct device * static const struct venus_pm_ops pm_ops_v3 = { .core_get = core_get_v1, + .core_put = core_put_v1, .core_power = core_power_v1, .vdec_get = vdec_get_v3, .vdec_power = vdec_power_v3,