Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp24983246rwd; Sun, 2 Jul 2023 08:10:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlEV2YQ/SUP1qqQC8wJ6mM0H0/Ef0XI80UVmA06r2ouoXaDdbc0xQRE6LVF2K/ufDpazmyAq X-Received: by 2002:a17:90b:2d82:b0:24e:4b1c:74d2 with SMTP id sj2-20020a17090b2d8200b0024e4b1c74d2mr9162504pjb.32.1688310639803; Sun, 02 Jul 2023 08:10:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688310639; cv=none; d=google.com; s=arc-20160816; b=HAZfDdx0PWLgaz8X2SdR4Ke49mCZnpjbFSFSdjtaZI1t/0N/jHVyApeEd3786iCKUz RUb41AmdKnvbv94i1l9iAVzatrrvKAMA+TvddEjGXss1evmTdSo7uVEvZjYR5/I0Ereg 2SaLaAkEOJRDM7/zZzBMINf1IziqRTjWVJxX9u3y0F0Df/XHsLcKvauFmVr7zmxHdsuS vgIXHjjGRWILjMxnv/gjont42rHbnXRQ2EwMXQwAH2XYD0sowB9bsG1pyIiisrv1imTo Pb0hkvigHsX0w65ETudc1p3wardRdgG48f6tNCysPtjxF1Dk3hi4p5mKyy4YS9vsWLr6 jYPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=LnmGb9vKhvzi0XZPMqQ1ONABGe8k3k8AgsBTL2GUhi4=; fh=eY4nB4YTKQabz08YAYt7UvwKaBcLzHSwK/fWmf1+Rxs=; b=fX7ryIpJhTWbK2D8mLyC5emWt5+E1IgEKDSrdP2FQkzyfhPxRYC0OU3F+RExUgndnK keVA80uO2Axnsp49R7IYOlEChhLa4R8H0zjo8T1SQmYHSd6s0erIr5eXoi4Gv8i1jXQv vLMAFchbIEKQev9bfp39sE5nfP+lhTGwGL+K+qnjX3xNiTVDO+DQS8dh99ucsafrD/TW NkykTFEk/ICUGPUfVASdIsy1+mO6wqEjR9aS4dGVCSKaunWL5ORBQMSTMoehETdbTw/F G6wf13iqe1Ar0WicAx+z4OJ2CKTPUTMldou2yiM4lEboW01IO3aQUi9fJ2AHkItjfz2r B3Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=QBxJ8F4q; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v1-20020a17090a898100b0025c238650d1si16606626pjn.174.2023.07.02.08.10.24; Sun, 02 Jul 2023 08:10:39 -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=@gmail.com header.s=20221208 header.b=QBxJ8F4q; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229764AbjGBO4i (ORCPT + 99 others); Sun, 2 Jul 2023 10:56:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229605AbjGBO4h (ORCPT ); Sun, 2 Jul 2023 10:56:37 -0400 Received: from mail-oo1-xc2c.google.com (mail-oo1-xc2c.google.com [IPv6:2607:f8b0:4864:20::c2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC823C3; Sun, 2 Jul 2023 07:56:36 -0700 (PDT) Received: by mail-oo1-xc2c.google.com with SMTP id 006d021491bc7-5636425bf98so1765200eaf.1; Sun, 02 Jul 2023 07:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688309796; x=1690901796; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=LnmGb9vKhvzi0XZPMqQ1ONABGe8k3k8AgsBTL2GUhi4=; b=QBxJ8F4qsF9q3pHTHu1sm2WXY6dxOl4OxFU4lGR0w/kk6B32FeW77ydj3AiWQNjtr4 gPh0kcsXER7eaXmpG1zZxMVtmYjmDNTv26A9IP/yjZsZ663ouyL4CrEn0L/NukfCMwEr giF3RLjszk0crTJ9soBbz/pP0b2jJhRepfiPxwEb2L82cOsmY0HRGUElgspT9j9M7cQy dPNxd09U+eBIp8MlKwRO0RiJMKResR4jqGcmcH9RtobQha4s/XR3rcwqeluO2lXOsPzD BRFcmm5LTN8N8lsNJD2TG+r6Wht/3u/7tRBm05ghgt5GxzNWXXKTQ+tnuBPu4BT8TKJa cO2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688309796; x=1690901796; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LnmGb9vKhvzi0XZPMqQ1ONABGe8k3k8AgsBTL2GUhi4=; b=KCgU7BoNfi3Svj3gweGVHlVkVVlLo0yIvYvE4YG2H3iRjriJOIJXAhGHsXQQIx8L6Z ZBq/arShRsiOQoGJA9iINMQyjCnrP2d5bBfruQs8sJhovzHtsKaiqJwjkBmUChdW1dlH /BUnCrTCrnVy1OUUDZz9PWiuzgZlyw2o6mLymc9JWqaLrpG9NuDZPQHityqoWVq40FfG DppIjg2Rj6uzuRg3GGZVTHsfLX7Jg4TX2vz28x2f4VVKhpqeayPzX2uhTaFVq8t01jsh 3cTu4h14GJMLcvGkKOp6zmm1FWR2juhAHBkVUDzkIkiOFmCJpJgknm4MAs4z8AqumKwU 6AIw== X-Gm-Message-State: AC+VfDzbbGxY7txCaH92ApxaZD2PYhT1Pav65s+t7xrV354uir6Dp04+ tHVS0qnn7p1mxwiGBdx6d5OPMPEWhrmVX3R0VWw= X-Received: by 2002:a4a:4997:0:b0:560:c32a:8e10 with SMTP id z145-20020a4a4997000000b00560c32a8e10mr4769999ooa.0.1688309796025; Sun, 02 Jul 2023 07:56:36 -0700 (PDT) MIME-Version: 1.0 References: <20230628-topic-a635-v2-1-5494c881b8be@linaro.org> <5e70cb31-61a7-55d7-b3a5-5051e6d338e9@linaro.org> In-Reply-To: <5e70cb31-61a7-55d7-b3a5-5051e6d338e9@linaro.org> From: Rob Clark Date: Sun, 2 Jul 2023 07:56:24 -0700 Message-ID: Subject: Re: [PATCH v2] drm/msm/adreno: Assign revn to A635 To: Dmitry Baryshkov Cc: Konrad Dybcio , Abhinav Kumar , Sean Paul , David Airlie , Daniel Vetter , Stephen Boyd , Marijn Suijten , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Clark Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, 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 Sun, Jul 2, 2023 at 7:34=E2=80=AFAM Dmitry Baryshkov wrote: > > On 02/07/2023 17:31, Rob Clark wrote: > > On Sat, Jul 1, 2023 at 5:24=E2=80=AFPM Dmitry Baryshkov > > wrote: > >> > >> On Sat, 1 Jul 2023 at 18:50, Rob Clark wrote: > >>> > >>> On Fri, Jun 30, 2023 at 4:12=E2=80=AFPM Konrad Dybcio wrote: > >>>> > >>>> Recently, a WARN_ON() was introduced to ensure that revn is filled b= efore > >>>> adreno_is_aXYZ is called. This however doesn't work very well when r= evn is > >>>> 0 by design (such as for A635). Fill it in as a stopgap solution for > >>>> -fixes. > >>>> > >>>> Fixes: cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified = before being set") > >>>> Signed-off-by: Konrad Dybcio > >>>> --- > >>>> Changes in v2: > >>>> - add fixes > >>>> - Link to v1: https://lore.kernel.org/r/20230628-topic-a635-v1-1-505= 6e09c08fb@linaro.org > >>>> --- > >>>> drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + > >>>> 1 file changed, 1 insertion(+) > >>>> > >>>> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gp= u/drm/msm/adreno/adreno_device.c > >>>> index cb94cfd137a8..8ea7eae9fc52 100644 > >>>> --- a/drivers/gpu/drm/msm/adreno/adreno_device.c > >>>> +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c > >>>> @@ -345,6 +345,7 @@ static const struct adreno_info gpulist[] =3D { > >>>> .address_space_size =3D SZ_16G, > >>>> }, { > >>>> .rev =3D ADRENO_REV(6, 3, 5, ANY_ID), > >>>> + .revn =3D 635, > >>>> .fw =3D { > >>>> [ADRENO_FW_SQE] =3D "a660_sqe.fw", > >>>> [ADRENO_FW_GMU] =3D "a660_gmu.bin", > >>>> > >>> > >>> hmm, I realized a problem with this, it would change what > >>> MSM_PARAM_GPU_ID and more importantly MSM_PARAM_CHIP_ID return.. The > >>> former should be "harmless", although it isn't a good idea for uabi > >>> changes to be a side effect of a fix. The latter is more problematic= . > >> > >> I'd say MSM_PARAM_GPU_ID is broken for 635 anyway (won't it return 0 > >> in this case)? > >> So the new value should be correct. > > > > no, it is very much intentional that GPU_ID returns 0 for newer GPUs, > > userspace should be matching on CHIP_ID. (Also, we should be moving > > away from trying to infer generation/etc from CHIP_ID.. userspace is > > farther ahead of the kernel on this.) > > Thanks for the explanation. So in theory we can change this to always > return 0? Or must we keep it to keep UABI / compatibility? > > I'm trying to understand if we can drop revn at all. I'm not sure how likely it is that someone would try a very old mesa with a new kernel, but that combo would break if we dropped revn completely and returned 0 for GPU_ID. But I would like to move away from using revn internally. (And probably move away from the patch-id wildcard matching, and instead just explicitly list all known patch-id values so we can start treating CHIP_ID as just an opaque identifier.) BR, -R > > > > >> But more importantly, why are we exporting speedbin in > >> MSM_PARAM_CHIP_ID only if there is no revn? And why are we exporting > >> the speedbin at all as a part of CHIP_ID? > > > > Basically just being paranoid about not changing uabi. It probably > > would be ok to export the speedbin for all, but I'd have to double > > check mesa version history. > > Thanks! > > > > > BR, > > -R > > > >>> > >>> I think I'm leaning more towards reverting commit cc943f43ece7 > >>> ("drm/msm/adreno: warn if chip revn is verified before being set") fo= r > >>> -fixes. I'm still thinking about options for a longer term fix. > >>> > >>> BR, > >>> -R > >>> > >>> > >>>> --- > >>>> base-commit: 5c875096d59010cee4e00da1f9c7bdb07a025dc2 > >>>> change-id: 20230628-topic-a635-1b3c2c987417 > >>>> > >>>> Best regards, > >>>> -- > >>>> Konrad Dybcio > >>>> > >> > >> > >> > >> -- > >> With best wishes > >> Dmitry > > -- > With best wishes > Dmitry >