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

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

[Markus Trippelsdorf]

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 !

A quick git-bisect points to:
commit fe6f0bd03d697835e76dd18d232ba476c65b8282
Author: Marek Olšák <maraeo@gmail.com>
Date:   Sat May 7 01:09:57 2011 +0200

    drm/radeon/kms: add missing Evergreen texture formats to the CS parser

Reverting the commit solves the issue.

-- 
Markus

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

[Markus Trippelsdorf]

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 !
> 
> A quick git-bisect points to:
> commit fe6f0bd03d697835e76dd18d232ba476c65b8282
> Author: Marek Olšák <maraeo@gmail.com>
> Date:   Sat May 7 01:09:57 2011 +0200
> 
>     drm/radeon/kms: add missing Evergreen texture formats to the CS parser
> 
> Reverting the commit solves the issue.

The following patch is enough to resolve the problem:

diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 909bda8..cbcc136 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -71,14 +71,14 @@ struct r600_cs_track {
 	u64			db_bo_mc;
 };
 
-#define FMT_8_BIT(fmt, vc)   [fmt] = { 1, 1, 1, vc, CHIP_R600 }
-#define FMT_16_BIT(fmt, vc)  [fmt] = { 1, 1, 2, vc, CHIP_R600 }
-#define FMT_24_BIT(fmt)      [fmt] = { 1, 1, 3,  0, CHIP_R600 }
-#define FMT_32_BIT(fmt, vc)  [fmt] = { 1, 1, 4, vc, CHIP_R600 }
-#define FMT_48_BIT(fmt)      [fmt] = { 1, 1, 6,  0, CHIP_R600 }
-#define FMT_64_BIT(fmt, vc)  [fmt] = { 1, 1, 8, vc, CHIP_R600 }
-#define FMT_96_BIT(fmt)      [fmt] = { 1, 1, 12, 0, CHIP_R600 }
-#define FMT_128_BIT(fmt, vc) [fmt] = { 1, 1, 16,vc, CHIP_R600 }
+#define FMT_8_BIT(fmt, vc)   [fmt] = { 1, 1, 1, vc }
+#define FMT_16_BIT(fmt, vc)  [fmt] = { 1, 1, 2, vc }
+#define FMT_24_BIT(fmt)      [fmt] = { 1, 1, 3,  0 }
+#define FMT_32_BIT(fmt, vc)  [fmt] = { 1, 1, 4, vc }
+#define FMT_48_BIT(fmt)      [fmt] = { 1, 1, 6,  0 }
+#define FMT_64_BIT(fmt, vc)  [fmt] = { 1, 1, 8, vc }
+#define FMT_96_BIT(fmt)      [fmt] = { 1, 1, 12, 0 }
+#define FMT_128_BIT(fmt, vc) [fmt] = { 1, 1, 16,vc }
 
 struct gpu_formats {
 	unsigned blockwidth;
-- 
Markus

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

[Dave Airlie]

[-- 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

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

[Markus Trippelsdorf]

On 2011.06.08 at 20:09 +1000, Dave Airlie wrote:
> 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.

Yes, your patch fixes the problem. Thanks Dave.

-- 
Markus