This should be part of DRM 2.8.0.
Signed-off-by: Marek Ol??k <maraeo at gmail.com>
---
drivers/gpu/drm/radeon/r300.c | 7 +++++++
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 cde1d34..36b4f7b 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 a2307c0..42c614c 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 - add r500 US_FORMAT regs
+ * - 2.8.0 - add r500 US_FORMAT regs + r500 ARGB2101010 colorbuf
*/
#define KMS_DRIVER_MAJOR 2
#define KMS_DRIVER_MINOR 8
--
1.7.1
