Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp6373362rwd; Mon, 19 Jun 2023 06:29:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6uHkiTo5pumDVyPjpIxJcergeTyrKiVrdb8SmVNwnquFbMWDIq37QTJ3e7fBCUJNC68yBv X-Received: by 2002:a05:6a20:4419:b0:121:d246:4f7a with SMTP id ce25-20020a056a20441900b00121d2464f7amr3067544pzb.33.1687181399433; Mon, 19 Jun 2023 06:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687181399; cv=none; d=google.com; s=arc-20160816; b=rkZFuaA7EQdMW3iM9bQ4Q/uQ2PtFo/g8Od1P8Vd3bg2Cb2P0WAgXMe5Ji5e+4/vV2f tNj3koB3obPoxKM+4rtheNX0MfvM07ebmC0LyYVGx3pNbf9NZUJ4ryxJAHUGFDbsN23W yOYwPbgXWP+PV+yjIFQ05uAW2mtFWnYwFrZ/E5KiP7UusOrvEVWvIafs6v4C847fBBvF Yw53ECM6C0Odbis/mzrSlL8MQVbvKItohkFUusZx+HDL7xKXydPN3XchUs4wHm3MhOqQ ACWcvv8ZM9qXMffc99EIeVl2xMUdyJnvtlabbwi5d8paE7NlQM0k4sL2sRN4kUozUhrc 8ayg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=PtVdSdU88LNefkY72KFJQZutSu/EAmlxtmHK1QOiwmw=; b=B3ilwFNMtmJVSbjfjQs9JB4ylNPgO44pVQrPQzmIJusoVML3CSTowSc6DPVvwI3TIv /fZXpy+CpoBnDUUo5c25s4qSmlx0XBGcmB9wBx+Ix+q7c8NJBJLFldB1vkEQ9wg++DYS M3RgA4pxQ9D2CRowmCvj6bgNV49BjdGbEgqSXA/Yrr6cMEY7BB0a/4YhzITLkK6RYqZh aIljRWNwmACyVxffRGCkuvCXuCN7g7lpz+lH5JPHmGRS035ize7leXz66AAySxsBcJxL l6jJfeILk/RGDIA+pxQT6MXP0T+41znrYCuhaVgqACJigqTHY3UM3T0dt+XIo+Dr6cMN bcRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Btmt5VBw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a056a00000600b00666b8536d8asi4865655pfk.305.2023.06.19.06.29.25; Mon, 19 Jun 2023 06:29:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Btmt5VBw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229932AbjFSNK5 (ORCPT + 99 others); Mon, 19 Jun 2023 09:10:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229636AbjFSNKw (ORCPT ); Mon, 19 Jun 2023 09:10:52 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19479FE for ; Mon, 19 Jun 2023 06:10:49 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2b47bfd4e45so12232991fa.0 for ; Mon, 19 Jun 2023 06:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687180247; x=1689772247; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=PtVdSdU88LNefkY72KFJQZutSu/EAmlxtmHK1QOiwmw=; b=Btmt5VBwmuO+gYWg4hz6LJAYqrE/pf6gWMF9KW0ZL1p6ttVPYn4leAVhdecN254JGD Q2kilkwqlje1MAnUdtDBZnY3gEU465W9HjIFaWFzhrHVAzKbZ7uKJIIw8la1JLg0c+U9 /5qdfMUkUQTeJDkO5+ckbK5A6jXqsh+F7PBWsKH9qMXn5zZhDKwOO+ooPDifTsge3GHw 5WdlFGFf1w0VLrY3ziJb4uR39n1vZnMSouC30BPk81HpPBf/WXQ+ifvyauwmSqcsdphK CR0STgE/aMNTXIrrCGLEqZPDx2RLDtr7GDL2ra0aSSXZ5ouY3jwZhyRy75OIAlMpQlIv VYAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687180247; x=1689772247; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PtVdSdU88LNefkY72KFJQZutSu/EAmlxtmHK1QOiwmw=; b=RxdgdrxVlBSYdeyMwTfRNvazvqqB1NvpOcX0H9g8ZnS93IlHKNFME3mwsROCHnw1jA r9Y+FYMW+jLYxz4rSU2x3koR0/X/N3fSIcNdAjsACLND5W0du9vqGjTYdnEABeK27HCw /bP74r1MlwX1IGB+6k6OHzzO6xkSMkTaL1ZOXum+Bix8VOe0qkN/R1X89RKL9VQvB0Kh DrVVqmFwqFV1TFFSaFyhSM0/EcR2nloLXN+eJgltlm1FZByHxJ3KeL0jhhBJ5dX/GAh6 e32ZfqiFEtd7QMBVpAip5V1ud8PV/7JMFQ47BAlOITg/md6tmjrh+cKCla88eUKoFy4v nkUQ== X-Gm-Message-State: AC+VfDzHaLDE8OR/zS0kvT+fKZa3+b4U1M2I+oTWRxgfI5sRFYPzsu6h 8FKTw9egrI6q4nZfb+8HgcghFA== X-Received: by 2002:a2e:3a05:0:b0:2b2:4e86:510b with SMTP id h5-20020a2e3a05000000b002b24e86510bmr6120161lja.13.1687180247222; Mon, 19 Jun 2023 06:10:47 -0700 (PDT) Received: from [192.168.1.101] (abyl242.neoplus.adsl.tpnet.pl. [83.9.31.242]) by smtp.gmail.com with ESMTPSA id a15-20020a2e860f000000b002b44bcdf809sm2114696lji.87.2023.06.19.06.10.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Jun 2023 06:10:46 -0700 (PDT) Message-ID: <0696f655-1928-ac7a-da3f-67c40f8f6743@linaro.org> Date: Mon, 19 Jun 2023 15:10:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [Freedreno] [PATCH v8 10/18] drm/msm/a6xx: Introduce GMU wrapper support Content-Language: en-US To: Akhil P Oommen Cc: Rob Clark , freedreno@lists.freedesktop.org, Conor Dooley , Krzysztof Kozlowski , devicetree@vger.kernel.org, Sean Paul , Bjorn Andersson , Konrad Dybcio , Abhinav Kumar , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Clark , Rob Herring , Daniel Vetter , linux-arm-msm@vger.kernel.org, Dmitry Baryshkov , Marijn Suijten , David Airlie References: <20230223-topic-gmuwrapper-v8-0-69c68206609e@linaro.org> <20230223-topic-gmuwrapper-v8-10-69c68206609e@linaro.org> <2vr72w4tslxxumzphtuwgkcnbfjrtmw2j4qak2cukcabchadlg@spjbqoa7v4lr> <68e64a35-9705-6565-3b5c-5de38419aba8@linaro.org> From: Konrad Dybcio In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 17.06.2023 18:07, Akhil P Oommen wrote: > On Sat, Jun 17, 2023 at 02:00:50AM +0200, Konrad Dybcio wrote: >> >> On 16.06.2023 19:54, Akhil P Oommen wrote: >>> On Thu, Jun 15, 2023 at 11:43:04PM +0200, Konrad Dybcio wrote: >>>> >>>> On 10.06.2023 00:06, Akhil P Oommen wrote: >>>>> On Mon, May 29, 2023 at 03:52:29PM +0200, Konrad Dybcio wrote: >>>>>> >>>>>> Some (particularly SMD_RPM, a.k.a non-RPMh) SoCs implement A6XX GPUs >>>>>> but don't implement the associated GMUs. This is due to the fact that >>>>>> the GMU directly pokes at RPMh. Sadly, this means we have to take care >>>>>> of enabling & scaling power rails, clocks and bandwidth ourselves. >>>>>> >>>>>> Reuse existing Adreno-common code and modify the deeply-GMU-infused >>>>>> A6XX code to facilitate these GPUs. This involves if-ing out lots >>>>>> of GMU callbacks and introducing a new type of GMU - GMU wrapper (it's >>>>>> the actual name that Qualcomm uses in their downstream kernels). >>>>>> >>>>>> This is essentially a register region which is convenient to model >>>>>> as a device. We'll use it for managing the GDSCs. The register >>>>>> layout matches the actual GMU_CX/GX regions on the "real GMU" devices >>>>>> and lets us reuse quite a bit of gmu_read/write/rmw calls. >>>>>> >>>>>> Signed-off-by: Konrad Dybcio >>>>>> --- >> [...] >> >>>>>> + >>>>>> + ret = clk_bulk_prepare_enable(gpu->nr_clocks, gpu->grp_clks); >>>>>> + if (ret) >>>>>> + goto err_bulk_clk; >>>>>> + >>>>>> + /* If anything goes south, tear the GPU down piece by piece.. */ >>>>>> + if (ret) { >>>>>> +err_bulk_clk: >>>>> >>>>> Goto jump directly to another block looks odd to me. Why do you need this label >>>>> anyway? >>>> If clk_bulk_prepare_enable() fails, trying to proceed will hang the >>>> platform with unclocked accesses. We need to unwind everything that >>>> has been done up until that point, in reverse order. >>> >>> I missed this response from you earlier. >>> >>> But you are checking for 'ret' twice here. You will end up here even >>> if you don't jump! So "if (ret) goto err_bulk_clk;" looks >>> unnecessary. >>> >>> -Akhil. >> Ohhh right, silly mistake on my part ;) >> >> I already sent out a v9 since.. Please check it out and if you >> have any further comments, I'll fix this, and if not.. Perhaps I >> could fix it in an incremental patch if that revision is gtg? > > Incremental patch is fine as there is no functional issue. Okay so I took another look with today's next that already contains this series, and it currently looks like: ret = clk_bulk_prepare_enable(gpu->nr_clocks, gpu->grp_clks); if (ret) goto err_bulk_clk; if (adreno_is_a619_holi(adreno_gpu)) a6xx_sptprac_enable(gmu); /* If anything goes south, tear the GPU down piece by piece.. */ if (ret) { err_bulk_clk: So it makes sense this way.. perhaps I just left it in this patch by mistake when I was rebasing some changes. I guess it requires no further action now? Konrad > > -Akhil. > >> >> Konrad >>> >>>> >>>>> >>>>>> + pm_runtime_put(gmu->gxpd); >>>>>> + pm_runtime_put(gmu->dev); >>>>>> + dev_pm_opp_set_opp(&gpu->pdev->dev, NULL); >>>>>> + } >>>>>> +err_set_opp: >>>>> >>>>> Generally, it is better to name the label based on what you do here. For >>>>> eg: "unlock_lock:". >>>> That seems to be a mixed bag all throughout the kernel, I've seen many >>>> usages of err_(what went wrong) >>>> >>>>> >>>>> Also, this function is small enough that it is better to return directly >>>>> in case of error. I think that would be more readable. >>>> Not really, adding the necessary cleanup steps in `if (ret)` >>>> blocks would roughly double the function's size. >>>> >>>>> >>>>>> + mutex_unlock(&a6xx_gpu->gmu.lock); >>>>>> + >>>>>> + if (!ret) >>>>>> + msm_devfreq_resume(gpu); >>>>>> + >>>>>> + return ret; >>>>>> +} >>>>>> + >>>>>> +static int a6xx_gmu_pm_suspend(struct msm_gpu *gpu) >>>>>> { >>>>>> struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); >>>>>> struct a6xx_gpu *a6xx_gpu = to_a6xx_gpu(adreno_gpu); >>>>>> @@ -1720,7 +1799,40 @@ static int a6xx_pm_suspend(struct msm_gpu *gpu) >>>>>> return 0; >>>>>> } >>>>>> >>>>>> -static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value) >>>>>> +static int a6xx_pm_suspend(struct msm_gpu *gpu) >>>>>> +{ >>>>>> + struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); >>>>>> + struct a6xx_gpu *a6xx_gpu = to_a6xx_gpu(adreno_gpu); >>>>>> + struct a6xx_gmu *gmu = &a6xx_gpu->gmu; >>>>>> + int i; >>>>>> + >>>>>> + trace_msm_gpu_suspend(0); >>>>>> + >>>>>> + msm_devfreq_suspend(gpu); >>>>>> + >>>>>> + mutex_lock(&a6xx_gpu->gmu.lock); >>>>> >>>>> Again, is this initialized somewhere? >>>>> >>>>>> + >>>>>> + /* Drain the outstanding traffic on memory buses */ >>>>>> + a6xx_bus_clear_pending_transactions(adreno_gpu, true); >>>>>> + >>>>>> + clk_bulk_disable_unprepare(gpu->nr_clocks, gpu->grp_clks); >>>>>> + >>>>>> + pm_runtime_put_sync(gmu->gxpd); >>>>>> + dev_pm_opp_set_opp(&gpu->pdev->dev, NULL); >>>>>> + pm_runtime_put_sync(gmu->dev); >>>>>> + >>>>>> + mutex_unlock(&a6xx_gpu->gmu.lock); >>>>>> + >>>>>> + if (a6xx_gpu->shadow_bo) >>>>>> + for (i = 0; i < gpu->nr_rings; i++) >>>>>> + a6xx_gpu->shadow[i] = 0; >>>>>> + >>>>>> + gpu->suspend_count++; >>>>>> + >>>>>> + return 0; >>>>>> +} >>>>>> + >>>>>> +static int a6xx_gmu_get_timestamp(struct msm_gpu *gpu, uint64_t *value) >>>>>> { >>>>>> struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); >>>>>> struct a6xx_gpu *a6xx_gpu = to_a6xx_gpu(adreno_gpu); >>>>>> @@ -1739,6 +1851,12 @@ static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value) >>>>>> return 0; >>>>>> } >>>>>> >>>>>> +static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value) >>>>>> +{ >>>>>> + *value = gpu_read64(gpu, REG_A6XX_CP_ALWAYS_ON_COUNTER); >>>>>> + return 0; >>>>>> +} >>>>>> + >>>>>> static struct msm_ringbuffer *a6xx_active_ring(struct msm_gpu *gpu) >>>>>> { >>>>>> struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); >>>>>> @@ -2004,8 +2122,8 @@ static const struct adreno_gpu_funcs funcs = { >>>>>> .set_param = adreno_set_param, >>>>>> .hw_init = a6xx_hw_init, >>>>>> .ucode_load = a6xx_ucode_load, >>>>>> - .pm_suspend = a6xx_pm_suspend, >>>>>> - .pm_resume = a6xx_pm_resume, >>>>>> + .pm_suspend = a6xx_gmu_pm_suspend, >>>>>> + .pm_resume = a6xx_gmu_pm_resume, >>>>>> .recover = a6xx_recover, >>>>>> .submit = a6xx_submit, >>>>>> .active_ring = a6xx_active_ring, >>>>>> @@ -2020,6 +2138,35 @@ static const struct adreno_gpu_funcs funcs = { >>>>>> #if defined(CONFIG_DRM_MSM_GPU_STATE) >>>>>> .gpu_state_get = a6xx_gpu_state_get, >>>>>> .gpu_state_put = a6xx_gpu_state_put, >>>>>> +#endif >>>>>> + .create_address_space = a6xx_create_address_space, >>>>>> + .create_private_address_space = a6xx_create_private_address_space, >>>>>> + .get_rptr = a6xx_get_rptr, >>>>>> + .progress = a6xx_progress, >>>>>> + }, >>>>>> + .get_timestamp = a6xx_gmu_get_timestamp, >>>>>> +}; >>>>>> + >>>>>> +static const struct adreno_gpu_funcs funcs_gmuwrapper = { >>>>>> + .base = { >>>>>> + .get_param = adreno_get_param, >>>>>> + .set_param = adreno_set_param, >>>>>> + .hw_init = a6xx_hw_init, >>>>>> + .ucode_load = a6xx_ucode_load, >>>>>> + .pm_suspend = a6xx_pm_suspend, >>>>>> + .pm_resume = a6xx_pm_resume, >>>>>> + .recover = a6xx_recover, >>>>>> + .submit = a6xx_submit, >>>>>> + .active_ring = a6xx_active_ring, >>>>>> + .irq = a6xx_irq, >>>>>> + .destroy = a6xx_destroy, >>>>>> +#if defined(CONFIG_DRM_MSM_GPU_STATE) >>>>>> + .show = a6xx_show, >>>>>> +#endif >>>>>> + .gpu_busy = a6xx_gpu_busy, >>>>>> +#if defined(CONFIG_DRM_MSM_GPU_STATE) >>>>>> + .gpu_state_get = a6xx_gpu_state_get, >>>>>> + .gpu_state_put = a6xx_gpu_state_put, >>>>>> #endif >>>>>> .create_address_space = a6xx_create_address_space, >>>>>> .create_private_address_space = a6xx_create_private_address_space, >>>>>> @@ -2050,15 +2197,31 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) >>>>>> >>>>>> adreno_gpu->registers = NULL; >>>>>> >>>>>> + /* Check if there is a GMU phandle and set it up */ >>>>>> + node = of_parse_phandle(pdev->dev.of_node, "qcom,gmu", 0); >>>>>> + /* FIXME: How do we gracefully handle this? */ >>>>>> + BUG_ON(!node); >>>>>> + >>>>>> + adreno_gpu->gmu_is_wrapper = of_device_is_compatible(node, "qcom,adreno-gmu-wrapper"); >>>>>> + >>>>>> /* >>>>>> * We need to know the platform type before calling into adreno_gpu_init >>>>>> * so that the hw_apriv flag can be correctly set. Snoop into the info >>>>>> * and grab the revision number >>>>>> */ >>>>>> info = adreno_info(config->rev); >>>>>> - >>>>>> - if (info && (info->revn == 650 || info->revn == 660 || >>>>>> - adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), info->rev))) >>>>>> + if (!info) >>>>>> + return ERR_PTR(-EINVAL); >>>>>> + >>>>>> + /* Assign these early so that we can use the is_aXYZ helpers */ >>>>>> + /* Numeric revision IDs (e.g. 630) */ >>>>>> + adreno_gpu->revn = info->revn; >>>>>> + /* New-style ADRENO_REV()-only */ >>>>>> + adreno_gpu->rev = info->rev; >>>>>> + /* Quirk data */ >>>>>> + adreno_gpu->info = info; >>>>>> + >>>>>> + if (adreno_is_a650(adreno_gpu) || adreno_is_a660_family(adreno_gpu)) >>>>>> adreno_gpu->base.hw_apriv = true; >>>>>> >>>>>> a6xx_llc_slices_init(pdev, a6xx_gpu); >>>>>> @@ -2069,7 +2232,10 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) >>>>>> return ERR_PTR(ret); >>>>>> } >>>>>> >>>>>> - ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 1); >>>>>> + if (adreno_has_gmu_wrapper(adreno_gpu)) >>>>>> + ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs_gmuwrapper, 1); >>>>>> + else >>>>>> + ret = adreno_gpu_init(dev, pdev, adreno_gpu, &funcs, 1); >>>>>> if (ret) { >>>>>> a6xx_destroy(&(a6xx_gpu->base.base)); >>>>>> return ERR_PTR(ret); >>>>>> @@ -2082,13 +2248,10 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) >>>>>> if (adreno_is_a618(adreno_gpu) || adreno_is_7c3(adreno_gpu)) >>>>>> priv->gpu_clamp_to_idle = true; >>>>>> >>>>>> - /* Check if there is a GMU phandle and set it up */ >>>>>> - node = of_parse_phandle(pdev->dev.of_node, "qcom,gmu", 0); >>>>>> - >>>>>> - /* FIXME: How do we gracefully handle this? */ >>>>>> - BUG_ON(!node); >>>>>> - >>>>>> - ret = a6xx_gmu_init(a6xx_gpu, node); >>>>>> + if (adreno_has_gmu_wrapper(adreno_gpu)) >>>>>> + ret = a6xx_gmu_wrapper_init(a6xx_gpu, node); >>>>>> + else >>>>>> + ret = a6xx_gmu_init(a6xx_gpu, node); >>>>>> of_node_put(node); >>>>>> if (ret) { >>>>>> a6xx_destroy(&(a6xx_gpu->base.base)); >>>>>> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h >>>>>> index aa70390ee1c6..c788b06e72da 100644 >>>>>> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h >>>>>> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h >>>>>> @@ -76,6 +76,7 @@ int a6xx_gmu_set_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state); >>>>>> void a6xx_gmu_clear_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state); >>>>>> >>>>>> int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node); >>>>>> +int a6xx_gmu_wrapper_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node); >>>>>> void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu); >>>>>> >>>>>> void a6xx_gmu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp, >>>>>> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c >>>>>> index 30ecdff363e7..4e5d650578c6 100644 >>>>>> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c >>>>>> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c >>>>>> @@ -1041,16 +1041,18 @@ struct msm_gpu_state *a6xx_gpu_state_get(struct msm_gpu *gpu) >>>>>> /* Get the generic state from the adreno core */ >>>>>> adreno_gpu_state_get(gpu, &a6xx_state->base); >>>>>> >>>>>> - a6xx_get_gmu_registers(gpu, a6xx_state); >>>>>> + if (!adreno_has_gmu_wrapper(adreno_gpu)) { >>>>>> + a6xx_get_gmu_registers(gpu, a6xx_state); >>>>>> >>>>>> - a6xx_state->gmu_log = a6xx_snapshot_gmu_bo(a6xx_state, &a6xx_gpu->gmu.log); >>>>>> - a6xx_state->gmu_hfi = a6xx_snapshot_gmu_bo(a6xx_state, &a6xx_gpu->gmu.hfi); >>>>>> - a6xx_state->gmu_debug = a6xx_snapshot_gmu_bo(a6xx_state, &a6xx_gpu->gmu.debug); >>>>>> + a6xx_state->gmu_log = a6xx_snapshot_gmu_bo(a6xx_state, &a6xx_gpu->gmu.log); >>>>>> + a6xx_state->gmu_hfi = a6xx_snapshot_gmu_bo(a6xx_state, &a6xx_gpu->gmu.hfi); >>>>>> + a6xx_state->gmu_debug = a6xx_snapshot_gmu_bo(a6xx_state, &a6xx_gpu->gmu.debug); >>>>>> / >>>>>> - a6xx_snapshot_gmu_hfi_history(gpu, a6xx_state); >>>>>> + a6xx_snapshot_gmu_hfi_history(gpu, a6xx_state); >>>>>> + } >>>>>> >>>>>> /* If GX isn't on the rest of the data isn't going to be accessible */ >>>>>> - if (!a6xx_gmu_gx_is_on(&a6xx_gpu->gmu)) >>>>>> + if (!adreno_has_gmu_wrapper(adreno_gpu) && !a6xx_gmu_gx_is_on(&a6xx_gpu->gmu)) >>>>>> return &a6xx_state->base; >>>>>> >>>>>> /* Get the banks of indexed registers */ >>>>>> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c >>>>>> index 6934cee07d42..5c5901d65950 100644 >>>>>> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c >>>>>> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c >>>>>> @@ -528,6 +528,10 @@ int adreno_load_fw(struct adreno_gpu *adreno_gpu) >>>>>> if (!adreno_gpu->info->fw[i]) >>>>>> continue; >>>>>> >>>>>> + /* Skip loading GMU firwmare with GMU Wrapper */ >>>>>> + if (adreno_has_gmu_wrapper(adreno_gpu) && i == ADRENO_FW_GMU) >>>>>> + continue; >>>>>> + >>>>>> /* Skip if the firmware has already been loaded */ >>>>>> if (adreno_gpu->fw[i]) >>>>>> continue; >>>>>> @@ -1074,8 +1078,8 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, >>>>>> u32 speedbin; >>>>>> int ret; >>>>>> >>>>>> - /* Only handle the core clock when GMU is not in use */ >>>>>> - if (config->rev.core < 6) { >>>>>> + /* Only handle the core clock when GMU is not in use (or is absent). */ >>>>>> + if (adreno_has_gmu_wrapper(adreno_gpu) || config->rev.core < 6) { >>>>>> /* >>>>>> * This can only be done before devm_pm_opp_of_add_table(), or >>>>>> * dev_pm_opp_set_config() will WARN_ON() >>>>>> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h >>>>>> index f62612a5c70f..ee5352bc5329 100644 >>>>>> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h >>>>>> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h >>>>>> @@ -115,6 +115,7 @@ struct adreno_gpu { >>>>>> * code (a3xx_gpu.c) and stored in this common location. >>>>>> */ >>>>>> const unsigned int *reg_offsets; >>>>>> + bool gmu_is_wrapper; >>>>>> }; >>>>>> #define to_adreno_gpu(x) container_of(x, struct adreno_gpu, base) >>>>>> >>>>>> @@ -145,6 +146,11 @@ struct adreno_platform_config { >>>>>> >>>>>> bool adreno_cmp_rev(struct adreno_rev rev1, struct adreno_rev rev2); >>>>>> >>>>>> +static inline bool adreno_has_gmu_wrapper(struct adreno_gpu *gpu) >>>>>> +{ >>>>>> + return gpu->gmu_is_wrapper; >>>>>> +} >>>>>> + >>>>>> static inline bool adreno_is_a2xx(struct adreno_gpu *gpu) >>>>>> { >>>>>> return (gpu->revn < 300); >>>>>> >>>>>> -- >>>>>> 2.40.1 >>>>>> >>>>> >>>>> I am still not fully onboard with the idea of gmu_wrapper node in devicetree. >>>>> Aside from that, I don't see any other issue. Please check the few comments I left. >>>> Thanks for your review! >>>> >>>> Konrad >>>>> >>>>> -Akhil. >>>>>