diff options
| author | Marek Olšák <maraeo@gmail.com> | 2010-12-21 21:27:34 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-12-22 09:54:39 +1000 |
| commit | 204663c48711ddceee09df46269cd34d49d1f7be (patch) | |
| tree | a9a4384f3170ae025d1ef6ad21d104c3ce5d56b5 /drivers | |
| parent | ae09f09e94d755ed45c58b695675636c0ec53f9e (diff) | |
| download | linux-3.10-204663c48711ddceee09df46269cd34d49d1f7be.tar.gz linux-3.10-204663c48711ddceee09df46269cd34d49d1f7be.tar.bz2 linux-3.10-204663c48711ddceee09df46269cd34d49d1f7be.zip | |
drm/radeon/kms: add ARGB2101010 colorbuffer support for r500
This should be part of DRM 2.8.0.
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index cde1d3480d9..36b4f7b48d6 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -787,6 +787,13 @@ static int r300_packet0_check(struct radeon_cs_parser *p, case 15: track->cb[i].cpp = 2; break; + case 5: + if (p->rdev->family < CHIP_RV515) { + DRM_ERROR("Invalid color buffer format (%d)!\n", + ((idx_value >> 21) & 0xF)); + return -EINVAL; + } + /* Pass through. */ case 6: track->cb[i].cpp = 4; break; diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 6fb1218f9d7..520b776b09f 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -48,7 +48,7 @@ * - 2.5.0 - add get accel 2 to work around ddx breakage for evergreen * - 2.6.0 - add tiling config query (r6xx+), add initial HiZ support (r300->r500) * 2.7.0 - fixups for r600 2D tiling support. (no external ABI change), add eg dyn gpr regs - * 2.8.0 - pageflip support, r500 US_FORMAT regs. + * 2.8.0 - pageflip support, r500 US_FORMAT regs. r500 ARGB2101010 colorbuf */ #define KMS_DRIVER_MAJOR 2 #define KMS_DRIVER_MINOR 8 |