diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-10-26 20:22:42 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-27 10:46:52 +1000 |
| commit | 8f895da57da80b307efa2f94b5d4caf801e959a5 (patch) | |
| tree | 155f6787a13314f65964f745ebba51193a6fcb43 /drivers/gpu | |
| parent | 881fe6c1d06bf49f4ab7aef212cdaf66bd059614 (diff) | |
| download | kernel_samsung_crespo-8f895da57da80b307efa2f94b5d4caf801e959a5.zip kernel_samsung_crespo-8f895da57da80b307efa2f94b5d4caf801e959a5.tar.gz kernel_samsung_crespo-8f895da57da80b307efa2f94b5d4caf801e959a5.tar.bz2 | |
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 <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_cs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index 4180291..7b294c1 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -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); |