Re: Latest merge of 'drm-radeon-fixes' breaks my setup

[Dave Airlie <airlied@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

On Wed, Jun 8, 2011 at 3:43 PM, Markus Trippelsdorf
<markus@trippelsdorf.de> wrote:
> On 2011.06.08 at 07:40 +0200, Markus Trippelsdorf wrote:
>> The merge of the 'drm-radeon' branch by Linus yesterday breaks my setup
>> (RS780). The mouse cursor is just a black block suddenly and I see an
>> endless stream of:
>>  radeon 0000:01:05.0: r600_check_texture_resource:1338 texture invalid format 26
>>  [drm:radeon_cs_ioctl] *ERROR* Invalid command stream !

This is wierd, can you try the attached patch, it appears this
uncovered another bug.

Dave.

[-- Attachment #2: 0001-drm-radeon-kms-set-family-for-use-in-parser.patch --]
[-- Type: text/x-patch, Size: 1075 bytes --]

From 87a130763e7a17e61cc18a7279d31b58b7bdf5b2 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 8 Jun 2011 19:58:29 +1000
Subject: [PATCH] drm/radeon/kms: set family for use in parser.

Wierdly the kms parser never initialised the family, it wasn't really used
much, but the fmt checker patch started using it and it fell over.

Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/radeon/radeon_cs.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 8c19169..fae00c0 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -228,6 +228,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
 	parser.filp = filp;
 	parser.rdev = rdev;
 	parser.dev = rdev->dev;
+	parser.family = rdev->family;
 	r = radeon_cs_parser_init(&parser, data);
 	if (r) {
 		DRM_ERROR("Failed to initialize parser !\n");
-- 
1.7.5.2