| Message ID | 20230701171501.3701-1-robdclark@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm/adreno: warn if GPU revision is not known yet | expand |
On Sat, Jul 1, 2023 at 10:15 AM Rob Clark <robdclark@gmail.com> wrote: > > From: Rob Clark <robdclark@chromium.org> > > The commit 010c8bbad2cb ("drm: msm: adreno: Disable preemption on Adreno > 510") tried to check GPU's revn before revn being set. Add WARN_ON_ONCE > to prevent such bugs from happening again. A separate helper is > necessary so that the warning is displayed really just once instead of > being displayed for each of comparisons. > > Signed-off-by: Rob Clark <robdclark@chromium.org> > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.h | 70 +++++++++++++++---------- > 1 file changed, 42 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h > index 506001080374..eb31c83582e6 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h > @@ -145,143 +145,155 @@ struct adreno_platform_config { > > bool adreno_cmp_rev(struct adreno_rev rev1, struct adreno_rev rev2); > > +static inline const struct adreno_info > +gpu_info(struct adreno_gpu *gpu) > +{ > + if (WARN_ON_ONCE(!gpu->info)) > + return (struct adreno_info) {}; > + return *gpu->info; > +} > + > static inline bool adreno_is_a2xx(struct adreno_gpu *gpu) > { > - return (gpu->revn < 300); > + return (gpu_info(gpu).revn < 300); > } > > static inline bool adreno_is_a20x(struct adreno_gpu *gpu) > { > - return (gpu->revn < 210); > + return (gpu_info(gpu).revn < 210); > } > > static inline bool adreno_is_a225(struct adreno_gpu *gpu) > { > - return gpu->revn == 225; > + return gpu_info(gpu).revn == 225; > } > > static inline bool adreno_is_a305(struct adreno_gpu *gpu) > { > - return gpu->revn == 305; > + return gpu_info(gpu).revn == 305; > } > > static inline bool adreno_is_a306(struct adreno_gpu *gpu) > { > /* yes, 307, because a305c is 306 */ > - return gpu->revn == 307; > + return gpu_info(gpu).revn == 307; > } > > static inline bool adreno_is_a320(struct adreno_gpu *gpu) > { > - return gpu->revn == 320; > + return gpu_info(gpu).revn == 320; > } > > static inline bool adreno_is_a330(struct adreno_gpu *gpu) > { > - return gpu->revn == 330; > + return gpu_info(gpu).revn == 330; > } > > static inline bool adreno_is_a330v2(struct adreno_gpu *gpu) > { > - return adreno_is_a330(gpu) && (gpu->rev.patchid > 0); > + return adreno_is_a330(gpu) && (gpu_info(gpu).rev.patchid > 0); This still isn't quite right, because adreno_info::rev has wildcards.. but I think the basic idea of checking that gpu->info is already set is what we want.. I'll might punt on this until a bigger re-work of device identification, since at least for now the root issue is solved BR, -R > } > > static inline int adreno_is_a405(struct adreno_gpu *gpu) > { > - return gpu->revn == 405; > + return gpu_info(gpu).revn == 405; > } > > static inline int adreno_is_a420(struct adreno_gpu *gpu) > { > - return gpu->revn == 420; > + return gpu_info(gpu).revn == 420; > } > > static inline int adreno_is_a430(struct adreno_gpu *gpu) > { > - return gpu->revn == 430; > + return gpu_info(gpu).revn == 430; > } > > static inline int adreno_is_a506(struct adreno_gpu *gpu) > { > - return gpu->revn == 506; > + return gpu_info(gpu).revn == 506; > } > > static inline int adreno_is_a508(struct adreno_gpu *gpu) > { > - return gpu->revn == 508; > + return gpu_info(gpu).revn == 508; > } > > static inline int adreno_is_a509(struct adreno_gpu *gpu) > { > - return gpu->revn == 509; > + return gpu_info(gpu).revn == 509; > } > > static inline int adreno_is_a510(struct adreno_gpu *gpu) > { > - return gpu->revn == 510; > + return gpu_info(gpu).revn == 510; > } > > static inline int adreno_is_a512(struct adreno_gpu *gpu) > { > - return gpu->revn == 512; > + return gpu_info(gpu).revn == 512; > } > > static inline int adreno_is_a530(struct adreno_gpu *gpu) > { > - return gpu->revn == 530; > + return gpu_info(gpu).revn == 530; > } > > static inline int adreno_is_a540(struct adreno_gpu *gpu) > { > - return gpu->revn == 540; > + return gpu_info(gpu).revn == 540; > } > > static inline int adreno_is_a618(struct adreno_gpu *gpu) > { > - return gpu->revn == 618; > + return gpu_info(gpu).revn == 618; > } > > static inline int adreno_is_a619(struct adreno_gpu *gpu) > { > - return gpu->revn == 619; > + return gpu_info(gpu).revn == 619; > } > > static inline int adreno_is_a630(struct adreno_gpu *gpu) > { > - return gpu->revn == 630; > + return gpu_info(gpu).revn == 630; > } > > static inline int adreno_is_a640_family(struct adreno_gpu *gpu) > { > - return (gpu->revn == 640) || (gpu->revn == 680); > + return (gpu_info(gpu).revn == 640) || > + (gpu_info(gpu).revn == 680); > } > > static inline int adreno_is_a650(struct adreno_gpu *gpu) > { > - return gpu->revn == 650; > + return gpu_info(gpu).revn == 650; > } > > static inline int adreno_is_7c3(struct adreno_gpu *gpu) > { > /* The order of args is important here to handle ANY_ID correctly */ > - return adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), gpu->rev); > + return adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), gpu_info(gpu).rev); > } > > static inline int adreno_is_a660(struct adreno_gpu *gpu) > { > - return gpu->revn == 660; > + return gpu_info(gpu).revn == 660; > } > > static inline int adreno_is_a690(struct adreno_gpu *gpu) > { > /* 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); > + return adreno_cmp_rev(ADRENO_REV(6, 9, 0, ANY_ID), gpu_info(gpu).rev); > }; > > /* check for a615, a616, a618, a619 or any derivatives */ > static inline int adreno_is_a615_family(struct adreno_gpu *gpu) > { > - return gpu->revn == 615 || gpu->revn == 616 || gpu->revn == 618 || gpu->revn == 619; > + return gpu_info(gpu).revn == 615 || > + gpu_info(gpu).revn == 616 || > + gpu_info(gpu).revn == 618 || > + gpu_info(gpu).revn == 619; > } > > static inline int adreno_is_a660_family(struct adreno_gpu *gpu) > @@ -292,7 +304,9 @@ static inline int adreno_is_a660_family(struct adreno_gpu *gpu) > /* check for a650, a660, or any derivatives */ > static inline int adreno_is_a650_family(struct adreno_gpu *gpu) > { > - return gpu->revn == 650 || gpu->revn == 620 || adreno_is_a660_family(gpu); > + return gpu_info(gpu).revn == 650 || > + gpu_info(gpu).revn == 620 || > + adreno_is_a660_family(gpu); > } > > u64 adreno_private_address_space_size(struct msm_gpu *gpu); > -- > 2.41.0 >
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index 506001080374..eb31c83582e6 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h @@ -145,143 +145,155 @@ struct adreno_platform_config { bool adreno_cmp_rev(struct adreno_rev rev1, struct adreno_rev rev2); +static inline const struct adreno_info +gpu_info(struct adreno_gpu *gpu) +{ + if (WARN_ON_ONCE(!gpu->info)) + return (struct adreno_info) {}; + return *gpu->info; +} + static inline bool adreno_is_a2xx(struct adreno_gpu *gpu) { - return (gpu->revn < 300); + return (gpu_info(gpu).revn < 300); } static inline bool adreno_is_a20x(struct adreno_gpu *gpu) { - return (gpu->revn < 210); + return (gpu_info(gpu).revn < 210); } static inline bool adreno_is_a225(struct adreno_gpu *gpu) { - return gpu->revn == 225; + return gpu_info(gpu).revn == 225; } static inline bool adreno_is_a305(struct adreno_gpu *gpu) { - return gpu->revn == 305; + return gpu_info(gpu).revn == 305; } static inline bool adreno_is_a306(struct adreno_gpu *gpu) { /* yes, 307, because a305c is 306 */ - return gpu->revn == 307; + return gpu_info(gpu).revn == 307; } static inline bool adreno_is_a320(struct adreno_gpu *gpu) { - return gpu->revn == 320; + return gpu_info(gpu).revn == 320; } static inline bool adreno_is_a330(struct adreno_gpu *gpu) { - return gpu->revn == 330; + return gpu_info(gpu).revn == 330; } static inline bool adreno_is_a330v2(struct adreno_gpu *gpu) { - return adreno_is_a330(gpu) && (gpu->rev.patchid > 0); + return adreno_is_a330(gpu) && (gpu_info(gpu).rev.patchid > 0); } static inline int adreno_is_a405(struct adreno_gpu *gpu) { - return gpu->revn == 405; + return gpu_info(gpu).revn == 405; } static inline int adreno_is_a420(struct adreno_gpu *gpu) { - return gpu->revn == 420; + return gpu_info(gpu).revn == 420; } static inline int adreno_is_a430(struct adreno_gpu *gpu) { - return gpu->revn == 430; + return gpu_info(gpu).revn == 430; } static inline int adreno_is_a506(struct adreno_gpu *gpu) { - return gpu->revn == 506; + return gpu_info(gpu).revn == 506; } static inline int adreno_is_a508(struct adreno_gpu *gpu) { - return gpu->revn == 508; + return gpu_info(gpu).revn == 508; } static inline int adreno_is_a509(struct adreno_gpu *gpu) { - return gpu->revn == 509; + return gpu_info(gpu).revn == 509; } static inline int adreno_is_a510(struct adreno_gpu *gpu) { - return gpu->revn == 510; + return gpu_info(gpu).revn == 510; } static inline int adreno_is_a512(struct adreno_gpu *gpu) { - return gpu->revn == 512; + return gpu_info(gpu).revn == 512; } static inline int adreno_is_a530(struct adreno_gpu *gpu) { - return gpu->revn == 530; + return gpu_info(gpu).revn == 530; } static inline int adreno_is_a540(struct adreno_gpu *gpu) { - return gpu->revn == 540; + return gpu_info(gpu).revn == 540; } static inline int adreno_is_a618(struct adreno_gpu *gpu) { - return gpu->revn == 618; + return gpu_info(gpu).revn == 618; } static inline int adreno_is_a619(struct adreno_gpu *gpu) { - return gpu->revn == 619; + return gpu_info(gpu).revn == 619; } static inline int adreno_is_a630(struct adreno_gpu *gpu) { - return gpu->revn == 630; + return gpu_info(gpu).revn == 630; } static inline int adreno_is_a640_family(struct adreno_gpu *gpu) { - return (gpu->revn == 640) || (gpu->revn == 680); + return (gpu_info(gpu).revn == 640) || + (gpu_info(gpu).revn == 680); } static inline int adreno_is_a650(struct adreno_gpu *gpu) { - return gpu->revn == 650; + return gpu_info(gpu).revn == 650; } static inline int adreno_is_7c3(struct adreno_gpu *gpu) { /* The order of args is important here to handle ANY_ID correctly */ - return adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), gpu->rev); + return adreno_cmp_rev(ADRENO_REV(6, 3, 5, ANY_ID), gpu_info(gpu).rev); } static inline int adreno_is_a660(struct adreno_gpu *gpu) { - return gpu->revn == 660; + return gpu_info(gpu).revn == 660; } static inline int adreno_is_a690(struct adreno_gpu *gpu) { /* 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); + return adreno_cmp_rev(ADRENO_REV(6, 9, 0, ANY_ID), gpu_info(gpu).rev); }; /* check for a615, a616, a618, a619 or any derivatives */ static inline int adreno_is_a615_family(struct adreno_gpu *gpu) { - return gpu->revn == 615 || gpu->revn == 616 || gpu->revn == 618 || gpu->revn == 619; + return gpu_info(gpu).revn == 615 || + gpu_info(gpu).revn == 616 || + gpu_info(gpu).revn == 618 || + gpu_info(gpu).revn == 619; } static inline int adreno_is_a660_family(struct adreno_gpu *gpu) @@ -292,7 +304,9 @@ static inline int adreno_is_a660_family(struct adreno_gpu *gpu) /* check for a650, a660, or any derivatives */ static inline int adreno_is_a650_family(struct adreno_gpu *gpu) { - return gpu->revn == 650 || gpu->revn == 620 || adreno_is_a660_family(gpu); + return gpu_info(gpu).revn == 650 || + gpu_info(gpu).revn == 620 || + adreno_is_a660_family(gpu); } u64 adreno_private_address_space_size(struct msm_gpu *gpu);