diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-18 09:56:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-18 09:56:49 +1000 |
| commit | dcd6dfcfe959bade75fbf49499775985d2cac5d5 (patch) | |
| tree | 45e37b24d7e34a1bdefe04e65633168873476ca7 /drivers/gpu/drm/radeon/r200.c | |
| parent | cbc8cc049aefd571ebc3c255dc3e265f736751c0 (diff) | |
| parent | d785d78bbdb53580b12c40e820af5a3281ce2fc8 (diff) | |
Merge branch 'drm-linus' into drm-core-next
Diffstat (limited to 'drivers/gpu/drm/radeon/r200.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r200.c | 10 |
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); |