lkml.org 
[lkml]   [2019]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 56/88] drm/msm: Fix A6XX support for opp-level
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit a3c5e2cd79753121f49a8662c1e0a60ddb5486ca ]

    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 <dianders@chromium.org>
    Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
    Signed-off-by: Rob Clark <robdclark@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 d4e98e5876bc4..00b2e6e94689f 100644
    --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
    +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
    @@ -939,7 +939,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);
    }

    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-04 09:37    [W:4.148 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site