niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/msm/adreno: warn if chip revn is verified before being set

Browse source 
The commit 010c8bbad2 ("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.

Suggested-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/531705/
Signed-off-by: Rob Clark <robdclark@chromium.org>
This commit is contained in:
Dmitry Baryshkov 2023-04-11 19:19:02 +03:00 • committed by Rob Clark
parent 736a932736
commit cc943f43ec
1 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
drivers/gpu/drm/msm/adreno/adreno_gpu.h
View file

@ -145,40 +145,51 @@ struct adreno_platform_config {
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);
return gpu->revn == revn;
}
static inline bool adreno_is_a2xx(struct adreno_gpu *gpu)
{
WARN_ON_ONCE(!gpu->revn);
return (gpu->revn < 300);
}
static inline bool adreno_is_a20x(struct adreno_gpu *gpu)
{
WARN_ON_ONCE(!gpu->revn);
return (gpu->revn < 210);
}
static inline bool adreno_is_a225(struct adreno_gpu *gpu)
{
return gpu->revn == 225;
return adreno_is_revn(gpu, 225);
}
static inline bool adreno_is_a305(struct adreno_gpu *gpu)
{
return gpu->revn == 305;
return adreno_is_revn(gpu, 305);
}
static inline bool adreno_is_a306(struct adreno_gpu *gpu)
{
/* yes, 307, because a305c is 306 */
return gpu->revn == 307;
return adreno_is_revn(gpu, 307);
}
static inline bool adreno_is_a320(struct adreno_gpu *gpu)
{
return gpu->revn == 320;
return adreno_is_revn(gpu, 320);
}
static inline bool adreno_is_a330(struct adreno_gpu *gpu)
{
return gpu->revn == 330;
return adreno_is_revn(gpu, 330);
}
static inline bool adreno_is_a330v2(struct adreno_gpu *gpu)
@ -188,77 +199,78 @@ static inline bool adreno_is_a330v2(struct adreno_gpu *gpu)
static inline int adreno_is_a405(struct adreno_gpu *gpu)
{
return gpu->revn == 405;
return adreno_is_revn(gpu, 405);
}
static inline int adreno_is_a420(struct adreno_gpu *gpu)
{
return gpu->revn == 420;
return adreno_is_revn(gpu, 420);
}
static inline int adreno_is_a430(struct adreno_gpu *gpu)
{
return gpu->revn == 430;
return adreno_is_revn(gpu, 430);
}
static inline int adreno_is_a506(struct adreno_gpu *gpu)
{
return gpu->revn == 506;
return adreno_is_revn(gpu, 506);
}
static inline int adreno_is_a508(struct adreno_gpu *gpu)
{
return gpu->revn == 508;
return adreno_is_revn(gpu, 508);
}
static inline int adreno_is_a509(struct adreno_gpu *gpu)
{
return gpu->revn == 509;
return adreno_is_revn(gpu, 509);
}
static inline int adreno_is_a510(struct adreno_gpu *gpu)
{
return gpu->revn == 510;
return adreno_is_revn(gpu, 510);
}
static inline int adreno_is_a512(struct adreno_gpu *gpu)
{
return gpu->revn == 512;
return adreno_is_revn(gpu, 512);
}
static inline int adreno_is_a530(struct adreno_gpu *gpu)
{
return gpu->revn == 530;
return adreno_is_revn(gpu, 530);
}
static inline int adreno_is_a540(struct adreno_gpu *gpu)
{
return gpu->revn == 540;
return adreno_is_revn(gpu, 540);
}
static inline int adreno_is_a618(struct adreno_gpu *gpu)
{
return gpu->revn == 618;
return adreno_is_revn(gpu, 618);
}
static inline int adreno_is_a619(struct adreno_gpu *gpu)
{
return gpu->revn == 619;
return adreno_is_revn(gpu, 619);
}
static inline int adreno_is_a630(struct adreno_gpu *gpu)
{
return gpu->revn == 630;
return adreno_is_revn(gpu, 630);
}
static inline int adreno_is_a640_family(struct adreno_gpu *gpu)
{
return (gpu->revn == 640) || (gpu->revn == 680);
return adreno_is_revn(gpu, 640) ||
adreno_is_revn(gpu, 680);
}
static inline int adreno_is_a650(struct adreno_gpu *gpu)
{
return gpu->revn == 650;
return adreno_is_revn(gpu, 650);
}
static inline int adreno_is_7c3(struct adreno_gpu *gpu)
@ -269,7 +281,7 @@ static inline int adreno_is_7c3(struct adreno_gpu *gpu)
static inline int adreno_is_a660(struct adreno_gpu *gpu)
{
return gpu->revn == 660;
return adreno_is_revn(gpu, 660);
}
static inline int adreno_is_a690(struct adreno_gpu *gpu)
@ -280,7 +292,10 @@ static inline int adreno_is_a690(struct adreno_gpu *gpu)
/* 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 adreno_is_revn(gpu, 615) ||
adreno_is_revn(gpu, 616) ||
adreno_is_revn(gpu, 618) ||
adreno_is_revn(gpu, 619);
}
static inline int adreno_is_a660_family(struct adreno_gpu *gpu)
@ -291,7 +306,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 adreno_is_revn(gpu, 650) ||
adreno_is_revn(gpu, 620) ||
adreno_is_a660_family(gpu);
}
u64 adreno_private_address_space_size(struct msm_gpu *gpu);