Message ID | 20230628-topic-a635-v1-1-5056e09c08fb@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9148761vqr; Wed, 28 Jun 2023 12:10:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4JM4q8zjMVUXh3TxiptlfX7f50KM5/o85X1SueUv5+3pDG3pL2gYn1aCZwIUXcibLhkBa4 X-Received: by 2002:a17:906:c1:b0:98e:46f:3eab with SMTP id 1-20020a17090600c100b0098e046f3eabmr11775762eji.6.1687979459570; Wed, 28 Jun 2023 12:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687979459; cv=none; d=google.com; s=arc-20160816; b=Y51sjcUTtL+Gl0P5bE/Zm32YrmwsBQepbkA4iXTjhh28kj/EkdORFaQK/J1Zatwgsk pKQ6Y78MB6KZDuJMkhAq4PHx8rTgY1beIVA+2YneXGdtDDduTS2v7ukALu06Qcw7THSN zZMRF3JCNuG2CtsvarJ6Pj3BjBPGQRVZW5rgt/R62YgACMiohVv8w6tUmfgr2Cg06fve x8lTTUZXymFSmqDo9+WmiUoAjtawSQYm7UMQshJJ0aS7YKRDJdt6WwlTAgKnD2v1o7Ji ptZuW6MESNHkbeAjaygxnrKbxtMuftM0MErygs1ifgLIPpglmwjvDQQwSsA+5kex9Ara +ilA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=J5YZzdJQyh4eu5fAj6xameoZPW5lmqQSZHtsSrZxy+c=; fh=OK/eLf9SXedDIPo1Fq5MxsfyWwpfxMrxCNlC23ejtN4=; b=b/AedVUso8HzmoYgya78f754OCouvQify8tKcVJGTKv7a6l5ehWomznAhLQYWqn4A7 0SfOJ+YT0Kc9oLkNidYgHl3ddbwf2dZfk9dX/WJ7RvTbzOqOfisiEuKPhhAoAklmNTFB cIusxZgdHNFqXPVxgXW3P++owiiWTW4ugCMM4KvZreKg2ev4sSB6ECKA5ENKjpEs3n1p 4EF8WNBnown4fDyJBsAgkQtXHRrnAftwAW4tovQDa6tMPfpI7WmHHBZ4AGPOWTtDdoSE Ohld7G0tgeyt9+v+Oz62WuUj3rH2c3ZNkTK4VLg1IcgvqPNnu65TwxIqGrDJA9RNO0Ya DRTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bApBKeIV; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gr6-20020a170906e2c600b0098886d50308si5459778ejb.490.2023.06.28.12.10.29; Wed, 28 Jun 2023 12:10: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=bApBKeIV; 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 S231395AbjF1TFg (ORCPT <rfc822;ivan.orlov0322@gmail.com> + 99 others); Wed, 28 Jun 2023 15:05:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231424AbjF1TFN (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 28 Jun 2023 15:05:13 -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 8B51F19B1 for <linux-kernel@vger.kernel.org>; Wed, 28 Jun 2023 12:05:12 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2b6c3921c8bso2475151fa.3 for <linux-kernel@vger.kernel.org>; Wed, 28 Jun 2023 12:05:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687979111; x=1690571111; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=J5YZzdJQyh4eu5fAj6xameoZPW5lmqQSZHtsSrZxy+c=; b=bApBKeIV6L+P7bQQSgdCs8KOomZuQ+P1vVzFbdcBYF5YrlqR1gQpUbDKW+svoxZM5u ZMI1O2A432MkFzaG9yEcIzwtnDdz7yUanUYRGGth1TcETQ9nw9TCowrr7KBXzjA4LaTT 5a9wa4Mx67QZRyBtXHn535wSfV3hKRjiKJ8O6R7VMaIhU8OrO+kbE1JHkq26aLgK220A SlOWKQVRIMGY/BBPpmz2qqLFTj6aG1IUWc/dmxZA5aT9ZSYr01DHDkK0pZbIM0b67bCb G1p8PRTStaNe7WCI/CTPdXo6fR7CNQGEg7Na2JMDre/uMZseZJCfO5KoSO4gZyFtudW2 uK0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687979111; x=1690571111; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=J5YZzdJQyh4eu5fAj6xameoZPW5lmqQSZHtsSrZxy+c=; b=AMwfXJcVNjcbu/k88LiwXJJ8F9WWoMOT57AuU3O8rUeJ4Df5YnlWyuIVwC5LcEAl/M xagh4Ey/xDv8XtiREIowXf8LPicll+W7ILI9m+ZL+hGqTbtr9sjFa1yQ1ii7nXiSt7xL G5FRLt1ebDaTrapYsjSLJ8xaytiwaCEiNJTjEnZSG9W1uiF7piB0cltdIpTqNwmi49NM LlAre7Zo8J0Yi/5Jl5YzF4s6x4h2zs9DyY2OPvDsDzBh/mCDwO9H7Ah6NmLx5hiXeg57 cULKuAh2tGJqUl1ArP0Kb3iKbwhePEa+3spnNhDl04p+rg40mF2E4S6j7nbnaof4uu3U nLiA== X-Gm-Message-State: AC+VfDxxAONoj0Zif53o6+KunSb0WGqADlPi2ifZlocbw+EqHt+aUYdu eqF9bLSmzN0BFRXDAYNEjAbQCw== X-Received: by 2002:a2e:900a:0:b0:2b4:6195:bb26 with SMTP id h10-20020a2e900a000000b002b46195bb26mr22432303ljg.25.1687979110797; Wed, 28 Jun 2023 12:05:10 -0700 (PDT) Received: from [192.168.1.101] (abyk82.neoplus.adsl.tpnet.pl. [83.9.30.82]) by smtp.gmail.com with ESMTPSA id t6-20020a2e9c46000000b002b6a85a7292sm1102616ljj.19.2023.06.28.12.05.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 12:05:09 -0700 (PDT) From: Konrad Dybcio <konrad.dybcio@linaro.org> Date: Wed, 28 Jun 2023 21:05:08 +0200 Subject: [PATCH] drm/msm/adreno: Assign revn to A635 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230628-topic-a635-v1-1-5056e09c08fb@linaro.org> X-B4-Tracking: v=1; b=H4sIAGOEnGQC/x2NQQqDMBAAvyJ77oJJrNp+RTwk221dkCiJihD8u 0uPMzBMgcxJOMO7KpD4kCxLVDCPCmjy8ccoH2WwtXV1a3vcllUIfeueaIIjS6++a0wHGgSfGUP ykSZN4j7PKtfEXzn/h2G8rhsjRnTzcQAAAA== To: Rob Clark <robdclark@gmail.com>, Abhinav Kumar <quic_abhinavk@quicinc.com>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Sean Paul <sean@poorly.run>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: Marijn Suijten <marijn.suijten@somainline.org>, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio <konrad.dybcio@linaro.org> X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687979108; l=1049; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=yOF2V2vC/eERQ5I69KrybMFDlBclITTn/+Bht2rKkYY=; b=T9f2BftsBHUMn+H55F1KeMb0BOE9TuUoOA3jtNlB1lxYTYSv97uLuQMLHUS9T4OyQkR1hib9J t+Eg5u6zA8ICDEQPx9CoIlDczwxnK718qaXUbFdux/m3XE4IGEwzpIS X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769974749298354082?= X-GMAIL-MSGID: =?utf-8?q?1769974749298354082?= |
Series |
drm/msm/adreno: Assign revn to A635
|
|
Commit Message
Konrad Dybcio
June 28, 2023, 7:05 p.m. UTC
Recently, a WARN_ON() was introduced to ensure that revn is filled before
adreno_is_aXYZ is called. This however doesn't work very well when revn is
0 by design (such as for A635). Fill it in as a stopgap solution for
-fixes.
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
drivers/gpu/drm/msm/adreno/adreno_device.c | 1 +
1 file changed, 1 insertion(+)
---
base-commit: 5c875096d59010cee4e00da1f9c7bdb07a025dc2
change-id: 20230628-topic-a635-1b3c2c987417
Best regards,
Comments
On 28/06/2023 22:05, Konrad Dybcio wrote: > Recently, a WARN_ON() was introduced to ensure that revn is filled before > adreno_is_aXYZ is called. This however doesn't work very well when revn is > 0 by design (such as for A635). Fill it in as a stopgap solution for > -fixes. > > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> I'd have probably added: Fixes: cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified before being set") or Fixes: 192f4ee3e408 ("drm/msm/a6xx: Add support for Adreno 7c Gen 3 gpu") > --- > 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/gpu/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[] = { > .address_space_size = SZ_16G, > }, { > .rev = ADRENO_REV(6, 3, 5, ANY_ID), > + .revn = 635, > .fw = { > [ADRENO_FW_SQE] = "a660_sqe.fw", > [ADRENO_FW_GMU] = "a660_gmu.bin", > > --- > base-commit: 5c875096d59010cee4e00da1f9c7bdb07a025dc2 > change-id: 20230628-topic-a635-1b3c2c987417 > > Best regards,
On Wed, Jun 28, 2023 at 12:54 PM Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > > On 28/06/2023 22:05, Konrad Dybcio wrote: > > Recently, a WARN_ON() was introduced to ensure that revn is filled before > > adreno_is_aXYZ is called. This however doesn't work very well when revn is > > 0 by design (such as for A635). Fill it in as a stopgap solution for > > -fixes. > > > > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > I'd have probably added: > > Fixes: cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified > before being set") > > or > > Fixes: 192f4ee3e408 ("drm/msm/a6xx: Add support for Adreno 7c Gen 3 gpu") I'd lean towards the former, given that this is a temporary workaround until we do a more comprehensive overhaul and remove revn entirely BR, -R > > > > --- > > 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/gpu/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[] = { > > .address_space_size = SZ_16G, > > }, { > > .rev = ADRENO_REV(6, 3, 5, ANY_ID), > > + .revn = 635, > > .fw = { > > [ADRENO_FW_SQE] = "a660_sqe.fw", > > [ADRENO_FW_GMU] = "a660_gmu.bin", > > > > --- > > base-commit: 5c875096d59010cee4e00da1f9c7bdb07a025dc2 > > change-id: 20230628-topic-a635-1b3c2c987417 > > > > Best regards, > > -- > With best wishes > Dmitry >
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/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[] = { .address_space_size = SZ_16G, }, { .rev = ADRENO_REV(6, 3, 5, ANY_ID), + .revn = 635, .fw = { [ADRENO_FW_SQE] = "a660_sqe.fw", [ADRENO_FW_GMU] = "a660_gmu.bin",