summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r300.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2010-12-21 21:27:34 +0100
committerDave Airlie <airlied@redhat.com>2010-12-22 09:54:39 +1000
commit204663c48711ddceee09df46269cd34d49d1f7be (patch)
treea9a4384f3170ae025d1ef6ad21d104c3ce5d56b5 /drivers/gpu/drm/radeon/r300.c
parentae09f09e94d755ed45c58b695675636c0ec53f9e (diff)
downloadlinux-204663c48711ddceee09df46269cd34d49d1f7be.tar.bz2
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/gpu/drm/radeon/r300.c')
-rw-r--r--drivers/gpu/drm/radeon/r300.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index cde1d3480d93..36b4f7b48d6a 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;