diff options
author | Roland Scheidegger <sroland@vmware.com> | 2010-06-12 12:12:37 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-06-30 21:59:21 -0400 |
commit | f9da52d54eb0e8822b5e7f32ab1cfa6522533d6e (patch) | |
tree | 9d9dfaca731c0acea84e964467172e7f6b31496c /drivers/gpu/drm/radeon/r200.c | |
parent | 76a7142a083434fe55b14f01aa2624733fea39b2 (diff) |
drm/radeon/kms: CS checker texture fixes for r1xx/r2xx/r3xx
fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=28459
agd5f: apply to r1xx/r2xx as well.
Signed-off-by: Roland Scheidegger <sroland@vmware.com>
Cc: stable@kernel.org
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r200.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r200.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c index 85617c311212..a03f8939f327 100644 --- a/drivers/gpu/drm/radeon/r200.c +++ b/drivers/gpu/drm/radeon/r200.c | |||
@@ -450,6 +450,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
450 | case R200_TXFORMAT_RGB332: | 450 | case R200_TXFORMAT_RGB332: |
451 | case R200_TXFORMAT_Y8: | 451 | case R200_TXFORMAT_Y8: |
452 | track->textures[i].cpp = 1; | 452 | track->textures[i].cpp = 1; |
453 | track->textures[i].compress_format = R100_TRACK_COMP_NONE; | ||
453 | break; | 454 | break; |
454 | case R200_TXFORMAT_AI88: | 455 | case R200_TXFORMAT_AI88: |
455 | case R200_TXFORMAT_ARGB1555: | 456 | case R200_TXFORMAT_ARGB1555: |
@@ -461,6 +462,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
461 | case R200_TXFORMAT_DVDU88: | 462 | case R200_TXFORMAT_DVDU88: |
462 | case R200_TXFORMAT_AVYU4444: | 463 | case R200_TXFORMAT_AVYU4444: |
463 | track->textures[i].cpp = 2; | 464 | track->textures[i].cpp = 2; |
465 | track->textures[i].compress_format = R100_TRACK_COMP_NONE; | ||
464 | break; | 466 | break; |
465 | case R200_TXFORMAT_ARGB8888: | 467 | case R200_TXFORMAT_ARGB8888: |
466 | case R200_TXFORMAT_RGBA8888: | 468 | case R200_TXFORMAT_RGBA8888: |
@@ -468,6 +470,7 @@ int r200_packet0_check(struct radeon_cs_parser *p, | |||
468 | case R200_TXFORMAT_BGR111110: | 470 | case R200_TXFORMAT_BGR111110: |
469 | case R200_TXFORMAT_LDVDU8888: | 471 | case R200_TXFORMAT_LDVDU8888: |
470 | track->textures[i].cpp = 4; | 472 | track->textures[i].cpp = 4; |
473 | track->textures[i].compress_format = R100_TRACK_COMP_NONE; | ||
471 | break; | 474 | break; |
472 | case R200_TXFORMAT_DXT1: | 475 | case R200_TXFORMAT_DXT1: |
473 | track->textures[i].cpp = 1; | 476 | track->textures[i].cpp = 1; |