From patchwork Wed Jan 16 18:46:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10766803 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 8EE84139A for ; Wed, 16 Jan 2019 18:46:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E4302EBBC for ; Wed, 16 Jan 2019 18:46:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 711BF2EBDC; Wed, 16 Jan 2019 18:46:35 +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 0CE262EBBC for ; Wed, 16 Jan 2019 18:46:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729369AbfAPSqe (ORCPT ); Wed, 16 Jan 2019 13:46:34 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:34107 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728621AbfAPSqe (ORCPT ); Wed, 16 Jan 2019 13:46:34 -0500 Received: by mail-pg1-f193.google.com with SMTP id j10so3219487pga.1 for ; Wed, 16 Jan 2019 10:46:33 -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:mime-version :content-transfer-encoding; bh=RnFz/AG+HRuZACi2rZk82YB8mLxedD5PZQoVniGXyfQ=; b=STVkav8DfilZnOzHiehqxmSejo1v0eOj0mNIY35HUu5gLp0znTn/MZKXBN+xvoj6sU ZT7r7GPo5/yS+Co1J6S2YZrgPd+RY0qyI4/mWhG/R/idJX1Q/B6FCW0xyjklHJfQ1oQf 35/WwMB1WQlTIStVt44NjsDpsCj0de2H2ffuc= 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:mime-version :content-transfer-encoding; bh=RnFz/AG+HRuZACi2rZk82YB8mLxedD5PZQoVniGXyfQ=; b=tY0nhz0gkuiMRqGRomSqR4XRomWTKc2xptlk6LFe9da81LaM6Hn+0RoEkPzZlha+DF kLfr0UOvBvJFugeBdlenkZHIXei5pWq3U0y0lIxWHNYBmKp4lMslyqH2Ea3FeD7WbryZ X48/BkQWUWw24WxXkvxLZYz1tdtKsyUtmbyBYnUo6Hi2NmgG44K2TRtyBDlwSjhfWZ1m g3XBpTU4f0MXllMUU02A+7XrHl2aqZlY1/mhJ56fnDpCBGHk/ziRskgcdJOqXXvz9LW6 A7AhRxU7BflX9cZpUjc0GV8OH0kKU3is9rYH72aul5z5Q3xhErngo+MKAi7bCZ7/6MSZ oiWw== X-Gm-Message-State: AJcUukeDi5CQEfzmjDv/It1PDoJoYLt/UOa3sgZL7aU0oUffmgDabaxb nCVkeDmygiD2XYlBok8geA0Oag== X-Google-Smtp-Source: ALg8bN6sk5vEhpdPSkL5GIHaDDxV74Y2fGlWV8HtFkHeIwjDzuKGA9g7AvvUpzvHS4DHPKc1nEBELg== X-Received: by 2002:a63:f444:: with SMTP id p4mr10122599pgk.124.1547664392958; Wed, 16 Jan 2019 10:46:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 10:46:32 -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 1/2] drm/msm: Fix A6XX support for opp-level Date: Wed, 16 Jan 2019 10:46:21 -0800 Message-Id: <20190116184623.77136-1-dianders@chromium.org> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog 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 bindings for Qualcomm opp levels changed after being Acked but before landing. Thus the code in the GPU driver that was relying on the old bindings is now broken. Let's change the code to match the new bindings by adjusting the old string 'qcom,level' to the new string 'opp-level'. See the patch ("dt-bindings: opp: Introduce opp-level bindings"). NOTE: we will do additional cleanup to totally remove the string from the code and use the new dev_pm_opp_get_level() but we'll do it in a future patch. This will facilitate getting the important code fix in sooner without having to deal with cross-maintainer dependencies. This patch needs to land before the patch ("arm64: dts: sdm845: Add gpu and gmu device nodes") since if a tree contains the device tree patch but not this one you'll get a crash at bootup. Fixes: 4b565ca5a2cb ("drm/msm: Add A6XX device support") Signed-off-by: Douglas Anderson Reviewed-by: Jordan Crouse --- Changes in v2: - Split into two patches to facilitate landing. drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 5beb83d1cf87..ce1b3cc4bf6d 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -944,7 +944,7 @@ static u32 a6xx_gmu_get_arc_level(struct device *dev, unsigned long freq) np = dev_pm_opp_get_of_node(opp); if (np) { - of_property_read_u32(np, "qcom,level", &val); + of_property_read_u32(np, "opp-level", &val); of_node_put(np); }