drm/radeon/kms: fix r100->r500 CS checker for compressed textures. (v2)

This adds support for compressed textures to the r100->r500 CS
checker, it lets me run openarena and the demos in mesa fine.

Thanks to Maciej Cencora for initial comments.

Changes since v1:
fix calculations with Maciej formulas

Reviewed-by: Maciej Cencora <m.cencora@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
index eb740fc3549f..20942127c46b 100644
--- a/drivers/gpu/drm/radeon/r200.c
+++ b/drivers/gpu/drm/radeon/r200.c
@@ -401,7 +401,6 @@ int r200_packet0_check(struct radeon_cs_parser *p,
                 case R200_TXFORMAT_Y8:
                         track->textures[i].cpp = 1;
                         break;
-                case R200_TXFORMAT_DXT1:
                 case R200_TXFORMAT_AI88:
                 case R200_TXFORMAT_ARGB1555:
                 case R200_TXFORMAT_RGB565:
@@ -418,9 +417,16 @@ int r200_packet0_check(struct radeon_cs_parser *p,
                 case R200_TXFORMAT_ABGR8888:
                 case R200_TXFORMAT_BGR111110:
                 case R200_TXFORMAT_LDVDU8888:
+                        track->textures[i].cpp = 4;
+                        break;
+                case R200_TXFORMAT_DXT1:
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT1;
+                        break;
                 case R200_TXFORMAT_DXT23:
                 case R200_TXFORMAT_DXT45:
-                        track->textures[i].cpp = 4;
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT1;
                         break;
                 }
                 track->textures[i].cube_info[4].width = 1 << ((idx_value >> 16) & 0xf);