From patchwork Wed Jan 16 18:46:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10766807 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 16EE1139A for ; Wed, 16 Jan 2019 18:46:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 075352EBBA for ; Wed, 16 Jan 2019 18:46:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF2E02EBDC; Wed, 16 Jan 2019 18:46:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 922B52EBBA for ; Wed, 16 Jan 2019 18:46:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729022AbfAPSqg (ORCPT ); Wed, 16 Jan 2019 13:46:36 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38319 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729445AbfAPSqf (ORCPT ); Wed, 16 Jan 2019 13:46:35 -0500 Received: by mail-pg1-f195.google.com with SMTP id g189so3208341pgc.5 for ; Wed, 16 Jan 2019 10:46:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FU7vnujm7PFqQbun8zmDwXg0wlx5eTmKlDoI+BggiOU=; b=KrGLquoODRhwxeMU7zgaKr61t6GHgp3yL7dO1D3O4j+XaXhhLQfp00LkNE4wYTeeJ1 GBBj8fZlb2U8a+HH5VsLf/stDaGODzNt4HXXsUQH90UOVbh5k+7DN8gibqYRFDZsuPkf 4z1j4KHKTLXP57jkQj9CThndsjF0hQboeqpkw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FU7vnujm7PFqQbun8zmDwXg0wlx5eTmKlDoI+BggiOU=; b=oUgxTWxp1vK01XI8Cizc1UsSTumzsfJ2WGs8wGH2oT8j2qMcrunZN4qa6dlskJg5vv LG3BLbDbfkrRKtIZc5v91NYte7yWm/Dcva6LfH4Ivg1ypofDdE1Ap2h2Hb3DiO083WCN 8qLmdyr2XTx0eUsNxvoJq+H40ZmfXokaE95pGjGSV1tEWNswNknL//Aa6wbReaiJRQSG I+5LnbbfjOYp7FFC9vRh2EeZQWspTEH70pghvwrPvnYcNVGyBGpmvRkKbZG5gDUVZj+k K+S8EDgNjoKTjwKYmvHmP6n20FJAjkcqyNBfjlz9ubhVw1o7M2EAMq90WBws8oggUBFA sTNA== X-Gm-Message-State: AJcUukfnOcVmyrKU6Rdy8E6KRYJoGACx07cFnnyVEtiD+pEoozOc9yTW GwZ5O5moR1H82ueX2y+Jl6WfPw== X-Google-Smtp-Source: ALg8bN415uNxmPPZwJn8lkLzuqEUKrI/rXNceInBgwImlGAIb5dSZBe4/+wy2j3BE49nDqGts9qTLw== X-Received: by 2002:a62:6ec8:: with SMTP id j191mr11252708pfc.198.1547664394565; Wed, 16 Jan 2019 10:46:34 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id k186sm8138902pge.13.2019.01.16.10.46.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 10:46:33 -0800 (PST) From: Douglas Anderson To: Rob Clark , Jordan Crouse Cc: Bjorn Andersson , Stephen Boyd , Rajendra Nayak , Andy Gross , linux-arm-msm@vger.kernel.org, Viresh Kumar , "Kristian H . Kristensen" , Douglas Anderson , Colin Ian King , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sharat Masetty , David Airlie , freedreno@lists.freedesktop.org, Mamta Shukla , Daniel Vetter Subject: [PATCH v2 2/2] drm/msm: Cleanup A6XX opp-level reading Date: Wed, 16 Jan 2019 10:46:22 -0800 Message-Id: <20190116184623.77136-2-dianders@chromium.org> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog In-Reply-To: <20190116184623.77136-1-dianders@chromium.org> References: <20190116184623.77136-1-dianders@chromium.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ("OPP: Add support for parsing the 'opp-level' property") adds an API enabling a cleaner way to read the opp-level. Let's use the new API. Signed-off-by: Douglas Anderson Reviewed-by: Jordan Crouse --- Obviously this can't land until we have a tree that contains the patch adding the API. I believe that means we'll want to target this patch for 5.2. Luckily it's fine to wait since this patch has no functional changes--it's all cleanup. Changes in v2: - Split into two patches to facilitate landing. drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index ce1b3cc4bf6d..900f18dc1577 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -928,25 +928,20 @@ static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu) } /* Return the 'arc-level' for the given frequency */ -static u32 a6xx_gmu_get_arc_level(struct device *dev, unsigned long freq) +static unsigned int a6xx_gmu_get_arc_level(struct device *dev, + unsigned long freq) { struct dev_pm_opp *opp; - struct device_node *np; - u32 val = 0; + unsigned int val; if (!freq) return 0; - opp = dev_pm_opp_find_freq_exact(dev, freq, true); + opp = dev_pm_opp_find_freq_exact(dev, freq, true); if (IS_ERR(opp)) return 0; - np = dev_pm_opp_get_of_node(opp); - - if (np) { - of_property_read_u32(np, "opp-level", &val); - of_node_put(np); - } + val = dev_pm_opp_get_level(opp); dev_pm_opp_put(opp); @@ -982,7 +977,7 @@ static int a6xx_gmu_rpmh_arc_votes_init(struct device *dev, u32 *votes, /* Construct a vote for each frequency */ for (i = 0; i < freqs_count; i++) { u8 pindex = 0, sindex = 0; - u32 level = a6xx_gmu_get_arc_level(dev, freqs[i]); + unsigned int level = a6xx_gmu_get_arc_level(dev, freqs[i]); /* Get the primary index that matches the arc level */ for (j = 0; j < pri_count; j++) {