* [PATCH 2/2] drm/msm/a690: Remove revn and name
2023-07-04 16:36 [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn Rob Clark
@ 2023-07-04 16:36 ` Rob Clark
2023-07-13 19:54 ` Dmitry Baryshkov
2023-07-04 17:19 ` [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn Dmitry Baryshkov
2023-07-14 22:06 ` [Freedreno] " Abhinav Kumar
2 siblings, 1 reply; 7+ messages in thread
From: Rob Clark @ 2023-07-04 16:36 UTC (permalink / raw)
To: dri-devel; +Cc: linux-arm-msm, freedreno, Rob Clark
From: Rob Clark <robdclark@chromium.org>
These fields are deprecated. But any userspace new enough to support
a690 also knows how to identify the GPU based on chip-id.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/adreno/adreno_device.c | 2 --
drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
index cb94cfd137a8..ce8d0b2475bf 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -369,8 +369,6 @@ static const struct adreno_info gpulist[] = {
.hwcg = a640_hwcg,
}, {
.rev = ADRENO_REV(6, 9, 0, ANY_ID),
- .revn = 690,
- .name = "A690",
.fw = {
[ADRENO_FW_SQE] = "a660_sqe.fw",
[ADRENO_FW_GMU] = "a690_gmu.bin",
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
index ef1bcb6b624e..cf45007400c8 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -310,7 +310,8 @@ static inline int adreno_is_a680(const struct adreno_gpu *gpu)
static inline int adreno_is_a690(const struct adreno_gpu *gpu)
{
- return adreno_is_revn(gpu, 690);
+ /* The order of args is important here to handle ANY_ID correctly */
+ return adreno_cmp_rev(ADRENO_REV(6, 9, 0, ANY_ID), gpu->rev);
};
/* check for a615, a616, a618, a619 or any derivatives */
static inline int adreno_is_a615_family(const struct adreno_gpu *gpu)
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] drm/msm/a690: Remove revn and name
2023-07-04 16:36 ` [PATCH 2/2] drm/msm/a690: Remove revn and name Rob Clark
@ 2023-07-13 19:54 ` Dmitry Baryshkov
0 siblings, 0 replies; 7+ messages in thread
From: Dmitry Baryshkov @ 2023-07-13 19:54 UTC (permalink / raw)
To: Rob Clark, dri-devel; +Cc: linux-arm-msm, freedreno, Rob Clark
On 04/07/2023 19:36, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> These fields are deprecated. But any userspace new enough to support
> a690 also knows how to identify the GPU based on chip-id.
>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/gpu/drm/msm/adreno/adreno_device.c | 2 --
> drivers/gpu/drm/msm/adreno/adreno_gpu.h | 3 ++-
> 2 files changed, 2 insertions(+), 3 deletions(-)
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn
2023-07-04 16:36 [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn Rob Clark
2023-07-04 16:36 ` [PATCH 2/2] drm/msm/a690: Remove revn and name Rob Clark
@ 2023-07-04 17:19 ` Dmitry Baryshkov
2023-07-05 14:42 ` Rob Clark
2023-07-14 22:06 ` [Freedreno] " Abhinav Kumar
2 siblings, 1 reply; 7+ messages in thread
From: Dmitry Baryshkov @ 2023-07-04 17:19 UTC (permalink / raw)
To: Rob Clark; +Cc: dri-devel, linux-arm-msm, freedreno, Rob Clark, Konrad Dybcio
On Tue, 4 Jul 2023 at 19:36, Rob Clark <robdclark@gmail.com> wrote:
>
> From: Rob Clark <robdclark@chromium.org>
>
> 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).
>
> Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
> Fixes: cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified before being set")
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> index 65379e4824d9..ef1bcb6b624e 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> @@ -149,7 +149,8 @@ bool adreno_cmp_rev(struct adreno_rev rev1, struct adreno_rev rev2);
>
> static inline bool adreno_is_revn(const struct adreno_gpu *gpu, uint32_t revn)
> {
> - WARN_ON_ONCE(!gpu->revn);
> + /* revn can be zero, but if not is set at same time as info */
> + WARN_ON_ONCE(!gpu->info);
>
> return gpu->revn == revn;
> }
> @@ -161,14 +162,16 @@ static inline bool adreno_has_gmu_wrapper(const struct adreno_gpu *gpu)
>
> static inline bool adreno_is_a2xx(const struct adreno_gpu *gpu)
> {
> - WARN_ON_ONCE(!gpu->revn);
> + /* revn can be zero, but if not is set at same time as info */
> + WARN_ON_ONCE(!gpu->info);
>
> return (gpu->revn < 300);
This is then incorrect for a635 / a690 if they have revn at 0.
> }
>
> static inline bool adreno_is_a20x(const struct adreno_gpu *gpu)
> {
> - WARN_ON_ONCE(!gpu->revn);
> + /* revn can be zero, but if not is set at same time as info */
> + WARN_ON_ONCE(!gpu->info);
>
> return (gpu->revn < 210);
And this too.
> }
> --
> 2.41.0
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn
2023-07-04 17:19 ` [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn Dmitry Baryshkov
@ 2023-07-05 14:42 ` Rob Clark
2023-07-13 19:54 ` Dmitry Baryshkov
0 siblings, 1 reply; 7+ messages in thread
From: Rob Clark @ 2023-07-05 14:42 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: dri-devel, linux-arm-msm, freedreno, Rob Clark, Konrad Dybcio
On Tue, Jul 4, 2023 at 10:20 AM Dmitry Baryshkov
<dmitry.baryshkov@linaro.org> wrote:
>
> On Tue, 4 Jul 2023 at 19:36, Rob Clark <robdclark@gmail.com> wrote:
> >
> > From: Rob Clark <robdclark@chromium.org>
> >
> > 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).
> >
> > Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
> > Fixes: cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified before being set")
> > Signed-off-by: Rob Clark <robdclark@chromium.org>
> > ---
> > drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 ++++++---
> > 1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> > index 65379e4824d9..ef1bcb6b624e 100644
> > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> > @@ -149,7 +149,8 @@ bool adreno_cmp_rev(struct adreno_rev rev1, struct adreno_rev rev2);
> >
> > static inline bool adreno_is_revn(const struct adreno_gpu *gpu, uint32_t revn)
> > {
> > - WARN_ON_ONCE(!gpu->revn);
> > + /* revn can be zero, but if not is set at same time as info */
> > + WARN_ON_ONCE(!gpu->info);
> >
> > return gpu->revn == revn;
> > }
> > @@ -161,14 +162,16 @@ static inline bool adreno_has_gmu_wrapper(const struct adreno_gpu *gpu)
> >
> > static inline bool adreno_is_a2xx(const struct adreno_gpu *gpu)
> > {
> > - WARN_ON_ONCE(!gpu->revn);
> > + /* revn can be zero, but if not is set at same time as info */
> > + WARN_ON_ONCE(!gpu->info);
> >
> > return (gpu->revn < 300);
>
> This is then incorrect for a635 / a690 if they have revn at 0.
Fortunately not any more broken that it has ever been. But as long as
sc7280/sc8280 have GPU OPP tables, you'd never hit this. I'm working
on a better solution for next merge window.
BR,
-R
> > }
> >
> > static inline bool adreno_is_a20x(const struct adreno_gpu *gpu)
> > {
> > - WARN_ON_ONCE(!gpu->revn);
> > + /* revn can be zero, but if not is set at same time as info */
> > + WARN_ON_ONCE(!gpu->info);
> >
> > return (gpu->revn < 210);
>
> And this too.
>
> > }
> > --
> > 2.41.0
> >
>
>
> --
> With best wishes
> Dmitry
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn
2023-07-05 14:42 ` Rob Clark
@ 2023-07-13 19:54 ` Dmitry Baryshkov
0 siblings, 0 replies; 7+ messages in thread
From: Dmitry Baryshkov @ 2023-07-13 19:54 UTC (permalink / raw)
To: Rob Clark; +Cc: dri-devel, linux-arm-msm, freedreno, Rob Clark, Konrad Dybcio
On 05/07/2023 17:42, Rob Clark wrote:
> On Tue, Jul 4, 2023 at 10:20 AM Dmitry Baryshkov
> <dmitry.baryshkov@linaro.org> wrote:
>>
>> On Tue, 4 Jul 2023 at 19:36, Rob Clark <robdclark@gmail.com> wrote:
>>>
>>> From: Rob Clark <robdclark@chromium.org>
>>>
>>> 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).
>>>
>>> Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
>>> Fixes: cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified before being set")
>>> Signed-off-by: Rob Clark <robdclark@chromium.org>
>>> ---
>>> drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 ++++++---
>>> 1 file changed, 6 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
>>> index 65379e4824d9..ef1bcb6b624e 100644
>>> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
>>> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
>>> @@ -149,7 +149,8 @@ bool adreno_cmp_rev(struct adreno_rev rev1, struct adreno_rev rev2);
>>>
>>> static inline bool adreno_is_revn(const struct adreno_gpu *gpu, uint32_t revn)
>>> {
>>> - WARN_ON_ONCE(!gpu->revn);
>>> + /* revn can be zero, but if not is set at same time as info */
>>> + WARN_ON_ONCE(!gpu->info);
>>>
>>> return gpu->revn == revn;
>>> }
>>> @@ -161,14 +162,16 @@ static inline bool adreno_has_gmu_wrapper(const struct adreno_gpu *gpu)
>>>
>>> static inline bool adreno_is_a2xx(const struct adreno_gpu *gpu)
>>> {
>>> - WARN_ON_ONCE(!gpu->revn);
>>> + /* revn can be zero, but if not is set at same time as info */
>>> + WARN_ON_ONCE(!gpu->info);
>>>
>>> return (gpu->revn < 300);
>>
>> This is then incorrect for a635 / a690 if they have revn at 0.
>
> Fortunately not any more broken that it has ever been. But as long as
> sc7280/sc8280 have GPU OPP tables, you'd never hit this. I'm working
> on a better solution for next merge window.
Sounds fine with me then.
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
> BR,
> -R
>
>>> }
>>>
>>> static inline bool adreno_is_a20x(const struct adreno_gpu *gpu)
>>> {
>>> - WARN_ON_ONCE(!gpu->revn);
>>> + /* revn can be zero, but if not is set at same time as info */
>>> + WARN_ON_ONCE(!gpu->info);
>>>
>>> return (gpu->revn < 210);
>>
>> And this too.
>>
>>> }
>>> --
>>> 2.41.0
>>>
>>
>>
>> --
>> With best wishes
>> Dmitry
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Freedreno] [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn
2023-07-04 16:36 [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn Rob Clark
2023-07-04 16:36 ` [PATCH 2/2] drm/msm/a690: Remove revn and name Rob Clark
2023-07-04 17:19 ` [PATCH 1/2] drm/msm/adreno: Fix warn splat for devices without revn Dmitry Baryshkov
@ 2023-07-14 22:06 ` Abhinav Kumar
2 siblings, 0 replies; 7+ messages in thread
From: Abhinav Kumar @ 2023-07-14 22:06 UTC (permalink / raw)
To: Rob Clark, dri-devel; +Cc: Rob Clark, linux-arm-msm, freedreno, Konrad Dybcio
On 7/4/2023 9:36 AM, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> 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).
>
> Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
> Fixes: cc943f43ece7 ("drm/msm/adreno: warn if chip revn is verified before being set")
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/gpu/drm/msm/adreno/adreno_gpu.h | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
Tested-by: Abhinav Kumar <quic_abhinavk@quicinc.com> # sc7280
^ permalink raw reply [flat|nested] 7+ messages in thread