drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker
Subsystems (2)
PATCH 1/1 drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker
broken by:
drm/radeon/r600: fix tiling issues in CS checker.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/r600_cs.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/r600_cs.c +2 -0
@@ -190,6 +190,8 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i) height = slice_tile_max / (pitch *8 );if (height >8192 ) height =8192 ; +if (height >7 ) + height &= ~0x7 ; array_mode =G_0280A0_ARRAY_MODE (track->cb_color_info[i]);switch (array_mode) {case V_0280A0_ARRAY_LINEAR_GENERAL :
Signature · 1 line
1.7.1.1
PATCH 1/1 drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker v2
broken by:
drm/radeon/r600: fix tiling issues in CS checker.
v2: only apply it to 1D tiling case.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/r600_cs.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/r600_cs.c +3 -0
@@ -215,6 +215,9 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i) __func__, __LINE__, pitch);return -EINVAL ; } +/* avoid breaking userspace */ +if (height >7 ) + height &= ~0x7 ;if (!IS_ALIGNED (height,8 )) {dev_warn (p->dev,"%s:%d cb height (%d) invalid\n" , __func__, __LINE__, height);
Signature · 1 line
1.7.1.1