From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53061C433E6 for ; Tue, 1 Sep 2020 15:53:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1DBA3208CA for ; Tue, 1 Sep 2020 15:53:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TBqWWrSB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731108AbgIAPxJ (ORCPT ); Tue, 1 Sep 2020 11:53:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728069AbgIAPxG (ORCPT ); Tue, 1 Sep 2020 11:53:06 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E135C061244; Tue, 1 Sep 2020 08:53:05 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id m6so2129976wrn.0; Tue, 01 Sep 2020 08:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=BY4bXKc0xSgKW8hDeDD9u95KOuc3RBx/gc2Fu/W48eQ=; b=TBqWWrSB1mvUqsytHINsQUCpaD6PqLh3UsHJMRUkGwH/66biENmlSfUhshtvyFx1Jl Xm0W8v8iKkFOcdwlTL6nLnBqWo29CyX2TENRlw+7jc3NGK86XiruLidBhNmVttRUPs36 LfzPsLKO8sOVbxnG5K3VaHG3CgZEMEConRc7AIKSnvCz2lQI2jXmSmo47D3DH2EVKIe7 +716NNemet7lsA6Cel/JHnqqvzqRw7d6Q0bdmZn91FGsOYklnoY9Pd5xUlgENa1Qnr3l Vr9BpGca6oaWmy2J9JHDdL7RKAd04P1S/x/kgTGyfh+1EOOPBVSqethI5oTYr8bLFwhE x5mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BY4bXKc0xSgKW8hDeDD9u95KOuc3RBx/gc2Fu/W48eQ=; b=d3ULZkh+M833FFKHtexqLP2qO8fjVm0TM2DILjA7EGw4XLLl7TL+rTtgIwQ0fR6eqe s3XP/4HhiO5SpB7KwoayWRPX6rX9RuND8FNHddCNG/U38+fkrnRVRhrIK7VZjISOuAbY 6RX8KJy1hfqypnwUQc85rQILwed7NLmHWe2RGZTXbXCDf14en50fh5gznf13t601mnsa gVO37b0AnMTWJSGmFN20yPi9g+9GnH1OSsTlBAkmhwO97TlBPcS7Nh8nvLJkGfRMpTaO 4lxWWdJ/iK7J3vgNWUpGHdWgwAO+8XQCao/17JRqA1ph4qJQE4WuFLb7oJKpaLvf6agp Be2A== X-Gm-Message-State: AOAM530qMYOzCJYnkZ4sQsMCf1/yo9buycPZU1LxsDzx9hADpgpQzM06 ncxq+B2a0yZU6ZgOilWFytqW/0lyeNTOBchgm3I= X-Google-Smtp-Source: ABdhPJzDoeC0Pb4kh7G7ViZBofzjFA7/roqtprdLHZ43CwlP1yJxepquJBwNWHIMnMPZtjY/Vti5ADETxrYodXZvEfo= X-Received: by 2002:adf:f382:: with SMTP id m2mr2458894wro.327.1598975584169; Tue, 01 Sep 2020 08:53:04 -0700 (PDT) MIME-Version: 1.0 References: <20200810222657.1841322-1-jcrouse@codeaurora.org> <20200814024114.1177553-7-robdclark@gmail.com> <20200901043211.GN3715@yoga> In-Reply-To: <20200901043211.GN3715@yoga> From: Rob Clark Date: Tue, 1 Sep 2020 08:53:50 -0700 Message-ID: Subject: Re: [PATCH 06/19] drm/msm/gpu: add dev_to_gpu() helper To: Bjorn Andersson Cc: dri-devel , "list@263.net:IOMMU DRIVERS , Joerg Roedel ," , linux-arm-msm , Sai Prakash Ranjan , Will Deacon , freedreno , Sibi Sankar , Vivek Gautam , Stephen Boyd , Robin Murphy , Joerg Roedel , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Jonathan Marek , Sharat Masetty , Shawn Guo , AngeloGioacchino Del Regno , open list Content-Type: text/plain; charset="UTF-8" Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Mon, Aug 31, 2020 at 9:32 PM Bjorn Andersson wrote: > > On Thu 13 Aug 21:41 CDT 2020, Rob Clark wrote: > > > From: Rob Clark > > > > In a later patch, the drvdata will not directly be 'struct msm_gpu *', > > so add a helper to reduce the churn. > > > > Signed-off-by: Rob Clark > > --- > > drivers/gpu/drm/msm/adreno/adreno_device.c | 10 ++++------ > > drivers/gpu/drm/msm/msm_gpu.c | 6 +++--- > > drivers/gpu/drm/msm/msm_gpu.h | 5 +++++ > > 3 files changed, 12 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c > > index 9eeb46bf2a5d..26664e1b30c0 100644 > > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c > > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c > > @@ -282,7 +282,7 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) > > int ret; > > > > if (pdev) > > - gpu = platform_get_drvdata(pdev); > > + gpu = dev_to_gpu(&pdev->dev); > > > > if (!gpu) { > > dev_err_once(dev->dev, "no GPU device was found\n"); > > @@ -425,7 +425,7 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) > > static void adreno_unbind(struct device *dev, struct device *master, > > void *data) > > { > > - struct msm_gpu *gpu = dev_get_drvdata(dev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > pm_runtime_force_suspend(dev); > > gpu->funcs->destroy(gpu); > > @@ -490,16 +490,14 @@ static const struct of_device_id dt_match[] = { > > #ifdef CONFIG_PM > > static int adreno_resume(struct device *dev) > > { > > - struct platform_device *pdev = to_platform_device(dev); > > - struct msm_gpu *gpu = platform_get_drvdata(pdev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > return gpu->funcs->pm_resume(gpu); > > } > > > > static int adreno_suspend(struct device *dev) > > { > > - struct platform_device *pdev = to_platform_device(dev); > > - struct msm_gpu *gpu = platform_get_drvdata(pdev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > return gpu->funcs->pm_suspend(gpu); > > } > > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > > index d5645472b25d..6aa9e04e52e7 100644 > > --- a/drivers/gpu/drm/msm/msm_gpu.c > > +++ b/drivers/gpu/drm/msm/msm_gpu.c > > @@ -24,7 +24,7 @@ > > static int msm_devfreq_target(struct device *dev, unsigned long *freq, > > u32 flags) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > struct dev_pm_opp *opp; > > > > opp = devfreq_recommended_opp(dev, freq, flags); > > @@ -45,7 +45,7 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq, > > static int msm_devfreq_get_dev_status(struct device *dev, > > struct devfreq_dev_status *status) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > ktime_t time; > > > > if (gpu->funcs->gpu_get_freq) > > @@ -64,7 +64,7 @@ static int msm_devfreq_get_dev_status(struct device *dev, > > > > static int msm_devfreq_get_cur_freq(struct device *dev, unsigned long *freq) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > if (gpu->funcs->gpu_get_freq) > > *freq = gpu->funcs->gpu_get_freq(gpu); > > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > > index 0db117a7339b..8bda7beaed4b 100644 > > --- a/drivers/gpu/drm/msm/msm_gpu.h > > +++ b/drivers/gpu/drm/msm/msm_gpu.h > > @@ -141,6 +141,11 @@ struct msm_gpu { > > struct msm_gpu_state *crashstate; > > }; > > > > +static inline struct msm_gpu *dev_to_gpu(struct device *dev) > > That's a fairly generic name for a driver-global helper :) tbf, it is only global to the gpu part of the driver.. thanks for the review BR, -R > Reviewed-by: Bjorn Andersson > > Regards, > Bjorn > > > +{ > > + return dev_get_drvdata(dev); > > +} > > + > > /* It turns out that all targets use the same ringbuffer size */ > > #define MSM_GPU_RINGBUFFER_SZ SZ_32K > > #define MSM_GPU_RINGBUFFER_BLKSIZE 32 > > -- > > 2.26.2 > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FB1CC433E7 for ; Tue, 1 Sep 2020 15:53:14 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 53E65206EB for ; Tue, 1 Sep 2020 15:53:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TBqWWrSB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 53E65206EB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E2C48220B2; Tue, 1 Sep 2020 15:53:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QJbczhVhFtAE; Tue, 1 Sep 2020 15:53:11 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 0064120010; Tue, 1 Sep 2020 15:53:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CAAADC07FF; Tue, 1 Sep 2020 15:53:10 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id CCACBC0051 for ; Tue, 1 Sep 2020 15:53:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B812420010 for ; Tue, 1 Sep 2020 15:53:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y3hpBrr0BZsc for ; Tue, 1 Sep 2020 15:53:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by silver.osuosl.org (Postfix) with ESMTPS id 2548E274B0 for ; Tue, 1 Sep 2020 15:53:06 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id t10so1270471wrv.1 for ; Tue, 01 Sep 2020 08:53:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=BY4bXKc0xSgKW8hDeDD9u95KOuc3RBx/gc2Fu/W48eQ=; b=TBqWWrSB1mvUqsytHINsQUCpaD6PqLh3UsHJMRUkGwH/66biENmlSfUhshtvyFx1Jl Xm0W8v8iKkFOcdwlTL6nLnBqWo29CyX2TENRlw+7jc3NGK86XiruLidBhNmVttRUPs36 LfzPsLKO8sOVbxnG5K3VaHG3CgZEMEConRc7AIKSnvCz2lQI2jXmSmo47D3DH2EVKIe7 +716NNemet7lsA6Cel/JHnqqvzqRw7d6Q0bdmZn91FGsOYklnoY9Pd5xUlgENa1Qnr3l Vr9BpGca6oaWmy2J9JHDdL7RKAd04P1S/x/kgTGyfh+1EOOPBVSqethI5oTYr8bLFwhE x5mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BY4bXKc0xSgKW8hDeDD9u95KOuc3RBx/gc2Fu/W48eQ=; b=STnZWHkAg8VpICa4EHtShyv254wHtZdaOuZyinJsyhDRUUerv/m0+Wnk2S/vRNMRbf eUu3d16mg7MyQJ5RwSQLJWMR1KiWcb7bC6agqcm96WS2LUjzcBA19Nog6HsVjcgl6WS+ +cinqJgPFObr2MG02bgwxaMIOMJu/ZFBwN7wA8HlTxo8VVKo5Dqp4XMkeI9sYhfEabIJ 2YOsIpDzMT5hZeL6oR5r9U2bSz2Jd1AYtgWhKFC3q+Cfw+Zsri4ESW53tP2k5mHTlZUF x/jfZm1qXcowr0DvaII4qBqZHjvNVmFi9w5d3smPdl2sLJHHmK+O19OFU+zWmUMa9k3x +dEQ== X-Gm-Message-State: AOAM531+MB0wz8jTyfYrxXSqJhxG3H5Lvf4XVscpw/0kMJsLRlY6C81d rK1t9ieqYGi8+4CryDRxYhbjWmmLneAMWyMEHE4= X-Google-Smtp-Source: ABdhPJzDoeC0Pb4kh7G7ViZBofzjFA7/roqtprdLHZ43CwlP1yJxepquJBwNWHIMnMPZtjY/Vti5ADETxrYodXZvEfo= X-Received: by 2002:adf:f382:: with SMTP id m2mr2458894wro.327.1598975584169; Tue, 01 Sep 2020 08:53:04 -0700 (PDT) MIME-Version: 1.0 References: <20200810222657.1841322-1-jcrouse@codeaurora.org> <20200814024114.1177553-7-robdclark@gmail.com> <20200901043211.GN3715@yoga> In-Reply-To: <20200901043211.GN3715@yoga> From: Rob Clark Date: Tue, 1 Sep 2020 08:53:50 -0700 Message-ID: Subject: Re: [PATCH 06/19] drm/msm/gpu: add dev_to_gpu() helper To: Bjorn Andersson Cc: David Airlie , dri-devel , Vivek Gautam , AngeloGioacchino Del Regno , Will Deacon , Rob Clark , Jonathan Marek , Sibi Sankar , linux-arm-msm , Sharat Masetty , Stephen Boyd , Sean Paul , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , freedreno , open list , "list@263.net:IOMMU DRIVERS , Joerg Roedel , " , Daniel Vetter , Shawn Guo , Robin Murphy X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Mon, Aug 31, 2020 at 9:32 PM Bjorn Andersson wrote: > > On Thu 13 Aug 21:41 CDT 2020, Rob Clark wrote: > > > From: Rob Clark > > > > In a later patch, the drvdata will not directly be 'struct msm_gpu *', > > so add a helper to reduce the churn. > > > > Signed-off-by: Rob Clark > > --- > > drivers/gpu/drm/msm/adreno/adreno_device.c | 10 ++++------ > > drivers/gpu/drm/msm/msm_gpu.c | 6 +++--- > > drivers/gpu/drm/msm/msm_gpu.h | 5 +++++ > > 3 files changed, 12 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c > > index 9eeb46bf2a5d..26664e1b30c0 100644 > > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c > > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c > > @@ -282,7 +282,7 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) > > int ret; > > > > if (pdev) > > - gpu = platform_get_drvdata(pdev); > > + gpu = dev_to_gpu(&pdev->dev); > > > > if (!gpu) { > > dev_err_once(dev->dev, "no GPU device was found\n"); > > @@ -425,7 +425,7 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) > > static void adreno_unbind(struct device *dev, struct device *master, > > void *data) > > { > > - struct msm_gpu *gpu = dev_get_drvdata(dev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > pm_runtime_force_suspend(dev); > > gpu->funcs->destroy(gpu); > > @@ -490,16 +490,14 @@ static const struct of_device_id dt_match[] = { > > #ifdef CONFIG_PM > > static int adreno_resume(struct device *dev) > > { > > - struct platform_device *pdev = to_platform_device(dev); > > - struct msm_gpu *gpu = platform_get_drvdata(pdev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > return gpu->funcs->pm_resume(gpu); > > } > > > > static int adreno_suspend(struct device *dev) > > { > > - struct platform_device *pdev = to_platform_device(dev); > > - struct msm_gpu *gpu = platform_get_drvdata(pdev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > return gpu->funcs->pm_suspend(gpu); > > } > > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > > index d5645472b25d..6aa9e04e52e7 100644 > > --- a/drivers/gpu/drm/msm/msm_gpu.c > > +++ b/drivers/gpu/drm/msm/msm_gpu.c > > @@ -24,7 +24,7 @@ > > static int msm_devfreq_target(struct device *dev, unsigned long *freq, > > u32 flags) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > struct dev_pm_opp *opp; > > > > opp = devfreq_recommended_opp(dev, freq, flags); > > @@ -45,7 +45,7 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq, > > static int msm_devfreq_get_dev_status(struct device *dev, > > struct devfreq_dev_status *status) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > ktime_t time; > > > > if (gpu->funcs->gpu_get_freq) > > @@ -64,7 +64,7 @@ static int msm_devfreq_get_dev_status(struct device *dev, > > > > static int msm_devfreq_get_cur_freq(struct device *dev, unsigned long *freq) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > if (gpu->funcs->gpu_get_freq) > > *freq = gpu->funcs->gpu_get_freq(gpu); > > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > > index 0db117a7339b..8bda7beaed4b 100644 > > --- a/drivers/gpu/drm/msm/msm_gpu.h > > +++ b/drivers/gpu/drm/msm/msm_gpu.h > > @@ -141,6 +141,11 @@ struct msm_gpu { > > struct msm_gpu_state *crashstate; > > }; > > > > +static inline struct msm_gpu *dev_to_gpu(struct device *dev) > > That's a fairly generic name for a driver-global helper :) tbf, it is only global to the gpu part of the driver.. thanks for the review BR, -R > Reviewed-by: Bjorn Andersson > > Regards, > Bjorn > > > +{ > > + return dev_get_drvdata(dev); > > +} > > + > > /* It turns out that all targets use the same ringbuffer size */ > > #define MSM_GPU_RINGBUFFER_SZ SZ_32K > > #define MSM_GPU_RINGBUFFER_BLKSIZE 32 > > -- > > 2.26.2 > > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C74BC433E6 for ; Tue, 1 Sep 2020 15:54:51 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 153B12064B for ; Tue, 1 Sep 2020 15:54:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IAn5xvIN"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TBqWWrSB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 153B12064B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EBGGcYr2TCJ6h9gRtzJzigEMBJM2mhxChihVq6wGp90=; b=IAn5xvINcH8WhOwxouSPzVj0k P0yHlYI5FG5drmswXhpBeKelC1REQrtDW5+6NncW6dt1Il9KUAy9y3xDXN4ZQyVxWYKEAWjTUtW6Y zuZ8wrT5ppmytLIjGrUNx1A3Ytw2fR7iz6IRPDYcE5hP14l9fyhEYNWwXnduzenUcT6Ptz90wKXbs zRiJWcLF83qOe9a+2/D4CJaPC9edj/5nZDehw+UGRqnbYRMVP6wh4DHU1mL3PRbtrqoqVJ6+sDiVh hRtIRH/S0AyixxcVoTFvZOTme2zbIa5ThyZIwqzw/SmY1utXQUGYYMWBGmNnl89sq6KcGkG3zV5GD T0NY+ua4Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kD8aq-0001dd-KQ; Tue, 01 Sep 2020 15:53:08 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kD8an-0001d0-Cx for linux-arm-kernel@lists.infradead.org; Tue, 01 Sep 2020 15:53:06 +0000 Received: by mail-wr1-x441.google.com with SMTP id z4so2113323wrr.4 for ; Tue, 01 Sep 2020 08:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=BY4bXKc0xSgKW8hDeDD9u95KOuc3RBx/gc2Fu/W48eQ=; b=TBqWWrSB1mvUqsytHINsQUCpaD6PqLh3UsHJMRUkGwH/66biENmlSfUhshtvyFx1Jl Xm0W8v8iKkFOcdwlTL6nLnBqWo29CyX2TENRlw+7jc3NGK86XiruLidBhNmVttRUPs36 LfzPsLKO8sOVbxnG5K3VaHG3CgZEMEConRc7AIKSnvCz2lQI2jXmSmo47D3DH2EVKIe7 +716NNemet7lsA6Cel/JHnqqvzqRw7d6Q0bdmZn91FGsOYklnoY9Pd5xUlgENa1Qnr3l Vr9BpGca6oaWmy2J9JHDdL7RKAd04P1S/x/kgTGyfh+1EOOPBVSqethI5oTYr8bLFwhE x5mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BY4bXKc0xSgKW8hDeDD9u95KOuc3RBx/gc2Fu/W48eQ=; b=Oe4VVuWtjJtyrfYAKVBazq8ipcaTOKZHfryBJ9YAxDEGS9PkTYoMaqWBK/ORQZdJte Qg6+llSRavlfCdFRFYGIR0JK5g1CM869vDAQ69lebXrEr5xv4AnZsZiZLMZEuMXCyfGF zdAtq59R3Uv+AvjxXVMklMnXuZHWYsBjoKxbT47f76i7Tr3Ms3CmKcUAx/vtIwQVS81m 35yGGNpBtA2MTlegTI/QVZduvtxL5B+eT65KqilPdySX7sTh+xgZuzZHQQMHBHycc/n1 VfWY2RBE/awIQLFW8SPnno7M71WEp3bRcJBp0Ndleyta/m2TVUcp0JNcXDOeXXteyf5s 6zEw== X-Gm-Message-State: AOAM533vICwpupeoz/mlpoS2UZNDJybJ42V3In/2rzAVxEj1lrsM4bgE 9xsxJAgeAjsWnHTsTNGwneW1vjrI85VJB6IdP8w= X-Google-Smtp-Source: ABdhPJzDoeC0Pb4kh7G7ViZBofzjFA7/roqtprdLHZ43CwlP1yJxepquJBwNWHIMnMPZtjY/Vti5ADETxrYodXZvEfo= X-Received: by 2002:adf:f382:: with SMTP id m2mr2458894wro.327.1598975584169; Tue, 01 Sep 2020 08:53:04 -0700 (PDT) MIME-Version: 1.0 References: <20200810222657.1841322-1-jcrouse@codeaurora.org> <20200814024114.1177553-7-robdclark@gmail.com> <20200901043211.GN3715@yoga> In-Reply-To: <20200901043211.GN3715@yoga> From: Rob Clark Date: Tue, 1 Sep 2020 08:53:50 -0700 Message-ID: Subject: Re: [PATCH 06/19] drm/msm/gpu: add dev_to_gpu() helper To: Bjorn Andersson X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200901_115305_447072_B0B313DC X-CRM114-Status: GOOD ( 26.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , dri-devel , Vivek Gautam , AngeloGioacchino Del Regno , Will Deacon , Rob Clark , Sai Prakash Ranjan , Jonathan Marek , Joerg Roedel , Sibi Sankar , linux-arm-msm , Sharat Masetty , Stephen Boyd , Jordan Crouse , Sean Paul , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , freedreno , open list , "list@263.net:IOMMU DRIVERS , Joerg Roedel , " , Daniel Vetter , Shawn Guo , Robin Murphy Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Aug 31, 2020 at 9:32 PM Bjorn Andersson wrote: > > On Thu 13 Aug 21:41 CDT 2020, Rob Clark wrote: > > > From: Rob Clark > > > > In a later patch, the drvdata will not directly be 'struct msm_gpu *', > > so add a helper to reduce the churn. > > > > Signed-off-by: Rob Clark > > --- > > drivers/gpu/drm/msm/adreno/adreno_device.c | 10 ++++------ > > drivers/gpu/drm/msm/msm_gpu.c | 6 +++--- > > drivers/gpu/drm/msm/msm_gpu.h | 5 +++++ > > 3 files changed, 12 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c > > index 9eeb46bf2a5d..26664e1b30c0 100644 > > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c > > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c > > @@ -282,7 +282,7 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) > > int ret; > > > > if (pdev) > > - gpu = platform_get_drvdata(pdev); > > + gpu = dev_to_gpu(&pdev->dev); > > > > if (!gpu) { > > dev_err_once(dev->dev, "no GPU device was found\n"); > > @@ -425,7 +425,7 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) > > static void adreno_unbind(struct device *dev, struct device *master, > > void *data) > > { > > - struct msm_gpu *gpu = dev_get_drvdata(dev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > pm_runtime_force_suspend(dev); > > gpu->funcs->destroy(gpu); > > @@ -490,16 +490,14 @@ static const struct of_device_id dt_match[] = { > > #ifdef CONFIG_PM > > static int adreno_resume(struct device *dev) > > { > > - struct platform_device *pdev = to_platform_device(dev); > > - struct msm_gpu *gpu = platform_get_drvdata(pdev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > return gpu->funcs->pm_resume(gpu); > > } > > > > static int adreno_suspend(struct device *dev) > > { > > - struct platform_device *pdev = to_platform_device(dev); > > - struct msm_gpu *gpu = platform_get_drvdata(pdev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > return gpu->funcs->pm_suspend(gpu); > > } > > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > > index d5645472b25d..6aa9e04e52e7 100644 > > --- a/drivers/gpu/drm/msm/msm_gpu.c > > +++ b/drivers/gpu/drm/msm/msm_gpu.c > > @@ -24,7 +24,7 @@ > > static int msm_devfreq_target(struct device *dev, unsigned long *freq, > > u32 flags) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > struct dev_pm_opp *opp; > > > > opp = devfreq_recommended_opp(dev, freq, flags); > > @@ -45,7 +45,7 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq, > > static int msm_devfreq_get_dev_status(struct device *dev, > > struct devfreq_dev_status *status) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > ktime_t time; > > > > if (gpu->funcs->gpu_get_freq) > > @@ -64,7 +64,7 @@ static int msm_devfreq_get_dev_status(struct device *dev, > > > > static int msm_devfreq_get_cur_freq(struct device *dev, unsigned long *freq) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > if (gpu->funcs->gpu_get_freq) > > *freq = gpu->funcs->gpu_get_freq(gpu); > > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > > index 0db117a7339b..8bda7beaed4b 100644 > > --- a/drivers/gpu/drm/msm/msm_gpu.h > > +++ b/drivers/gpu/drm/msm/msm_gpu.h > > @@ -141,6 +141,11 @@ struct msm_gpu { > > struct msm_gpu_state *crashstate; > > }; > > > > +static inline struct msm_gpu *dev_to_gpu(struct device *dev) > > That's a fairly generic name for a driver-global helper :) tbf, it is only global to the gpu part of the driver.. thanks for the review BR, -R > Reviewed-by: Bjorn Andersson > > Regards, > Bjorn > > > +{ > > + return dev_get_drvdata(dev); > > +} > > + > > /* It turns out that all targets use the same ringbuffer size */ > > #define MSM_GPU_RINGBUFFER_SZ SZ_32K > > #define MSM_GPU_RINGBUFFER_BLKSIZE 32 > > -- > > 2.26.2 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4D5AC433E7 for ; Tue, 1 Sep 2020 15:53:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B8F32064B for ; Tue, 1 Sep 2020 15:53:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TBqWWrSB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B8F32064B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B3A16E87C; Tue, 1 Sep 2020 15:53:06 +0000 (UTC) Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCC296E87C; Tue, 1 Sep 2020 15:53:05 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id o5so2082456wrn.13; Tue, 01 Sep 2020 08:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=BY4bXKc0xSgKW8hDeDD9u95KOuc3RBx/gc2Fu/W48eQ=; b=TBqWWrSB1mvUqsytHINsQUCpaD6PqLh3UsHJMRUkGwH/66biENmlSfUhshtvyFx1Jl Xm0W8v8iKkFOcdwlTL6nLnBqWo29CyX2TENRlw+7jc3NGK86XiruLidBhNmVttRUPs36 LfzPsLKO8sOVbxnG5K3VaHG3CgZEMEConRc7AIKSnvCz2lQI2jXmSmo47D3DH2EVKIe7 +716NNemet7lsA6Cel/JHnqqvzqRw7d6Q0bdmZn91FGsOYklnoY9Pd5xUlgENa1Qnr3l Vr9BpGca6oaWmy2J9JHDdL7RKAd04P1S/x/kgTGyfh+1EOOPBVSqethI5oTYr8bLFwhE x5mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BY4bXKc0xSgKW8hDeDD9u95KOuc3RBx/gc2Fu/W48eQ=; b=QWQGStMmckON0679kxr4WdpFL9mB5ApsTOSPb6w9aLDXeQhB87AcUG8U+bNDViHRmj 6ShOOM7vxYCaMJjsW9aLN5xJ+C7Qb/gUbdKaPZauqUQ40DoqsmlAnSyaETMYCnxjAQkO gb3ovV31Mi/QPRejS8qUEJs6mkszy3aSFkmyRuAjgRkyWFE/ZO7y/lK4TgRm3VtqAoG5 r7UIk6y4gAgue17vFm9TUtyUDjuolDIqPrdAALYAOgEZvbPtxZ+ydVQkDLQnCV60eBTG XYGwQ6L5UQyfglXLqfaoNnAKbTTdpbS+TwU5dK8je+ftXJjOvJd+zQMnif0CxEDAQyF5 kDjw== X-Gm-Message-State: AOAM531PoHf72niVRAWEr9iN9A9Hlu7aao+wXS/cjBmlIGHaleKsbEF1 4yVtwSHJfcxf2Zr1j/vpzciWLua7NLrlEhdJo/g= X-Google-Smtp-Source: ABdhPJzDoeC0Pb4kh7G7ViZBofzjFA7/roqtprdLHZ43CwlP1yJxepquJBwNWHIMnMPZtjY/Vti5ADETxrYodXZvEfo= X-Received: by 2002:adf:f382:: with SMTP id m2mr2458894wro.327.1598975584169; Tue, 01 Sep 2020 08:53:04 -0700 (PDT) MIME-Version: 1.0 References: <20200810222657.1841322-1-jcrouse@codeaurora.org> <20200814024114.1177553-7-robdclark@gmail.com> <20200901043211.GN3715@yoga> In-Reply-To: <20200901043211.GN3715@yoga> From: Rob Clark Date: Tue, 1 Sep 2020 08:53:50 -0700 Message-ID: Subject: Re: [PATCH 06/19] drm/msm/gpu: add dev_to_gpu() helper To: Bjorn Andersson X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , dri-devel , Vivek Gautam , AngeloGioacchino Del Regno , Will Deacon , Rob Clark , Sai Prakash Ranjan , Jonathan Marek , Joerg Roedel , Sibi Sankar , linux-arm-msm , Sharat Masetty , Stephen Boyd , Sean Paul , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , freedreno , open list , "list@263.net:IOMMU DRIVERS , Joerg Roedel , " , Robin Murphy Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Aug 31, 2020 at 9:32 PM Bjorn Andersson wrote: > > On Thu 13 Aug 21:41 CDT 2020, Rob Clark wrote: > > > From: Rob Clark > > > > In a later patch, the drvdata will not directly be 'struct msm_gpu *', > > so add a helper to reduce the churn. > > > > Signed-off-by: Rob Clark > > --- > > drivers/gpu/drm/msm/adreno/adreno_device.c | 10 ++++------ > > drivers/gpu/drm/msm/msm_gpu.c | 6 +++--- > > drivers/gpu/drm/msm/msm_gpu.h | 5 +++++ > > 3 files changed, 12 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c > > index 9eeb46bf2a5d..26664e1b30c0 100644 > > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c > > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c > > @@ -282,7 +282,7 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev) > > int ret; > > > > if (pdev) > > - gpu = platform_get_drvdata(pdev); > > + gpu = dev_to_gpu(&pdev->dev); > > > > if (!gpu) { > > dev_err_once(dev->dev, "no GPU device was found\n"); > > @@ -425,7 +425,7 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) > > static void adreno_unbind(struct device *dev, struct device *master, > > void *data) > > { > > - struct msm_gpu *gpu = dev_get_drvdata(dev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > pm_runtime_force_suspend(dev); > > gpu->funcs->destroy(gpu); > > @@ -490,16 +490,14 @@ static const struct of_device_id dt_match[] = { > > #ifdef CONFIG_PM > > static int adreno_resume(struct device *dev) > > { > > - struct platform_device *pdev = to_platform_device(dev); > > - struct msm_gpu *gpu = platform_get_drvdata(pdev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > return gpu->funcs->pm_resume(gpu); > > } > > > > static int adreno_suspend(struct device *dev) > > { > > - struct platform_device *pdev = to_platform_device(dev); > > - struct msm_gpu *gpu = platform_get_drvdata(pdev); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > return gpu->funcs->pm_suspend(gpu); > > } > > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > > index d5645472b25d..6aa9e04e52e7 100644 > > --- a/drivers/gpu/drm/msm/msm_gpu.c > > +++ b/drivers/gpu/drm/msm/msm_gpu.c > > @@ -24,7 +24,7 @@ > > static int msm_devfreq_target(struct device *dev, unsigned long *freq, > > u32 flags) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > struct dev_pm_opp *opp; > > > > opp = devfreq_recommended_opp(dev, freq, flags); > > @@ -45,7 +45,7 @@ static int msm_devfreq_target(struct device *dev, unsigned long *freq, > > static int msm_devfreq_get_dev_status(struct device *dev, > > struct devfreq_dev_status *status) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > ktime_t time; > > > > if (gpu->funcs->gpu_get_freq) > > @@ -64,7 +64,7 @@ static int msm_devfreq_get_dev_status(struct device *dev, > > > > static int msm_devfreq_get_cur_freq(struct device *dev, unsigned long *freq) > > { > > - struct msm_gpu *gpu = platform_get_drvdata(to_platform_device(dev)); > > + struct msm_gpu *gpu = dev_to_gpu(dev); > > > > if (gpu->funcs->gpu_get_freq) > > *freq = gpu->funcs->gpu_get_freq(gpu); > > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > > index 0db117a7339b..8bda7beaed4b 100644 > > --- a/drivers/gpu/drm/msm/msm_gpu.h > > +++ b/drivers/gpu/drm/msm/msm_gpu.h > > @@ -141,6 +141,11 @@ struct msm_gpu { > > struct msm_gpu_state *crashstate; > > }; > > > > +static inline struct msm_gpu *dev_to_gpu(struct device *dev) > > That's a fairly generic name for a driver-global helper :) tbf, it is only global to the gpu part of the driver.. thanks for the review BR, -R > Reviewed-by: Bjorn Andersson > > Regards, > Bjorn > > > +{ > > + return dev_get_drvdata(dev); > > +} > > + > > /* It turns out that all targets use the same ringbuffer size */ > > #define MSM_GPU_RINGBUFFER_SZ SZ_32K > > #define MSM_GPU_RINGBUFFER_BLKSIZE 32 > > -- > > 2.26.2 > > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel