Date:   Wed, 15 Mar 2023 09:54:37 +0100
From:   Juerg Haefliger <juerg.haefliger@canonical.com>
To:     Bjorn Andersson <quic_bjorande@quicinc.com>
Cc:     Konrad Dybcio <konrad.dybcio@linaro.org>,
        Rob Clark <robdclark@gmail.com>,
        Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
        Sean Paul <sean@poorly.run>,
        Akhil P Oommen <quic_akhilpo@quicinc.com>,
        Bjorn Andersson <andersson@kernel.org>,
        <linux-arm-msm@vger.kernel.org>, <devicetree@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <dri-devel@lists.freedesktop.org>,
        <freedreno@lists.freedesktop.org>, <johan@kernel.org>,
        <mani@kernel.org>
Subject: Re: [PATCH 1/3] drm/msm/adreno: Add Adreno A690 support
Message-ID: <20230315095437.187ac10c@gollum>
In-Reply-To: <20230315095008.7d650ebe@gollum>
References: <20230208034052.2047681-1-quic_bjorande@quicinc.com>
        <20230208034052.2047681-2-quic_bjorande@quicinc.com>
        <20230315095008.7d650ebe@gollum>
Organization: Canonical Ltd
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GGWg/YjOnTQy0UNl1WNw7rd";
 protocol="application/pgp-signature"; micalg=pgp-sha512
Precedence: bulk

--Sig_/GGWg/YjOnTQy0UNl1WNw7rd
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

> > diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/d=
rm/msm/adreno/adreno_device.c
> > index ca38b837dedb..437515e46e5a 100644
> > --- a/drivers/gpu/drm/msm/adreno/adreno_device.c
> > +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
> > @@ -355,6 +355,20 @@ static const struct adreno_info gpulist[] =3D {
> >  		.init =3D a6xx_gpu_init,
> >  		.zapfw =3D "a640_zap.mdt",
> >  		.hwcg =3D a640_hwcg,
> > +	}, {
> > +		.rev =3D ADRENO_REV(6, 9, 0, ANY_ID),
> > +		.revn =3D 690,
> > +		.name =3D "A690",
> > +		.fw =3D {
> > +			[ADRENO_FW_SQE] =3D "a660_sqe.fw",
> > +			[ADRENO_FW_GMU] =3D "a690_gmu.bin",
> > +		},
> > +		.gmem =3D SZ_4M,
> > +		.inactive_period =3D DRM_MSM_INACTIVE_PERIOD,
> > +		.init =3D a6xx_gpu_init,
> > +		.zapfw =3D "a690_zap.mdt",
> > +		.hwcg =3D a690_hwcg,
> > +		.address_space_size =3D SZ_16G,
> >  	},
> >  }; =20
>=20
> This needs
>=20
> MODULE_FIRMWARE("qcom/a660_sqe.fw");
> MODULE_FIRMWARE("qcom/a690_gmu.bin");
> MODULE_FIRMWARE("qcom/a690_zap.mbn");


Eek. That should be

MODULE_FIRMWARE("qcom/a690_zap.mdt");


>=20
> ...Juerg
>=20
>  =20
> > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/=
msm/adreno/adreno_gpu.h
> > index b4f9b1343d63..da29bd392388 100644
> > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> > @@ -55,7 +55,7 @@ struct adreno_reglist {
> >  	u32 value;
> >  };
> > =20
> > -extern const struct adreno_reglist a615_hwcg[], a630_hwcg[], a640_hwcg=
[], a650_hwcg[], a660_hwcg[];
> > +extern const struct adreno_reglist a615_hwcg[], a630_hwcg[], a640_hwcg=
[], a650_hwcg[], a660_hwcg[], a690_hwcg[];
> > =20
> >  struct adreno_info {
> >  	struct adreno_rev rev;
> > @@ -272,6 +272,11 @@ static inline int adreno_is_a660(struct adreno_gpu=
 *gpu)
> >  	return gpu->revn =3D=3D 660;
> >  }
> > =20
> > +static inline int adreno_is_a690(struct adreno_gpu *gpu)
> > +{
> > +	return gpu->revn =3D=3D 690;
> > +};
> > +
> >  /* check for a615, a616, a618, a619 or any derivatives */
> >  static inline int adreno_is_a615_family(struct adreno_gpu *gpu)
> >  {
> > @@ -286,7 +291,8 @@ static inline int adreno_is_a660_family(struct adre=
no_gpu *gpu)
> >  /* check for a650, a660, or any derivatives */
> >  static inline int adreno_is_a650_family(struct adreno_gpu *gpu)
> >  {
> > -	return gpu->revn =3D=3D 650 || gpu->revn =3D=3D 620 || adreno_is_a660=
_family(gpu);
> > +	return gpu->revn =3D=3D 650 || gpu->revn =3D=3D 620  || gpu->revn =3D=
=3D 690 ||
> > +	       adreno_is_a660_family(gpu);
> >  }
> > =20
> >  u64 adreno_private_address_space_size(struct msm_gpu *gpu); =20
>=20


--Sig_/GGWg/YjOnTQy0UNl1WNw7rd
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEhZfU96IuprviLdeLD9OLCQumQrcFAmQRh80ACgkQD9OLCQum
Qrc2YRAAjOTspDuzpGhFACIBgWLDaVOfk/W1mrvvof8VG9j+tV3MeQPlcP9ynWRL
QFf2w9eNJPchsd6B0kZOcmA3UnSna4pjYoB4opW777d45QTSowdI9LjH8+XUXQbd
At9jc+1436AGoz5v3skB+1moSlzBG85y6r0tYG7GJ8jdm3b8iWydDr9j3yKPHvtK
qgqEB54MasKNBVl9DBo9Ug6zP7t4QLliwMbgLUe1yQXZFMLWQaHRPwCZnJ2M/Vo3
O/Xay7M/kjBXDzLCHv5HzrA3Cb0q5kS8yvdUrYN9F/mi3wc92ApSN57KTJzybkuS
gSguyERQclupty7/pBqYoJe2iTdMfYufAROsTan49q7cKFJW9la7PyV3yNOLa2EH
mavRY+Kl0T9Mr2pXqJ/6c/N3Jb27bjjq2xHejYyXpCI2NkmSMktrSDD47sgOAW4L
qR98YOrchNgW/XGYEDOFxQT8hGbFOiyZac0PU/qm5/yTXxHM7RWo9v2gux9UXjRt
p3Ln2/p8OfOFZCdYp3eXS1XDLFFbkxGOqXbUOf2mhnUvSVvMtrLIg00h8Lxqj8jE
15Hie6b47X6shyTyhm1u2rs6Q8Dw/b88//VOUBQuHHWBaSdYsd7+gH/gK0LG+CQS
sE99KAtdaT8xN15xO+3r42kRvn5E/Qu3q8qeI0oGWCUyxJ8tjkg=
=54KF
-----END PGP SIGNATURE-----

--Sig_/GGWg/YjOnTQy0UNl1WNw7rd--