* Suspend lockup: How to bisect d-r-t specific commits?
@ 2010-07-20 10:14 Rafał Miłecki
2010-07-20 11:15 ` Marius Gröger
2010-07-20 16:21 ` Alex Deucher
0 siblings, 2 replies; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-20 10:14 UTC (permalink / raw)
To: dri-devel
I've installed openSUSE 11.3 which comes with 2.6.34 kernel and added
2.6.35-rc5 from package. In both cases suspending and resuming works
fine.
Then I downloaded 2.6.35-rc5 and compiled it myself. Suspending and
resuming works fine.
When trying d-r-t with the same config my machine locks up on
suspending, just before machine is expected to turn off.
How can I use "git bisect" command to bisect d-r-t specific commits?
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-20 10:14 Suspend lockup: How to bisect d-r-t specific commits? Rafał Miłecki
@ 2010-07-20 11:15 ` Marius Gröger
2010-07-20 21:23 ` Rafał Miłecki
2010-07-20 16:21 ` Alex Deucher
1 sibling, 1 reply; 26+ messages in thread
From: Marius Gröger @ 2010-07-20 11:15 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: dri-devel
Am 20.07.2010 12:14, schrieb Rafał Miłecki:
> I've installed openSUSE 11.3 which comes with 2.6.34 kernel and added
> 2.6.35-rc5 from package. In both cases suspending and resuming works
> fine.
>
> Then I downloaded 2.6.35-rc5 and compiled it myself. Suspending and
> resuming works fine.
>
> When trying d-r-t with the same config my machine locks up on
> suspending, just before machine is expected to turn off.
>
> How can I use "git bisect" command to bisect d-r-t specific commits?
Fwiw, for me (HD3200, RS780) current d-r-t resume from suspend to ram
does not work. Last thing it shows is the text console with some random
colored pixels, but not the X display where it was suspended from. It
appeared liked the kernel was still running, but X was completely
crashed and stuck. I haven't had the time yet to further debug this.
Regards
Marius
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-20 10:14 Suspend lockup: How to bisect d-r-t specific commits? Rafał Miłecki
2010-07-20 11:15 ` Marius Gröger
@ 2010-07-20 16:21 ` Alex Deucher
2010-07-20 18:13 ` Rafał Miłecki
1 sibling, 1 reply; 26+ messages in thread
From: Alex Deucher @ 2010-07-20 16:21 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: dri-devel
2010/7/20 Rafał Miłecki <zajec5@gmail.com>:
> I've installed openSUSE 11.3 which comes with 2.6.34 kernel and added
> 2.6.35-rc5 from package. In both cases suspending and resuming works
> fine.
>
> Then I downloaded 2.6.35-rc5 and compiled it myself. Suspending and
> resuming works fine.
>
> When trying d-r-t with the same config my machine locks up on
> suspending, just before machine is expected to turn off.
>
> How can I use "git bisect" command to bisect d-r-t specific commits?
The last upstream -rc to get merged into d-r-t was 2.6.35-rc4. If
-rc4 works, you could try bisecting from that point:
http://git.kernel.org/?p=linux/kernel/git/airlied/drm-2.6.git;a=commitdiff;h=815c4163b6c8ebf8152f42b0a5fd015cfdcedc78
Alex
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-20 16:21 ` Alex Deucher
@ 2010-07-20 18:13 ` Rafał Miłecki
2010-07-20 18:44 ` Alex Deucher
0 siblings, 1 reply; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-20 18:13 UTC (permalink / raw)
To: Alex Deucher; +Cc: dri-devel
W dniu 20 lipca 2010 18:21 użytkownik Alex Deucher
<alexdeucher@gmail.com> napisał:
> The last upstream -rc to get merged into d-r-t was 2.6.35-rc4. If
> -rc4 works, you could try bisecting from that point:
> http://git.kernel.org/?p=linux/kernel/git/airlied/drm-2.6.git;a=commitdiff;h=815c4163b6c8ebf8152f42b0a5fd015cfdcedc78
My bad, there is some regression in 2.6.35-rc4 (or even earlier) that
was fixed in 2.6.35-rc5.
Do you mind if I ask how can I locally merge current Linus's tree into
local d-r-t? :)
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-20 18:13 ` Rafał Miłecki
@ 2010-07-20 18:44 ` Alex Deucher
2010-07-20 20:22 ` Rafał Miłecki
0 siblings, 1 reply; 26+ messages in thread
From: Alex Deucher @ 2010-07-20 18:44 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: dri-devel
2010/7/20 Rafał Miłecki <zajec5@gmail.com>:
> W dniu 20 lipca 2010 18:21 użytkownik Alex Deucher
> <alexdeucher@gmail.com> napisał:
>> The last upstream -rc to get merged into d-r-t was 2.6.35-rc4. If
>> -rc4 works, you could try bisecting from that point:
>> http://git.kernel.org/?p=linux/kernel/git/airlied/drm-2.6.git;a=commitdiff;h=815c4163b6c8ebf8152f42b0a5fd015cfdcedc78
>
> My bad, there is some regression in 2.6.35-rc4 (or even earlier) that
> was fixed in 2.6.35-rc5.
>
> Do you mind if I ask how can I locally merge current Linus's tree into
> local d-r-t? :)
It's been a while since I merged a remote, but I think the following
should work. If you have Dave's tree cloned, you'll need to add
Linus' tree:
git remote add linus
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Then fetch the changes from his tree:
git fetch linus
Then merge Linus' tree into your local tree:
git pull linus
Alex
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-20 18:44 ` Alex Deucher
@ 2010-07-20 20:22 ` Rafał Miłecki
0 siblings, 0 replies; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-20 20:22 UTC (permalink / raw)
To: Alex Deucher; +Cc: dri-devel
W dniu 20 lipca 2010 20:44 użytkownik Alex Deucher
<alexdeucher@gmail.com> napisał:
> Then merge Linus' tree into your local tree:
> git pull linus
It was just about adding "master" after last one. Thanks a lot! :)
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-20 11:15 ` Marius Gröger
@ 2010-07-20 21:23 ` Rafał Miłecki
2010-07-20 21:37 ` Rafał Miłecki
0 siblings, 1 reply; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-20 21:23 UTC (permalink / raw)
To: Marius Gröger; +Cc: dri-devel
W dniu 20 lipca 2010 13:15 użytkownik Marius Gröger
<marius.groeger@googlemail.com> napisał:
> Am 20.07.2010 12:14, schrieb Rafał Miłecki:
>>
>> I've installed openSUSE 11.3 which comes with 2.6.34 kernel and added
>> 2.6.35-rc5 from package. In both cases suspending and resuming works
>> fine.
>>
>> Then I downloaded 2.6.35-rc5 and compiled it myself. Suspending and
>> resuming works fine.
>>
>> When trying d-r-t with the same config my machine locks up on
>> suspending, just before machine is expected to turn off.
>>
>> How can I use "git bisect" command to bisect d-r-t specific commits?
>
> Fwiw, for me (HD3200, RS780) current d-r-t resume from suspend to ram does
> not work. Last thing it shows is the text console with some random colored
> pixels, but not the X display where it was suspended from. It appeared liked
> the kernel was still running, but X was completely crashed and stuck. I
> haven't had the time yet to further debug this.
Now when I managed to merge Linus's tree into d-r-t suspend works fine
for me, but I get lock up after resuming. It's quite funny effect,
PANEL slowly blinks for 3 times and then it freezes.
I guess I'll have to learn rebasing instead of merging, so I'll have
all d-r-t specific patches on top or rc5, which will let me bisect.
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-20 21:23 ` Rafał Miłecki
@ 2010-07-20 21:37 ` Rafał Miłecki
2010-07-20 22:36 ` Dave Airlie
0 siblings, 1 reply; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-20 21:37 UTC (permalink / raw)
To: Marius Gröger; +Cc: dri-devel
OK, next question :/ How can I rebase local d-r-t onto Linus's tree?
I've Linus's remote tree added and fetched but can not rebase against
it.
# git rebase linus
Current branch drm-radeon-testing is up to date.
# git rebase --onto linus drm-radeon-testing
Current branch drm-radeon-testing is up to date.
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-20 21:37 ` Rafał Miłecki
@ 2010-07-20 22:36 ` Dave Airlie
2010-07-21 9:30 ` Rafał Miłecki
0 siblings, 1 reply; 26+ messages in thread
From: Dave Airlie @ 2010-07-20 22:36 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: dri-devel
On Tue, 2010-07-20 at 23:37 +0200, Rafał Miłecki wrote:
> OK, next question :/ How can I rebase local d-r-t onto Linus's tree?
> I've Linus's remote tree added and fetched but can not rebase against
> it.
>
> # git rebase linus
> Current branch drm-radeon-testing is up to date.
>
> # git rebase --onto linus drm-radeon-testing
> Current branch drm-radeon-testing is up to date.
>
git rebase linus/master
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-20 22:36 ` Dave Airlie
@ 2010-07-21 9:30 ` Rafał Miłecki
2010-07-21 14:21 ` Rafał Miłecki
0 siblings, 1 reply; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-21 9:30 UTC (permalink / raw)
To: Dave Airlie; +Cc: dri-devel
W dniu 21 lipca 2010 00:36 użytkownik Dave Airlie <airlied@redhat.com> napisał:
> On Tue, 2010-07-20 at 23:37 +0200, Rafał Miłecki wrote:
>> OK, next question :/ How can I rebase local d-r-t onto Linus's tree?
>> I've Linus's remote tree added and fetched but can not rebase against
>> it.
>>
>> # git rebase linus
>> Current branch drm-radeon-testing is up to date.
>>
>> # git rebase --onto linus drm-radeon-testing
>> Current branch drm-radeon-testing is up to date.
>>
>
> git rebase linus/master
Thanks a lot!
First bisect try gave me:
bad: [d8c253f30d0eb975e5c42c31587ef718517f5067]
drm/radeon: optimize default 3D state for r6xx/r7xx blits
I'm leaving today, not sure if I manage to confirm this before next week.
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-21 9:30 ` Rafał Miłecki
@ 2010-07-21 14:21 ` Rafał Miłecki
2010-07-21 17:23 ` Alex Deucher
0 siblings, 1 reply; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-21 14:21 UTC (permalink / raw)
To: Dave Airlie; +Cc: dri-devel
W dniu 21 lipca 2010 11:30 użytkownik Rafał Miłecki <zajec5@gmail.com> napisał:
> First bisect try gave me:
> bad: [d8c253f30d0eb975e5c42c31587ef718517f5067]
> drm/radeon: optimize default 3D state for r6xx/r7xx blits
>
> I'm leaving today, not sure if I manage to confirm this before next week.
I switched back to rebased drm-radeon-testing and confirmed lockup.
Then reverted that single patch and it helped. I'm quite sure it's the
"bad one".
I use KDE4 with effects enabled, so 3D is enabled here.
Not time to dig into this problem deeper, leaving now.
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-21 14:21 ` Rafał Miłecki
@ 2010-07-21 17:23 ` Alex Deucher
2010-07-24 8:38 ` Rafał Miłecki
0 siblings, 1 reply; 26+ messages in thread
From: Alex Deucher @ 2010-07-21 17:23 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Dave Airlie, dri-devel
[-- Attachment #1: Type: text/plain, Size: 840 bytes --]
2010/7/21 Rafał Miłecki <zajec5@gmail.com>:
> W dniu 21 lipca 2010 11:30 użytkownik Rafał Miłecki <zajec5@gmail.com> napisał:
>> First bisect try gave me:
>> bad: [d8c253f30d0eb975e5c42c31587ef718517f5067]
>> drm/radeon: optimize default 3D state for r6xx/r7xx blits
>>
>> I'm leaving today, not sure if I manage to confirm this before next week.
>
> I switched back to rebased drm-radeon-testing and confirmed lockup.
> Then reverted that single patch and it helped. I'm quite sure it's the
> "bad one".
>
> I use KDE4 with effects enabled, so 3D is enabled here.
>
> Not time to dig into this problem deeper, leaving now.
When you get back can you revert the original and test version 2 of
that patch (attached). It puts back the original state, but
reorganizes the emit order to reduce the number of dwords.
Alex
[-- Attachment #2: 0001-drm-radeon-optimize-default-3D-state-for-r6xx-r7xx-b.patch --]
[-- Type: text/x-patch, Size: 16675 bytes --]
From 97b2c5f6475c6018638ed41b44b37b001dc4e682 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, 21 Jul 2010 13:18:44 -0400
Subject: [PATCH] drm/radeon: optimize default 3D state for r6xx/r7xx blits (v2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Re-organize emit order to reduce the number of dwords in the
default 3D state. This change reduces the default state size
from 514 dwords to 340.
v2: add back more state, should fix resume failure
Reported-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
drivers/gpu/drm/radeon/r600_blit_shaders.c | 568 ++++++----------------------
1 files changed, 122 insertions(+), 446 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
index 0271b53..c7b1dae 100644
--- a/drivers/gpu/drm/radeon/r600_blit_shaders.c
+++ b/drivers/gpu/drm/radeon/r600_blit_shaders.c
@@ -45,9 +45,6 @@ const u32 r6xx_default_state[] =
0x80000000,
0x80000000,
0xc0016800,
- 0x00000010,
- 0x00008000,
- 0xc0016800,
0x00000542,
0x07000003,
0xc0016800,
@@ -62,11 +59,9 @@ const u32 r6xx_default_state[] =
0xc0016800,
0x0000060e,
0x01020204,
- 0xc0016f00,
+ 0xc0026f00,
0x00000000,
0x00000000,
- 0xc0016f00,
- 0x00000001,
0x00000000,
0xc0096900,
0x0000022a,
@@ -82,31 +77,28 @@ const u32 r6xx_default_state[] =
0xc0016900,
0x00000004,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x0000000a,
0x00000000,
- 0xc0016900,
- 0x0000000b,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x0000010c,
0x00000000,
- 0xc0016900,
- 0x0000010d,
0x00000000,
0xc0016900,
0x00000200,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x00000343,
0x00000060,
- 0xc0016900,
- 0x00000344,
0x00000040,
0xc0016900,
0x00000351,
0x0000aa00,
0xc0016900,
+ 0x00000203,
+ 0x00000210,
+ 0xc0016900,
0x00000104,
0x00000000,
0xc0016900,
@@ -124,237 +116,178 @@ const u32 r6xx_default_state[] =
0x00000000,
0x00000000,
0xc0046900,
- 0x0000030c,
- 0x01000000,
- 0x00000000,
- 0x00000000,
- 0x00000000,
- 0xc0046900,
0x00000048,
0x3f800000,
0x00000000,
0x3f800000,
0x3f800000,
- 0xc0016900,
- 0x0000008e,
- 0x0000000f,
- 0xc0016900,
- 0x00000080,
+ 0xc0046900,
+ 0x0000030c,
+ 0x01000000,
0x00000000,
- 0xc0016900,
- 0x00000083,
- 0x0000ffff,
- 0xc0016900,
- 0x00000084,
0x00000000,
- 0xc0016900,
- 0x00000085,
- 0x20002000,
- 0xc0016900,
- 0x00000086,
0x00000000,
0xc0016900,
- 0x00000087,
- 0x20002000,
- 0xc0016900,
- 0x00000088,
- 0x00000000,
+ 0x0000008f,
+ 0x0000000f,
0xc0016900,
- 0x00000089,
- 0x20002000,
+ 0x000001e8,
+ 0x00000001,
0xc0016900,
- 0x0000008a,
+ 0x00000080,
0x00000000,
0xc0016900,
- 0x0000008b,
- 0x20002000,
+ 0x00000083,
+ 0x0000ffff,
0xc0016900,
0x0000008c,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x00000094,
0x80000000,
- 0xc0016900,
- 0x00000095,
0x20002000,
0xc0026900,
0x000000b4,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x00000096,
0x80000000,
- 0xc0016900,
- 0x00000097,
0x20002000,
0xc0026900,
0x000000b6,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x00000098,
0x80000000,
- 0xc0016900,
- 0x00000099,
0x20002000,
0xc0026900,
0x000000b8,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009a,
0x80000000,
- 0xc0016900,
- 0x0000009b,
0x20002000,
0xc0026900,
0x000000ba,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009c,
0x80000000,
- 0xc0016900,
- 0x0000009d,
0x20002000,
0xc0026900,
0x000000bc,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009e,
0x80000000,
- 0xc0016900,
- 0x0000009f,
0x20002000,
0xc0026900,
0x000000be,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a0,
0x80000000,
- 0xc0016900,
- 0x000000a1,
0x20002000,
0xc0026900,
0x000000c0,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a2,
0x80000000,
- 0xc0016900,
- 0x000000a3,
0x20002000,
0xc0026900,
0x000000c2,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a4,
0x80000000,
- 0xc0016900,
- 0x000000a5,
0x20002000,
0xc0026900,
0x000000c4,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a6,
0x80000000,
- 0xc0016900,
- 0x000000a7,
0x20002000,
0xc0026900,
0x000000c6,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a8,
0x80000000,
- 0xc0016900,
- 0x000000a9,
0x20002000,
0xc0026900,
0x000000c8,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000aa,
0x80000000,
- 0xc0016900,
- 0x000000ab,
0x20002000,
0xc0026900,
0x000000ca,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000ac,
0x80000000,
- 0xc0016900,
- 0x000000ad,
0x20002000,
0xc0026900,
0x000000cc,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000ae,
0x80000000,
- 0xc0016900,
- 0x000000af,
0x20002000,
0xc0026900,
0x000000ce,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000b0,
0x80000000,
- 0xc0016900,
- 0x000000b1,
0x20002000,
0xc0026900,
0x000000d0,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000b2,
0x80000000,
- 0xc0016900,
- 0x000000b3,
0x20002000,
0xc0026900,
0x000000d2,
0x00000000,
0x3f800000,
- 0xc0016900,
- 0x00000293,
+ 0xc0026900,
+ 0x00000292,
+ 0x00000000,
0x00004010,
- 0xc0016900,
+ 0xc0096900,
0x00000300,
0x00000000,
- 0xc0016900,
- 0x00000301,
- 0x00000000,
- 0xc0016900,
- 0x00000312,
- 0xffffffff,
- 0xc0016900,
- 0x00000307,
0x00000000,
- 0xc0016900,
- 0x00000308,
+ 0x0000002d,
+ 0x3f800000,
+ 0x3f800000,
+ 0x3f800000,
+ 0x3f800000,
0x00000000,
- 0xc0016900,
- 0x00000283,
0x00000000,
0xc0016900,
- 0x00000292,
- 0x00000000,
+ 0x00000312,
+ 0xffffffff,
0xc0066900,
0x0000010f,
0x00000000,
@@ -363,68 +296,29 @@ const u32 r6xx_default_state[] =
0x00000000,
0x00000000,
0x00000000,
- 0xc0016900,
- 0x00000206,
- 0x00000000,
- 0xc0016900,
- 0x00000207,
- 0x00000000,
- 0xc0016900,
- 0x00000208,
- 0x00000000,
- 0xc0046900,
- 0x00000303,
- 0x3f800000,
- 0x3f800000,
- 0x3f800000,
- 0x3f800000,
- 0xc0016900,
- 0x00000205,
+ 0xc0056900,
+ 0x00000204,
+ 0x00010000,
0x00000004,
- 0xc0016900,
- 0x00000280,
+ 0x00000100,
0x00000000,
- 0xc0016900,
- 0x00000281,
0x00000000,
- 0xc0016900,
+ 0xc0066900,
0x0000037e,
0x00000000,
- 0xc0016900,
- 0x00000382,
0x00000000,
- 0xc0016900,
- 0x00000380,
0x00000000,
- 0xc0016900,
- 0x00000383,
0x00000000,
- 0xc0016900,
- 0x00000381,
0x00000000,
- 0xc0016900,
- 0x00000282,
- 0x00000008,
- 0xc0016900,
- 0x00000302,
- 0x0000002d,
- 0xc0016900,
- 0x0000037f,
0x00000000,
0xc0016900,
0x000001b2,
0x00000000,
- 0xc0016900,
+ 0xc0046900,
0x000001b6,
0x00000000,
- 0xc0016900,
- 0x000001b7,
0x00000000,
- 0xc0016900,
- 0x000001b8,
0x00000000,
- 0xc0016900,
- 0x000001b9,
0x00000000,
0xc0016900,
0x00000225,
@@ -435,62 +329,30 @@ const u32 r6xx_default_state[] =
0xc0016900,
0x00000237,
0x00000000,
- 0xc0016900,
+ 0xc0046900,
0x00000100,
0x00000800,
- 0xc0016900,
- 0x00000101,
0x00000000,
- 0xc0016900,
- 0x00000102,
0x00000000,
- 0xc0016900,
- 0x000002a8,
0x00000000,
- 0xc0016900,
- 0x000002a9,
+ 0xc0116900,
+ 0x00000280,
0x00000000,
- 0xc0016900,
- 0x00000103,
0x00000000,
- 0xc0016900,
- 0x00000284,
+ 0x00000008,
+ 0x00000000,
0x00000000,
- 0xc0016900,
- 0x00000290,
0x00000000,
- 0xc0016900,
- 0x00000285,
0x00000000,
- 0xc0016900,
- 0x00000286,
0x00000000,
- 0xc0016900,
- 0x00000287,
0x00000000,
- 0xc0016900,
- 0x00000288,
0x00000000,
- 0xc0016900,
- 0x00000289,
0x00000000,
- 0xc0016900,
- 0x0000028a,
0x00000000,
- 0xc0016900,
- 0x0000028b,
0x00000000,
- 0xc0016900,
- 0x0000028c,
0x00000000,
- 0xc0016900,
- 0x0000028d,
0x00000000,
- 0xc0016900,
- 0x0000028e,
0x00000000,
- 0xc0016900,
- 0x0000028f,
0x00000000,
0xc0016900,
0x000002a1,
@@ -498,61 +360,37 @@ const u32 r6xx_default_state[] =
0xc0016900,
0x000002a5,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
+ 0x000002a8,
+ 0x00000000,
+ 0x00000000,
+ 0xc0036900,
0x000002ac,
0x00000000,
- 0xc0016900,
- 0x000002ad,
0x00000000,
- 0xc0016900,
- 0x000002ae,
0x00000000,
0xc0016900,
0x000002c8,
0x00000000,
0xc0016900,
- 0x00000206,
- 0x00000100,
- 0xc0016900,
- 0x00000204,
- 0x00010000,
- 0xc0036e00,
- 0x00000000,
- 0x00000012,
- 0x00000000,
- 0x00000000,
- 0xc0016900,
- 0x0000008f,
+ 0x0000008e,
0x0000000f,
0xc0016900,
- 0x000001e8,
- 0x00000001,
- 0xc0016900,
0x00000202,
0x00cc0000,
0xc0016900,
- 0x00000205,
- 0x00000244,
- 0xc0016900,
- 0x00000203,
- 0x00000210,
- 0xc0016900,
0x000001b1,
0x00000000,
0xc0016900,
0x00000185,
0x00000000,
0xc0016900,
+ 0x00000191,
+ 0x00000900,
+ 0xc0036900,
0x000001b3,
0x00000001,
- 0xc0016900,
- 0x000001b4,
0x00000000,
- 0xc0016900,
- 0x00000191,
- 0x00000b00,
- 0xc0016900,
- 0x000001b5,
0x00000000,
};
@@ -562,9 +400,6 @@ const u32 r7xx_default_state[] =
0x80000000,
0x80000000,
0xc0016800,
- 0x00000010,
- 0x00008000,
- 0xc0016800,
0x00000542,
0x07000002,
0xc0016800,
@@ -579,11 +414,9 @@ const u32 r7xx_default_state[] =
0xc0016800,
0x0000060e,
0x00420204,
- 0xc0016f00,
+ 0xc0026f00,
0x00000000,
0x00000000,
- 0xc0016f00,
- 0x00000001,
0x00000000,
0xc0096900,
0x0000022a,
@@ -599,31 +432,28 @@ const u32 r7xx_default_state[] =
0xc0016900,
0x00000004,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x0000000a,
0x00000000,
- 0xc0016900,
- 0x0000000b,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x0000010c,
0x00000000,
- 0xc0016900,
- 0x0000010d,
0x00000000,
0xc0016900,
0x00000200,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x00000343,
0x00000060,
- 0xc0016900,
- 0x00000344,
0x00000000,
0xc0016900,
0x00000351,
0x0000aa00,
0xc0016900,
+ 0x00000203,
+ 0x00000210,
+ 0xc0016900,
0x00000104,
0x00000000,
0xc0016900,
@@ -642,225 +472,166 @@ const u32 r7xx_default_state[] =
0x00000000,
0x00000000,
0xc0016900,
- 0x0000008e,
+ 0x0000008f,
0x0000000f,
0xc0016900,
+ 0x000001e8,
+ 0x00000001,
+ 0xc0016900,
0x00000080,
0x00000000,
0xc0016900,
0x00000083,
0x0000ffff,
0xc0016900,
- 0x00000084,
- 0x00000000,
- 0xc0016900,
- 0x00000085,
- 0x20002000,
- 0xc0016900,
- 0x00000086,
- 0x00000000,
- 0xc0016900,
- 0x00000087,
- 0x20002000,
- 0xc0016900,
- 0x00000088,
- 0x00000000,
- 0xc0016900,
- 0x00000089,
- 0x20002000,
- 0xc0016900,
- 0x0000008a,
- 0x00000000,
- 0xc0016900,
- 0x0000008b,
- 0x20002000,
- 0xc0016900,
0x0000008c,
0xaaaaaaaa,
- 0xc0016900,
+ 0xc0026900,
0x00000094,
0x80000000,
- 0xc0016900,
- 0x00000095,
0x20002000,
0xc0026900,
0x000000b4,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x00000096,
0x80000000,
- 0xc0016900,
- 0x00000097,
0x20002000,
0xc0026900,
0x000000b6,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x00000098,
0x80000000,
- 0xc0016900,
- 0x00000099,
0x20002000,
0xc0026900,
0x000000b8,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009a,
0x80000000,
- 0xc0016900,
- 0x0000009b,
0x20002000,
0xc0026900,
0x000000ba,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009c,
0x80000000,
- 0xc0016900,
- 0x0000009d,
0x20002000,
0xc0026900,
0x000000bc,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009e,
0x80000000,
- 0xc0016900,
- 0x0000009f,
0x20002000,
0xc0026900,
0x000000be,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a0,
0x80000000,
- 0xc0016900,
- 0x000000a1,
0x20002000,
0xc0026900,
0x000000c0,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a2,
0x80000000,
- 0xc0016900,
- 0x000000a3,
0x20002000,
0xc0026900,
0x000000c2,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a4,
0x80000000,
- 0xc0016900,
- 0x000000a5,
0x20002000,
0xc0026900,
0x000000c4,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a6,
0x80000000,
- 0xc0016900,
- 0x000000a7,
0x20002000,
0xc0026900,
0x000000c6,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a8,
0x80000000,
- 0xc0016900,
- 0x000000a9,
0x20002000,
0xc0026900,
0x000000c8,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000aa,
0x80000000,
- 0xc0016900,
- 0x000000ab,
0x20002000,
0xc0026900,
0x000000ca,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000ac,
0x80000000,
- 0xc0016900,
- 0x000000ad,
0x20002000,
0xc0026900,
0x000000cc,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000ae,
0x80000000,
- 0xc0016900,
- 0x000000af,
0x20002000,
0xc0026900,
0x000000ce,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000b0,
0x80000000,
- 0xc0016900,
- 0x000000b1,
0x20002000,
0xc0026900,
0x000000d0,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000b2,
0x80000000,
- 0xc0016900,
- 0x000000b3,
0x20002000,
0xc0026900,
0x000000d2,
0x00000000,
0x3f800000,
- 0xc0016900,
- 0x00000293,
+ 0xc0026900,
+ 0x00000292,
+ 0x00000000,
0x00514000,
- 0xc0016900,
+ 0xc0096900,
0x00000300,
0x00000000,
- 0xc0016900,
- 0x00000301,
- 0x00000000,
- 0xc0016900,
- 0x00000312,
- 0xffffffff,
- 0xc0016900,
- 0x00000307,
0x00000000,
- 0xc0016900,
- 0x00000308,
+ 0x0000002d,
+ 0x3f800000,
+ 0x3f800000,
+ 0x3f800000,
+ 0x3f800000,
0x00000000,
- 0xc0016900,
- 0x00000283,
0x00000000,
0xc0016900,
- 0x00000292,
- 0x00000000,
+ 0x00000312,
+ 0xffffffff,
0xc0066900,
0x0000010f,
0x00000000,
@@ -869,68 +640,29 @@ const u32 r7xx_default_state[] =
0x00000000,
0x00000000,
0x00000000,
- 0xc0016900,
- 0x00000206,
- 0x00000000,
- 0xc0016900,
- 0x00000207,
- 0x00000000,
- 0xc0016900,
- 0x00000208,
- 0x00000000,
- 0xc0046900,
- 0x00000303,
- 0x3f800000,
- 0x3f800000,
- 0x3f800000,
- 0x3f800000,
- 0xc0016900,
- 0x00000205,
+ 0xc0056900,
+ 0x00000204,
+ 0x00010000,
0x00000004,
- 0xc0016900,
- 0x00000280,
+ 0x00000100,
0x00000000,
- 0xc0016900,
- 0x00000281,
0x00000000,
- 0xc0016900,
+ 0xc0066900,
0x0000037e,
0x00000000,
- 0xc0016900,
- 0x00000382,
0x00000000,
- 0xc0016900,
- 0x00000380,
0x00000000,
- 0xc0016900,
- 0x00000383,
0x00000000,
- 0xc0016900,
- 0x00000381,
0x00000000,
- 0xc0016900,
- 0x00000282,
- 0x00000008,
- 0xc0016900,
- 0x00000302,
- 0x0000002d,
- 0xc0016900,
- 0x0000037f,
0x00000000,
0xc0016900,
0x000001b2,
0x00000001,
- 0xc0016900,
+ 0xc0046900,
0x000001b6,
0x00000000,
- 0xc0016900,
- 0x000001b7,
0x00000000,
- 0xc0016900,
- 0x000001b8,
0x00000000,
- 0xc0016900,
- 0x000001b9,
0x00000000,
0xc0016900,
0x00000225,
@@ -941,62 +673,30 @@ const u32 r7xx_default_state[] =
0xc0016900,
0x00000237,
0x00000000,
- 0xc0016900,
+ 0xc0046900,
0x00000100,
0x00000800,
- 0xc0016900,
- 0x00000101,
0x00000000,
- 0xc0016900,
- 0x00000102,
0x00000000,
- 0xc0016900,
- 0x000002a8,
0x00000000,
- 0xc0016900,
- 0x000002a9,
+ 0xc0116900,
+ 0x00000280,
0x00000000,
- 0xc0016900,
- 0x00000103,
0x00000000,
- 0xc0016900,
- 0x00000284,
+ 0x00000008,
+ 0x00000000,
0x00000000,
- 0xc0016900,
- 0x00000290,
0x00000000,
- 0xc0016900,
- 0x00000285,
0x00000000,
- 0xc0016900,
- 0x00000286,
0x00000000,
- 0xc0016900,
- 0x00000287,
0x00000000,
- 0xc0016900,
- 0x00000288,
0x00000000,
- 0xc0016900,
- 0x00000289,
0x00000000,
- 0xc0016900,
- 0x0000028a,
0x00000000,
- 0xc0016900,
- 0x0000028b,
0x00000000,
- 0xc0016900,
- 0x0000028c,
0x00000000,
- 0xc0016900,
- 0x0000028d,
0x00000000,
- 0xc0016900,
- 0x0000028e,
0x00000000,
- 0xc0016900,
- 0x0000028f,
0x00000000,
0xc0016900,
0x000002a1,
@@ -1004,61 +704,37 @@ const u32 r7xx_default_state[] =
0xc0016900,
0x000002a5,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
+ 0x000002a8,
+ 0x00000000,
+ 0x00000000,
+ 0xc0036900,
0x000002ac,
0x00000000,
- 0xc0016900,
- 0x000002ad,
0x00000000,
- 0xc0016900,
- 0x000002ae,
0x00000000,
0xc0016900,
0x000002c8,
0x00000000,
0xc0016900,
- 0x00000206,
- 0x00000100,
- 0xc0016900,
- 0x00000204,
- 0x00010000,
- 0xc0036e00,
- 0x00000000,
- 0x00000012,
- 0x00000000,
- 0x00000000,
- 0xc0016900,
- 0x0000008f,
+ 0x0000008e,
0x0000000f,
0xc0016900,
- 0x000001e8,
- 0x00000001,
- 0xc0016900,
0x00000202,
0x00cc0000,
0xc0016900,
- 0x00000205,
- 0x00000244,
- 0xc0016900,
- 0x00000203,
- 0x00000210,
- 0xc0016900,
0x000001b1,
0x00000000,
0xc0016900,
0x00000185,
0x00000000,
0xc0016900,
+ 0x00000191,
+ 0x00000900,
+ 0xc0036900,
0x000001b3,
0x00000001,
- 0xc0016900,
- 0x000001b4,
0x00000000,
- 0xc0016900,
- 0x00000191,
- 0x00000b00,
- 0xc0016900,
- 0x000001b5,
0x00000000,
};
--
1.7.1.1
[-- Attachment #3: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-21 17:23 ` Alex Deucher
@ 2010-07-24 8:38 ` Rafał Miłecki
2010-07-24 20:41 ` Alex Deucher
0 siblings, 1 reply; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-24 8:38 UTC (permalink / raw)
To: Alex Deucher; +Cc: Dave Airlie, dri-devel
W dniu 21 lipca 2010 19:23 użytkownik Alex Deucher
<alexdeucher@gmail.com> napisał:
> 2010/7/21 Rafał Miłecki <zajec5@gmail.com>:
>> W dniu 21 lipca 2010 11:30 użytkownik Rafał Miłecki <zajec5@gmail.com> napisał:
>>> First bisect try gave me:
>>> bad: [d8c253f30d0eb975e5c42c31587ef718517f5067]
>>> drm/radeon: optimize default 3D state for r6xx/r7xx blits
>>>
>>> I'm leaving today, not sure if I manage to confirm this before next week.
>>
>> I switched back to rebased drm-radeon-testing and confirmed lockup.
>> Then reverted that single patch and it helped. I'm quite sure it's the
>> "bad one".
>>
>> I use KDE4 with effects enabled, so 3D is enabled here.
>>
>> Not time to dig into this problem deeper, leaving now.
>
> When you get back can you revert the original and test version 2 of
> that patch (attached). It puts back the original state, but
> reorganizes the emit order to reduce the number of dwords.
Applied V2 instead of V1 and got lockup again (on resume). Reverting
applied V2 (so without V1 and without V2) "fixes" lockup.
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-24 8:38 ` Rafał Miłecki
@ 2010-07-24 20:41 ` Alex Deucher
2010-07-25 12:14 ` Rafał Miłecki
0 siblings, 1 reply; 26+ messages in thread
From: Alex Deucher @ 2010-07-24 20:41 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Dave Airlie, dri-devel
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
2010/7/24 Rafał Miłecki <zajec5@gmail.com>:
> W dniu 21 lipca 2010 19:23 użytkownik Alex Deucher
> <alexdeucher@gmail.com> napisał:
>> 2010/7/21 Rafał Miłecki <zajec5@gmail.com>:
>>> W dniu 21 lipca 2010 11:30 użytkownik Rafał Miłecki <zajec5@gmail.com> napisał:
>>>> First bisect try gave me:
>>>> bad: [d8c253f30d0eb975e5c42c31587ef718517f5067]
>>>> drm/radeon: optimize default 3D state for r6xx/r7xx blits
>>>>
>>>> I'm leaving today, not sure if I manage to confirm this before next week.
>>>
>>> I switched back to rebased drm-radeon-testing and confirmed lockup.
>>> Then reverted that single patch and it helped. I'm quite sure it's the
>>> "bad one".
>>>
>>> I use KDE4 with effects enabled, so 3D is enabled here.
>>>
>>> Not time to dig into this problem deeper, leaving now.
>>
>> When you get back can you revert the original and test version 2 of
>> that patch (attached). It puts back the original state, but
>> reorganizes the emit order to reduce the number of dwords.
>
> Applied V2 instead of V1 and got lockup again (on resume). Reverting
> applied V2 (so without V1 and without V2) "fixes" lockup.
I see the problem. The original waited for idle at the top of the
default state. This new patch is v1 + wait for idle. Please remove
v1 and v2 and then apply v3.
Alex
[-- Attachment #2: 0001-drm-radeon-optimize-default-3D-state-for-r6xx-r7xx-b.patch --]
[-- Type: text/x-patch, Size: 16683 bytes --]
From d78d2da5b39b5a1de1acb0c57083ab142233d5bc Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Sat, 24 Jul 2010 16:37:51 -0400
Subject: [PATCH] drm/radeon: optimize default 3D state for r6xx/r7xx blits (v3)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Re-organize emit order to reduce the number of dwords in the
default 3D state. This change reduces the default state size
from 514 dwords to 285.
v3: add back wait until idle at the top of the default state.
Should fix use of the engine for bo moves after resume with
the optimzed state emit.
Reported-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
drivers/gpu/drm/radeon/r600_blit_shaders.c | 671 +++++-----------------------
1 files changed, 111 insertions(+), 560 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
index 0271b53..6a2397b 100644
--- a/drivers/gpu/drm/radeon/r600_blit_shaders.c
+++ b/drivers/gpu/drm/radeon/r600_blit_shaders.c
@@ -49,7 +49,7 @@ const u32 r6xx_default_state[] =
0x00008000,
0xc0016800,
0x00000542,
- 0x07000003,
+ 0xf9000003,
0xc0016800,
0x000005c5,
0x00000000,
@@ -62,11 +62,9 @@ const u32 r6xx_default_state[] =
0xc0016800,
0x0000060e,
0x01020204,
- 0xc0016f00,
+ 0xc0026f00,
0x00000000,
0x00000000,
- 0xc0016f00,
- 0x00000001,
0x00000000,
0xc0096900,
0x0000022a,
@@ -83,43 +81,24 @@ const u32 r6xx_default_state[] =
0x00000004,
0x00000000,
0xc0016900,
- 0x0000000a,
- 0x00000000,
- 0xc0016900,
- 0x0000000b,
- 0x00000000,
- 0xc0016900,
- 0x0000010c,
- 0x00000000,
- 0xc0016900,
- 0x0000010d,
- 0x00000000,
- 0xc0016900,
0x00000200,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x00000343,
0x00000060,
- 0xc0016900,
- 0x00000344,
0x00000040,
0xc0016900,
0x00000351,
0x0000aa00,
0xc0016900,
- 0x00000104,
- 0x00000000,
- 0xc0016900,
- 0x0000010e,
- 0x00000000,
- 0xc0046900,
- 0x00000105,
- 0x00000000,
- 0x00000000,
+ 0x00000203,
+ 0x00000210,
+ 0xc0026900,
+ 0x0000000a,
0x00000000,
0x00000000,
0xc0036900,
- 0x00000109,
+ 0x0000010c,
0x00000000,
0x00000000,
0x00000000,
@@ -129,302 +108,149 @@ const u32 r6xx_default_state[] =
0x00000000,
0x00000000,
0x00000000,
- 0xc0046900,
- 0x00000048,
- 0x3f800000,
- 0x00000000,
- 0x3f800000,
- 0x3f800000,
0xc0016900,
- 0x0000008e,
+ 0x0000008f,
0x0000000f,
0xc0016900,
+ 0x000001e8,
+ 0x00000001,
+ 0xc0056900,
+ 0x00000104,
+ 0x00000000,
+ 0x00000000,
+ 0x00000000,
+ 0x00000000,
+ 0x00000000,
+ 0xc0016900,
0x00000080,
0x00000000,
0xc0016900,
+ 0x0000008c,
+ 0x00000000,
+ 0xc0016900,
0x00000083,
0x0000ffff,
- 0xc0016900,
+ 0xc0026900,
0x00000084,
0x00000000,
- 0xc0016900,
- 0x00000085,
0x20002000,
- 0xc0016900,
+ 0xc0026900,
0x00000086,
0x00000000,
- 0xc0016900,
- 0x00000087,
0x20002000,
- 0xc0016900,
+ 0xc0026900,
0x00000088,
0x00000000,
- 0xc0016900,
- 0x00000089,
0x20002000,
- 0xc0016900,
+ 0xc0026900,
0x0000008a,
0x00000000,
- 0xc0016900,
- 0x0000008b,
0x20002000,
- 0xc0016900,
- 0x0000008c,
- 0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x00000094,
0x80000000,
- 0xc0016900,
- 0x00000095,
0x20002000,
0xc0026900,
- 0x000000b4,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x00000096,
0x80000000,
- 0xc0016900,
- 0x00000097,
0x20002000,
0xc0026900,
- 0x000000b6,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x00000098,
0x80000000,
- 0xc0016900,
- 0x00000099,
0x20002000,
0xc0026900,
- 0x000000b8,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x0000009a,
0x80000000,
- 0xc0016900,
- 0x0000009b,
0x20002000,
0xc0026900,
- 0x000000ba,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x0000009c,
0x80000000,
- 0xc0016900,
- 0x0000009d,
0x20002000,
0xc0026900,
- 0x000000bc,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x0000009e,
0x80000000,
- 0xc0016900,
- 0x0000009f,
0x20002000,
0xc0026900,
- 0x000000be,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a0,
0x80000000,
- 0xc0016900,
- 0x000000a1,
0x20002000,
0xc0026900,
- 0x000000c0,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a2,
0x80000000,
- 0xc0016900,
- 0x000000a3,
0x20002000,
0xc0026900,
- 0x000000c2,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a4,
0x80000000,
- 0xc0016900,
- 0x000000a5,
0x20002000,
0xc0026900,
- 0x000000c4,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a6,
0x80000000,
- 0xc0016900,
- 0x000000a7,
0x20002000,
0xc0026900,
- 0x000000c6,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a8,
0x80000000,
- 0xc0016900,
- 0x000000a9,
0x20002000,
0xc0026900,
- 0x000000c8,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000aa,
0x80000000,
- 0xc0016900,
- 0x000000ab,
0x20002000,
0xc0026900,
- 0x000000ca,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000ac,
0x80000000,
- 0xc0016900,
- 0x000000ad,
0x20002000,
0xc0026900,
- 0x000000cc,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000ae,
0x80000000,
- 0xc0016900,
- 0x000000af,
0x20002000,
0xc0026900,
- 0x000000ce,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000b0,
0x80000000,
- 0xc0016900,
- 0x000000b1,
0x20002000,
0xc0026900,
- 0x000000d0,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000b2,
0x80000000,
- 0xc0016900,
- 0x000000b3,
0x20002000,
0xc0026900,
- 0x000000d2,
+ 0x00000292,
0x00000000,
- 0x3f800000,
- 0xc0016900,
- 0x00000293,
0x00004010,
- 0xc0016900,
+ 0xc0096900,
0x00000300,
0x00000000,
- 0xc0016900,
- 0x00000301,
- 0x00000000,
- 0xc0016900,
- 0x00000312,
- 0xffffffff,
- 0xc0016900,
- 0x00000307,
- 0x00000000,
- 0xc0016900,
- 0x00000308,
- 0x00000000,
- 0xc0016900,
- 0x00000283,
- 0x00000000,
- 0xc0016900,
- 0x00000292,
- 0x00000000,
- 0xc0066900,
- 0x0000010f,
- 0x00000000,
- 0x00000000,
- 0x00000000,
- 0x00000000,
- 0x00000000,
0x00000000,
- 0xc0016900,
- 0x00000206,
- 0x00000000,
- 0xc0016900,
- 0x00000207,
- 0x00000000,
- 0xc0016900,
- 0x00000208,
- 0x00000000,
- 0xc0046900,
- 0x00000303,
+ 0x0000002d,
0x3f800000,
0x3f800000,
0x3f800000,
0x3f800000,
+ 0x00000000,
+ 0x00000000,
0xc0016900,
- 0x00000205,
+ 0x00000312,
+ 0xffffffff,
+ 0xc0056900,
+ 0x00000204,
+ 0x00010000,
0x00000004,
- 0xc0016900,
- 0x00000280,
+ 0x00000100,
0x00000000,
- 0xc0016900,
- 0x00000281,
0x00000000,
- 0xc0016900,
+ 0xc0066900,
0x0000037e,
0x00000000,
- 0xc0016900,
- 0x00000382,
0x00000000,
- 0xc0016900,
- 0x00000380,
0x00000000,
- 0xc0016900,
- 0x00000383,
0x00000000,
- 0xc0016900,
- 0x00000381,
0x00000000,
- 0xc0016900,
- 0x00000282,
- 0x00000008,
- 0xc0016900,
- 0x00000302,
- 0x0000002d,
- 0xc0016900,
- 0x0000037f,
0x00000000,
0xc0016900,
0x000001b2,
0x00000000,
- 0xc0016900,
+ 0xc0046900,
0x000001b6,
0x00000000,
- 0xc0016900,
- 0x000001b7,
0x00000000,
- 0xc0016900,
- 0x000001b8,
0x00000000,
- 0xc0016900,
- 0x000001b9,
0x00000000,
0xc0016900,
0x00000225,
@@ -435,125 +261,69 @@ const u32 r6xx_default_state[] =
0xc0016900,
0x00000237,
0x00000000,
- 0xc0016900,
+ 0xc0046900,
0x00000100,
0x00000800,
- 0xc0016900,
- 0x00000101,
+ 0x00000000,
+ 0x00000000,
0x00000000,
0xc0016900,
- 0x00000102,
+ 0x000002a1,
0x00000000,
0xc0016900,
+ 0x000002a5,
+ 0x00000000,
+ 0xc0026900,
0x000002a8,
0x00000000,
- 0xc0016900,
- 0x000002a9,
0x00000000,
- 0xc0016900,
- 0x00000103,
+ 0xc0116900,
+ 0x00000280,
0x00000000,
- 0xc0016900,
- 0x00000284,
0x00000000,
- 0xc0016900,
- 0x00000290,
+ 0x00000008,
0x00000000,
- 0xc0016900,
- 0x00000285,
0x00000000,
- 0xc0016900,
- 0x00000286,
0x00000000,
- 0xc0016900,
- 0x00000287,
0x00000000,
- 0xc0016900,
- 0x00000288,
0x00000000,
- 0xc0016900,
- 0x00000289,
0x00000000,
- 0xc0016900,
- 0x0000028a,
0x00000000,
- 0xc0016900,
- 0x0000028b,
0x00000000,
- 0xc0016900,
- 0x0000028c,
0x00000000,
- 0xc0016900,
- 0x0000028d,
0x00000000,
- 0xc0016900,
- 0x0000028e,
0x00000000,
- 0xc0016900,
- 0x0000028f,
0x00000000,
- 0xc0016900,
- 0x000002a1,
0x00000000,
- 0xc0016900,
- 0x000002a5,
0x00000000,
- 0xc0016900,
+ 0xc0036900,
0x000002ac,
0x00000000,
- 0xc0016900,
- 0x000002ad,
0x00000000,
- 0xc0016900,
- 0x000002ae,
0x00000000,
0xc0016900,
0x000002c8,
0x00000000,
0xc0016900,
- 0x00000206,
- 0x00000100,
- 0xc0016900,
- 0x00000204,
- 0x00010000,
- 0xc0036e00,
- 0x00000000,
- 0x00000012,
- 0x00000000,
- 0x00000000,
- 0xc0016900,
- 0x0000008f,
+ 0x0000008e,
0x0000000f,
0xc0016900,
- 0x000001e8,
- 0x00000001,
- 0xc0016900,
0x00000202,
0x00cc0000,
0xc0016900,
- 0x00000205,
- 0x00000244,
- 0xc0016900,
- 0x00000203,
- 0x00000210,
- 0xc0016900,
0x000001b1,
0x00000000,
0xc0016900,
0x00000185,
0x00000000,
- 0xc0016900,
+ 0xc0036900,
0x000001b3,
0x00000001,
- 0xc0016900,
- 0x000001b4,
+ 0x00000000,
0x00000000,
0xc0016900,
0x00000191,
- 0x00000b00,
- 0xc0016900,
- 0x000001b5,
- 0x00000000,
+ 0x00000900,
};
const u32 r7xx_default_state[] =
@@ -566,7 +336,7 @@ const u32 r7xx_default_state[] =
0x00008000,
0xc0016800,
0x00000542,
- 0x07000002,
+ 0xf9000002,
0xc0016800,
0x000005c5,
0x00000000,
@@ -579,11 +349,9 @@ const u32 r7xx_default_state[] =
0xc0016800,
0x0000060e,
0x00420204,
- 0xc0016f00,
+ 0xc0026f00,
0x00000000,
0x00000000,
- 0xc0016f00,
- 0x00000001,
0x00000000,
0xc0096900,
0x0000022a,
@@ -600,38 +368,24 @@ const u32 r7xx_default_state[] =
0x00000004,
0x00000000,
0xc0016900,
- 0x0000000a,
- 0x00000000,
- 0xc0016900,
- 0x0000000b,
- 0x00000000,
- 0xc0016900,
- 0x0000010c,
- 0x00000000,
- 0xc0016900,
- 0x0000010d,
- 0x00000000,
- 0xc0016900,
0x00000200,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x00000343,
0x00000060,
- 0xc0016900,
- 0x00000344,
0x00000000,
0xc0016900,
0x00000351,
0x0000aa00,
0xc0016900,
- 0x00000104,
- 0x00000000,
- 0xc0016900,
- 0x0000010e,
+ 0x00000203,
+ 0x00000210,
+ 0xc0026900,
+ 0x0000000a,
0x00000000,
- 0xc0046900,
- 0x00000105,
0x00000000,
+ 0xc0036900,
+ 0x0000010c,
0x00000000,
0x00000000,
0x00000000,
@@ -642,295 +396,148 @@ const u32 r7xx_default_state[] =
0x00000000,
0x00000000,
0xc0016900,
- 0x0000008e,
+ 0x0000008f,
0x0000000f,
0xc0016900,
+ 0x000001e8,
+ 0x00000001,
+ 0xc0056900,
+ 0x00000104,
+ 0x00000000,
+ 0x00000000,
+ 0x00000000,
+ 0x00000000,
+ 0x00000000,
+ 0xc0016900,
0x00000080,
0x00000000,
0xc0016900,
+ 0x0000008c,
+ 0xaaaaaaaa,
+ 0xc0016900,
0x00000083,
0x0000ffff,
- 0xc0016900,
+ 0xc0026900,
0x00000084,
0x00000000,
- 0xc0016900,
- 0x00000085,
0x20002000,
- 0xc0016900,
+ 0xc0026900,
0x00000086,
0x00000000,
- 0xc0016900,
- 0x00000087,
0x20002000,
- 0xc0016900,
+ 0xc0026900,
0x00000088,
0x00000000,
- 0xc0016900,
- 0x00000089,
0x20002000,
- 0xc0016900,
+ 0xc0026900,
0x0000008a,
0x00000000,
- 0xc0016900,
- 0x0000008b,
0x20002000,
- 0xc0016900,
- 0x0000008c,
- 0xaaaaaaaa,
- 0xc0016900,
+ 0xc0026900,
0x00000094,
0x80000000,
- 0xc0016900,
- 0x00000095,
0x20002000,
0xc0026900,
- 0x000000b4,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x00000096,
0x80000000,
- 0xc0016900,
- 0x00000097,
0x20002000,
0xc0026900,
- 0x000000b6,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x00000098,
0x80000000,
- 0xc0016900,
- 0x00000099,
0x20002000,
0xc0026900,
- 0x000000b8,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x0000009a,
0x80000000,
- 0xc0016900,
- 0x0000009b,
0x20002000,
0xc0026900,
- 0x000000ba,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x0000009c,
0x80000000,
- 0xc0016900,
- 0x0000009d,
0x20002000,
0xc0026900,
- 0x000000bc,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x0000009e,
0x80000000,
- 0xc0016900,
- 0x0000009f,
0x20002000,
0xc0026900,
- 0x000000be,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a0,
0x80000000,
- 0xc0016900,
- 0x000000a1,
0x20002000,
0xc0026900,
- 0x000000c0,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a2,
0x80000000,
- 0xc0016900,
- 0x000000a3,
0x20002000,
0xc0026900,
- 0x000000c2,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a4,
0x80000000,
- 0xc0016900,
- 0x000000a5,
0x20002000,
0xc0026900,
- 0x000000c4,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a6,
0x80000000,
- 0xc0016900,
- 0x000000a7,
0x20002000,
0xc0026900,
- 0x000000c6,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000a8,
0x80000000,
- 0xc0016900,
- 0x000000a9,
0x20002000,
0xc0026900,
- 0x000000c8,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000aa,
0x80000000,
- 0xc0016900,
- 0x000000ab,
0x20002000,
0xc0026900,
- 0x000000ca,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000ac,
0x80000000,
- 0xc0016900,
- 0x000000ad,
0x20002000,
0xc0026900,
- 0x000000cc,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000ae,
0x80000000,
- 0xc0016900,
- 0x000000af,
0x20002000,
0xc0026900,
- 0x000000ce,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000b0,
0x80000000,
- 0xc0016900,
- 0x000000b1,
0x20002000,
0xc0026900,
- 0x000000d0,
- 0x00000000,
- 0x3f800000,
- 0xc0016900,
0x000000b2,
0x80000000,
- 0xc0016900,
- 0x000000b3,
0x20002000,
0xc0026900,
- 0x000000d2,
+ 0x00000292,
0x00000000,
- 0x3f800000,
- 0xc0016900,
- 0x00000293,
0x00514000,
- 0xc0016900,
+ 0xc0096900,
0x00000300,
0x00000000,
- 0xc0016900,
- 0x00000301,
- 0x00000000,
- 0xc0016900,
- 0x00000312,
- 0xffffffff,
- 0xc0016900,
- 0x00000307,
- 0x00000000,
- 0xc0016900,
- 0x00000308,
- 0x00000000,
- 0xc0016900,
- 0x00000283,
- 0x00000000,
- 0xc0016900,
- 0x00000292,
- 0x00000000,
- 0xc0066900,
- 0x0000010f,
- 0x00000000,
- 0x00000000,
- 0x00000000,
- 0x00000000,
- 0x00000000,
- 0x00000000,
- 0xc0016900,
- 0x00000206,
- 0x00000000,
- 0xc0016900,
- 0x00000207,
0x00000000,
- 0xc0016900,
- 0x00000208,
- 0x00000000,
- 0xc0046900,
- 0x00000303,
+ 0x0000002d,
0x3f800000,
0x3f800000,
0x3f800000,
0x3f800000,
+ 0x00000000,
+ 0x00000000,
0xc0016900,
- 0x00000205,
+ 0x00000312,
+ 0xffffffff,
+ 0xc0056900,
+ 0x00000204,
+ 0x00010000,
0x00000004,
- 0xc0016900,
- 0x00000280,
+ 0x00000100,
0x00000000,
- 0xc0016900,
- 0x00000281,
0x00000000,
- 0xc0016900,
+ 0xc0066900,
0x0000037e,
0x00000000,
- 0xc0016900,
- 0x00000382,
0x00000000,
- 0xc0016900,
- 0x00000380,
0x00000000,
- 0xc0016900,
- 0x00000383,
0x00000000,
- 0xc0016900,
- 0x00000381,
0x00000000,
- 0xc0016900,
- 0x00000282,
- 0x00000008,
- 0xc0016900,
- 0x00000302,
- 0x0000002d,
- 0xc0016900,
- 0x0000037f,
0x00000000,
0xc0016900,
0x000001b2,
0x00000001,
- 0xc0016900,
+ 0xc0046900,
0x000001b6,
0x00000000,
- 0xc0016900,
- 0x000001b7,
0x00000000,
- 0xc0016900,
- 0x000001b8,
0x00000000,
- 0xc0016900,
- 0x000001b9,
0x00000000,
0xc0016900,
0x00000225,
@@ -941,125 +548,69 @@ const u32 r7xx_default_state[] =
0xc0016900,
0x00000237,
0x00000000,
- 0xc0016900,
+ 0xc0046900,
0x00000100,
0x00000800,
- 0xc0016900,
- 0x00000101,
+ 0x00000000,
+ 0x00000000,
0x00000000,
0xc0016900,
- 0x00000102,
+ 0x000002a1,
0x00000000,
0xc0016900,
+ 0x000002a5,
+ 0x00000000,
+ 0xc0026900,
0x000002a8,
0x00000000,
- 0xc0016900,
- 0x000002a9,
0x00000000,
- 0xc0016900,
- 0x00000103,
+ 0xc0116900,
+ 0x00000280,
0x00000000,
- 0xc0016900,
- 0x00000284,
0x00000000,
- 0xc0016900,
- 0x00000290,
+ 0x00000008,
0x00000000,
- 0xc0016900,
- 0x00000285,
0x00000000,
- 0xc0016900,
- 0x00000286,
0x00000000,
- 0xc0016900,
- 0x00000287,
0x00000000,
- 0xc0016900,
- 0x00000288,
0x00000000,
- 0xc0016900,
- 0x00000289,
0x00000000,
- 0xc0016900,
- 0x0000028a,
0x00000000,
- 0xc0016900,
- 0x0000028b,
0x00000000,
- 0xc0016900,
- 0x0000028c,
0x00000000,
- 0xc0016900,
- 0x0000028d,
0x00000000,
- 0xc0016900,
- 0x0000028e,
0x00000000,
- 0xc0016900,
- 0x0000028f,
0x00000000,
- 0xc0016900,
- 0x000002a1,
0x00000000,
- 0xc0016900,
- 0x000002a5,
0x00000000,
- 0xc0016900,
+ 0xc0036900,
0x000002ac,
0x00000000,
- 0xc0016900,
- 0x000002ad,
0x00000000,
- 0xc0016900,
- 0x000002ae,
0x00000000,
0xc0016900,
0x000002c8,
0x00000000,
0xc0016900,
- 0x00000206,
- 0x00000100,
- 0xc0016900,
- 0x00000204,
- 0x00010000,
- 0xc0036e00,
- 0x00000000,
- 0x00000012,
- 0x00000000,
- 0x00000000,
- 0xc0016900,
- 0x0000008f,
+ 0x0000008e,
0x0000000f,
0xc0016900,
- 0x000001e8,
- 0x00000001,
- 0xc0016900,
0x00000202,
0x00cc0000,
0xc0016900,
- 0x00000205,
- 0x00000244,
- 0xc0016900,
- 0x00000203,
- 0x00000210,
- 0xc0016900,
0x000001b1,
0x00000000,
0xc0016900,
0x00000185,
0x00000000,
- 0xc0016900,
+ 0xc0036900,
0x000001b3,
0x00000001,
- 0xc0016900,
- 0x000001b4,
+ 0x00000000,
0x00000000,
0xc0016900,
0x00000191,
- 0x00000b00,
- 0xc0016900,
- 0x000001b5,
- 0x00000000,
+ 0x00000900,
};
/* same for r6xx/r7xx */
--
1.7.1.1
[-- Attachment #3: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-24 20:41 ` Alex Deucher
@ 2010-07-25 12:14 ` Rafał Miłecki
2010-07-26 5:57 ` Alex Deucher
0 siblings, 1 reply; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-25 12:14 UTC (permalink / raw)
To: Alex Deucher; +Cc: Dave Airlie, dri-devel
W dniu 24 lipca 2010 22:41 użytkownik Alex Deucher
<alexdeucher@gmail.com> napisał:
> 2010/7/24 Rafał Miłecki <zajec5@gmail.com>:
>> W dniu 21 lipca 2010 19:23 użytkownik Alex Deucher
>> <alexdeucher@gmail.com> napisał:
>>> 2010/7/21 Rafał Miłecki <zajec5@gmail.com>:
>>>> W dniu 21 lipca 2010 11:30 użytkownik Rafał Miłecki <zajec5@gmail.com> napisał:
>>>>> First bisect try gave me:
>>>>> bad: [d8c253f30d0eb975e5c42c31587ef718517f5067]
>>>>> drm/radeon: optimize default 3D state for r6xx/r7xx blits
>>>>>
>>>>> I'm leaving today, not sure if I manage to confirm this before next week.
>>>>
>>>> I switched back to rebased drm-radeon-testing and confirmed lockup.
>>>> Then reverted that single patch and it helped. I'm quite sure it's the
>>>> "bad one".
>>>>
>>>> I use KDE4 with effects enabled, so 3D is enabled here.
>>>>
>>>> Not time to dig into this problem deeper, leaving now.
>>>
>>> When you get back can you revert the original and test version 2 of
>>> that patch (attached). It puts back the original state, but
>>> reorganizes the emit order to reduce the number of dwords.
>>
>> Applied V2 instead of V1 and got lockup again (on resume). Reverting
>> applied V2 (so without V1 and without V2) "fixes" lockup.
>
> I see the problem. The original waited for idle at the top of the
> default state. This new patch is v1 + wait for idle. Please remove
> v1 and v2 and then apply v3.
Whoops, still no luck with V3 (applied as only version of patch) :| Is
that possible to split changes in r6xx_default_state to track down
problematic one?
The difference I noticed with V3 is that I got 5-6 screen flashes
after resuming. Earlier it was about 3. However I tested it just once,
can be not related.
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-25 12:14 ` Rafał Miłecki
@ 2010-07-26 5:57 ` Alex Deucher
2010-07-26 12:02 ` Rafał Miłecki
0 siblings, 1 reply; 26+ messages in thread
From: Alex Deucher @ 2010-07-26 5:57 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Dave Airlie, dri-devel
[-- Attachment #1: Type: text/plain, Size: 1957 bytes --]
2010/7/25 Rafał Miłecki <zajec5@gmail.com>:
> W dniu 24 lipca 2010 22:41 użytkownik Alex Deucher
> <alexdeucher@gmail.com> napisał:
>> 2010/7/24 Rafał Miłecki <zajec5@gmail.com>:
>>> W dniu 21 lipca 2010 19:23 użytkownik Alex Deucher
>>> <alexdeucher@gmail.com> napisał:
>>>> 2010/7/21 Rafał Miłecki <zajec5@gmail.com>:
>>>>> W dniu 21 lipca 2010 11:30 użytkownik Rafał Miłecki <zajec5@gmail.com> napisał:
>>>>>> First bisect try gave me:
>>>>>> bad: [d8c253f30d0eb975e5c42c31587ef718517f5067]
>>>>>> drm/radeon: optimize default 3D state for r6xx/r7xx blits
>>>>>>
>>>>>> I'm leaving today, not sure if I manage to confirm this before next week.
>>>>>
>>>>> I switched back to rebased drm-radeon-testing and confirmed lockup.
>>>>> Then reverted that single patch and it helped. I'm quite sure it's the
>>>>> "bad one".
>>>>>
>>>>> I use KDE4 with effects enabled, so 3D is enabled here.
>>>>>
>>>>> Not time to dig into this problem deeper, leaving now.
>>>>
>>>> When you get back can you revert the original and test version 2 of
>>>> that patch (attached). It puts back the original state, but
>>>> reorganizes the emit order to reduce the number of dwords.
>>>
>>> Applied V2 instead of V1 and got lockup again (on resume). Reverting
>>> applied V2 (so without V1 and without V2) "fixes" lockup.
>>
>> I see the problem. The original waited for idle at the top of the
>> default state. This new patch is v1 + wait for idle. Please remove
>> v1 and v2 and then apply v3.
>
> Whoops, still no luck with V3 (applied as only version of patch) :| Is
> that possible to split changes in r6xx_default_state to track down
> problematic one?
I'll try and break it down more fine grained tomorrow.
>
> The difference I noticed with V3 is that I got 5-6 screen flashes
> after resuming. Earlier it was about 3. However I tested it just once,
> can be not related.
How about v4 (attached)? Any better?
Alex
[-- Attachment #2: 0001-drm-radeon-optimize-default-3D-state-for-r6xx-r7xx-b.patch --]
[-- Type: text/x-patch, Size: 16431 bytes --]
From 8d8c73de4f4c145ae90a27a4468f84652a3abd72 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Mon, 26 Jul 2010 01:50:42 -0400
Subject: [PATCH] drm/radeon: optimize default 3D state for r6xx/r7xx blits (v4)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Re-organize emit order to reduce the number of dwords in the
default 3D state. This change reduces the default state size
from 514 dwords to 343.
v4: add back more state and wait until idle at the top of the
default state.
Should fix use of the engine for bo moves after resume with
the optimzed state emit.
Reported-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
drivers/gpu/drm/radeon/r600_blit_shaders.c | 562 ++++++----------------------
1 files changed, 122 insertions(+), 440 deletions(-)
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
index 0271b53..a490f7c 100644
--- a/drivers/gpu/drm/radeon/r600_blit_shaders.c
+++ b/drivers/gpu/drm/radeon/r600_blit_shaders.c
@@ -62,11 +62,9 @@ const u32 r6xx_default_state[] =
0xc0016800,
0x0000060e,
0x01020204,
- 0xc0016f00,
+ 0xc0026f00,
0x00000000,
0x00000000,
- 0xc0016f00,
- 0x00000001,
0x00000000,
0xc0096900,
0x0000022a,
@@ -82,31 +80,28 @@ const u32 r6xx_default_state[] =
0xc0016900,
0x00000004,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x0000000a,
0x00000000,
- 0xc0016900,
- 0x0000000b,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x0000010c,
0x00000000,
- 0xc0016900,
- 0x0000010d,
0x00000000,
0xc0016900,
0x00000200,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x00000343,
0x00000060,
- 0xc0016900,
- 0x00000344,
0x00000040,
0xc0016900,
0x00000351,
0x0000aa00,
0xc0016900,
+ 0x00000203,
+ 0x00000210,
+ 0xc0016900,
0x00000104,
0x00000000,
0xc0016900,
@@ -124,237 +119,178 @@ const u32 r6xx_default_state[] =
0x00000000,
0x00000000,
0xc0046900,
- 0x0000030c,
- 0x01000000,
- 0x00000000,
- 0x00000000,
- 0x00000000,
- 0xc0046900,
0x00000048,
0x3f800000,
0x00000000,
0x3f800000,
0x3f800000,
- 0xc0016900,
- 0x0000008e,
- 0x0000000f,
- 0xc0016900,
- 0x00000080,
+ 0xc0046900,
+ 0x0000030c,
+ 0x01000000,
0x00000000,
- 0xc0016900,
- 0x00000083,
- 0x0000ffff,
- 0xc0016900,
- 0x00000084,
0x00000000,
- 0xc0016900,
- 0x00000085,
- 0x20002000,
- 0xc0016900,
- 0x00000086,
0x00000000,
0xc0016900,
- 0x00000087,
- 0x20002000,
- 0xc0016900,
- 0x00000088,
- 0x00000000,
+ 0x0000008f,
+ 0x0000000f,
0xc0016900,
- 0x00000089,
- 0x20002000,
+ 0x000001e8,
+ 0x00000001,
0xc0016900,
- 0x0000008a,
+ 0x00000080,
0x00000000,
0xc0016900,
- 0x0000008b,
- 0x20002000,
+ 0x00000083,
+ 0x0000ffff,
0xc0016900,
0x0000008c,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x00000094,
0x80000000,
- 0xc0016900,
- 0x00000095,
0x20002000,
0xc0026900,
0x000000b4,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x00000096,
0x80000000,
- 0xc0016900,
- 0x00000097,
0x20002000,
0xc0026900,
0x000000b6,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x00000098,
0x80000000,
- 0xc0016900,
- 0x00000099,
0x20002000,
0xc0026900,
0x000000b8,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009a,
0x80000000,
- 0xc0016900,
- 0x0000009b,
0x20002000,
0xc0026900,
0x000000ba,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009c,
0x80000000,
- 0xc0016900,
- 0x0000009d,
0x20002000,
0xc0026900,
0x000000bc,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009e,
0x80000000,
- 0xc0016900,
- 0x0000009f,
0x20002000,
0xc0026900,
0x000000be,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a0,
0x80000000,
- 0xc0016900,
- 0x000000a1,
0x20002000,
0xc0026900,
0x000000c0,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a2,
0x80000000,
- 0xc0016900,
- 0x000000a3,
0x20002000,
0xc0026900,
0x000000c2,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a4,
0x80000000,
- 0xc0016900,
- 0x000000a5,
0x20002000,
0xc0026900,
0x000000c4,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a6,
0x80000000,
- 0xc0016900,
- 0x000000a7,
0x20002000,
0xc0026900,
0x000000c6,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a8,
0x80000000,
- 0xc0016900,
- 0x000000a9,
0x20002000,
0xc0026900,
0x000000c8,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000aa,
0x80000000,
- 0xc0016900,
- 0x000000ab,
0x20002000,
0xc0026900,
0x000000ca,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000ac,
0x80000000,
- 0xc0016900,
- 0x000000ad,
0x20002000,
0xc0026900,
0x000000cc,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000ae,
0x80000000,
- 0xc0016900,
- 0x000000af,
0x20002000,
0xc0026900,
0x000000ce,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000b0,
0x80000000,
- 0xc0016900,
- 0x000000b1,
0x20002000,
0xc0026900,
0x000000d0,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000b2,
0x80000000,
- 0xc0016900,
- 0x000000b3,
0x20002000,
0xc0026900,
0x000000d2,
0x00000000,
0x3f800000,
- 0xc0016900,
- 0x00000293,
+ 0xc0026900,
+ 0x00000292,
+ 0x00000000,
0x00004010,
- 0xc0016900,
+ 0xc0096900,
0x00000300,
0x00000000,
- 0xc0016900,
- 0x00000301,
0x00000000,
- 0xc0016900,
- 0x00000312,
- 0xffffffff,
- 0xc0016900,
- 0x00000307,
- 0x00000000,
- 0xc0016900,
- 0x00000308,
+ 0x0000002d,
+ 0x3f800000,
+ 0x3f800000,
+ 0x3f800000,
+ 0x3f800000,
0x00000000,
- 0xc0016900,
- 0x00000283,
0x00000000,
0xc0016900,
- 0x00000292,
- 0x00000000,
+ 0x00000312,
+ 0xffffffff,
0xc0066900,
0x0000010f,
0x00000000,
@@ -363,68 +299,29 @@ const u32 r6xx_default_state[] =
0x00000000,
0x00000000,
0x00000000,
- 0xc0016900,
- 0x00000206,
- 0x00000000,
- 0xc0016900,
- 0x00000207,
- 0x00000000,
- 0xc0016900,
- 0x00000208,
- 0x00000000,
- 0xc0046900,
- 0x00000303,
- 0x3f800000,
- 0x3f800000,
- 0x3f800000,
- 0x3f800000,
- 0xc0016900,
- 0x00000205,
+ 0xc0056900,
+ 0x00000204,
+ 0x00010000,
0x00000004,
- 0xc0016900,
- 0x00000280,
+ 0x00000100,
0x00000000,
- 0xc0016900,
- 0x00000281,
0x00000000,
- 0xc0016900,
+ 0xc0066900,
0x0000037e,
0x00000000,
- 0xc0016900,
- 0x00000382,
0x00000000,
- 0xc0016900,
- 0x00000380,
0x00000000,
- 0xc0016900,
- 0x00000383,
0x00000000,
- 0xc0016900,
- 0x00000381,
0x00000000,
- 0xc0016900,
- 0x00000282,
- 0x00000008,
- 0xc0016900,
- 0x00000302,
- 0x0000002d,
- 0xc0016900,
- 0x0000037f,
0x00000000,
0xc0016900,
0x000001b2,
0x00000000,
- 0xc0016900,
+ 0xc0046900,
0x000001b6,
0x00000000,
- 0xc0016900,
- 0x000001b7,
0x00000000,
- 0xc0016900,
- 0x000001b8,
0x00000000,
- 0xc0016900,
- 0x000001b9,
0x00000000,
0xc0016900,
0x00000225,
@@ -435,62 +332,30 @@ const u32 r6xx_default_state[] =
0xc0016900,
0x00000237,
0x00000000,
- 0xc0016900,
+ 0xc0046900,
0x00000100,
0x00000800,
- 0xc0016900,
- 0x00000101,
0x00000000,
- 0xc0016900,
- 0x00000102,
0x00000000,
- 0xc0016900,
- 0x000002a8,
0x00000000,
- 0xc0016900,
- 0x000002a9,
+ 0xc0116900,
+ 0x00000280,
0x00000000,
- 0xc0016900,
- 0x00000103,
0x00000000,
- 0xc0016900,
- 0x00000284,
+ 0x00000008,
+ 0x00000000,
0x00000000,
- 0xc0016900,
- 0x00000290,
0x00000000,
- 0xc0016900,
- 0x00000285,
0x00000000,
- 0xc0016900,
- 0x00000286,
0x00000000,
- 0xc0016900,
- 0x00000287,
0x00000000,
- 0xc0016900,
- 0x00000288,
0x00000000,
- 0xc0016900,
- 0x00000289,
0x00000000,
- 0xc0016900,
- 0x0000028a,
0x00000000,
- 0xc0016900,
- 0x0000028b,
0x00000000,
- 0xc0016900,
- 0x0000028c,
0x00000000,
- 0xc0016900,
- 0x0000028d,
0x00000000,
- 0xc0016900,
- 0x0000028e,
0x00000000,
- 0xc0016900,
- 0x0000028f,
0x00000000,
0xc0016900,
0x000002a1,
@@ -498,61 +363,37 @@ const u32 r6xx_default_state[] =
0xc0016900,
0x000002a5,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
+ 0x000002a8,
+ 0x00000000,
+ 0x00000000,
+ 0xc0036900,
0x000002ac,
0x00000000,
- 0xc0016900,
- 0x000002ad,
0x00000000,
- 0xc0016900,
- 0x000002ae,
0x00000000,
0xc0016900,
0x000002c8,
0x00000000,
0xc0016900,
- 0x00000206,
- 0x00000100,
- 0xc0016900,
- 0x00000204,
- 0x00010000,
- 0xc0036e00,
- 0x00000000,
- 0x00000012,
- 0x00000000,
- 0x00000000,
- 0xc0016900,
- 0x0000008f,
+ 0x0000008e,
0x0000000f,
0xc0016900,
- 0x000001e8,
- 0x00000001,
- 0xc0016900,
0x00000202,
0x00cc0000,
0xc0016900,
- 0x00000205,
- 0x00000244,
- 0xc0016900,
- 0x00000203,
- 0x00000210,
- 0xc0016900,
0x000001b1,
0x00000000,
0xc0016900,
0x00000185,
0x00000000,
0xc0016900,
+ 0x00000191,
+ 0x00000900,
+ 0xc0036900,
0x000001b3,
0x00000001,
- 0xc0016900,
- 0x000001b4,
0x00000000,
- 0xc0016900,
- 0x00000191,
- 0x00000b00,
- 0xc0016900,
- 0x000001b5,
0x00000000,
};
@@ -579,11 +420,9 @@ const u32 r7xx_default_state[] =
0xc0016800,
0x0000060e,
0x00420204,
- 0xc0016f00,
+ 0xc0026f00,
0x00000000,
0x00000000,
- 0xc0016f00,
- 0x00000001,
0x00000000,
0xc0096900,
0x0000022a,
@@ -599,31 +438,28 @@ const u32 r7xx_default_state[] =
0xc0016900,
0x00000004,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x0000000a,
0x00000000,
- 0xc0016900,
- 0x0000000b,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x0000010c,
0x00000000,
- 0xc0016900,
- 0x0000010d,
0x00000000,
0xc0016900,
0x00000200,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
0x00000343,
0x00000060,
- 0xc0016900,
- 0x00000344,
0x00000000,
0xc0016900,
0x00000351,
0x0000aa00,
0xc0016900,
+ 0x00000203,
+ 0x00000210,
+ 0xc0016900,
0x00000104,
0x00000000,
0xc0016900,
@@ -642,225 +478,166 @@ const u32 r7xx_default_state[] =
0x00000000,
0x00000000,
0xc0016900,
- 0x0000008e,
+ 0x0000008f,
0x0000000f,
0xc0016900,
+ 0x000001e8,
+ 0x00000001,
+ 0xc0016900,
0x00000080,
0x00000000,
0xc0016900,
0x00000083,
0x0000ffff,
0xc0016900,
- 0x00000084,
- 0x00000000,
- 0xc0016900,
- 0x00000085,
- 0x20002000,
- 0xc0016900,
- 0x00000086,
- 0x00000000,
- 0xc0016900,
- 0x00000087,
- 0x20002000,
- 0xc0016900,
- 0x00000088,
- 0x00000000,
- 0xc0016900,
- 0x00000089,
- 0x20002000,
- 0xc0016900,
- 0x0000008a,
- 0x00000000,
- 0xc0016900,
- 0x0000008b,
- 0x20002000,
- 0xc0016900,
0x0000008c,
0xaaaaaaaa,
- 0xc0016900,
+ 0xc0026900,
0x00000094,
0x80000000,
- 0xc0016900,
- 0x00000095,
0x20002000,
0xc0026900,
0x000000b4,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x00000096,
0x80000000,
- 0xc0016900,
- 0x00000097,
0x20002000,
0xc0026900,
0x000000b6,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x00000098,
0x80000000,
- 0xc0016900,
- 0x00000099,
0x20002000,
0xc0026900,
0x000000b8,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009a,
0x80000000,
- 0xc0016900,
- 0x0000009b,
0x20002000,
0xc0026900,
0x000000ba,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009c,
0x80000000,
- 0xc0016900,
- 0x0000009d,
0x20002000,
0xc0026900,
0x000000bc,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x0000009e,
0x80000000,
- 0xc0016900,
- 0x0000009f,
0x20002000,
0xc0026900,
0x000000be,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a0,
0x80000000,
- 0xc0016900,
- 0x000000a1,
0x20002000,
0xc0026900,
0x000000c0,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a2,
0x80000000,
- 0xc0016900,
- 0x000000a3,
0x20002000,
0xc0026900,
0x000000c2,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a4,
0x80000000,
- 0xc0016900,
- 0x000000a5,
0x20002000,
0xc0026900,
0x000000c4,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a6,
0x80000000,
- 0xc0016900,
- 0x000000a7,
0x20002000,
0xc0026900,
0x000000c6,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000a8,
0x80000000,
- 0xc0016900,
- 0x000000a9,
0x20002000,
0xc0026900,
0x000000c8,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000aa,
0x80000000,
- 0xc0016900,
- 0x000000ab,
0x20002000,
0xc0026900,
0x000000ca,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000ac,
0x80000000,
- 0xc0016900,
- 0x000000ad,
0x20002000,
0xc0026900,
0x000000cc,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000ae,
0x80000000,
- 0xc0016900,
- 0x000000af,
0x20002000,
0xc0026900,
0x000000ce,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000b0,
0x80000000,
- 0xc0016900,
- 0x000000b1,
0x20002000,
0xc0026900,
0x000000d0,
0x00000000,
0x3f800000,
- 0xc0016900,
+ 0xc0026900,
0x000000b2,
0x80000000,
- 0xc0016900,
- 0x000000b3,
0x20002000,
0xc0026900,
0x000000d2,
0x00000000,
0x3f800000,
- 0xc0016900,
- 0x00000293,
+ 0xc0026900,
+ 0x00000292,
+ 0x00000000,
0x00514000,
- 0xc0016900,
+ 0xc0096900,
0x00000300,
0x00000000,
- 0xc0016900,
- 0x00000301,
- 0x00000000,
- 0xc0016900,
- 0x00000312,
- 0xffffffff,
- 0xc0016900,
- 0x00000307,
0x00000000,
- 0xc0016900,
- 0x00000308,
+ 0x0000002d,
+ 0x3f800000,
+ 0x3f800000,
+ 0x3f800000,
+ 0x3f800000,
0x00000000,
- 0xc0016900,
- 0x00000283,
0x00000000,
0xc0016900,
- 0x00000292,
- 0x00000000,
+ 0x00000312,
+ 0xffffffff,
0xc0066900,
0x0000010f,
0x00000000,
@@ -869,68 +646,29 @@ const u32 r7xx_default_state[] =
0x00000000,
0x00000000,
0x00000000,
- 0xc0016900,
- 0x00000206,
- 0x00000000,
- 0xc0016900,
- 0x00000207,
- 0x00000000,
- 0xc0016900,
- 0x00000208,
- 0x00000000,
- 0xc0046900,
- 0x00000303,
- 0x3f800000,
- 0x3f800000,
- 0x3f800000,
- 0x3f800000,
- 0xc0016900,
- 0x00000205,
+ 0xc0056900,
+ 0x00000204,
+ 0x00010000,
0x00000004,
- 0xc0016900,
- 0x00000280,
+ 0x00000100,
0x00000000,
- 0xc0016900,
- 0x00000281,
0x00000000,
- 0xc0016900,
+ 0xc0066900,
0x0000037e,
0x00000000,
- 0xc0016900,
- 0x00000382,
0x00000000,
- 0xc0016900,
- 0x00000380,
0x00000000,
- 0xc0016900,
- 0x00000383,
0x00000000,
- 0xc0016900,
- 0x00000381,
0x00000000,
- 0xc0016900,
- 0x00000282,
- 0x00000008,
- 0xc0016900,
- 0x00000302,
- 0x0000002d,
- 0xc0016900,
- 0x0000037f,
0x00000000,
0xc0016900,
0x000001b2,
0x00000001,
- 0xc0016900,
+ 0xc0046900,
0x000001b6,
0x00000000,
- 0xc0016900,
- 0x000001b7,
0x00000000,
- 0xc0016900,
- 0x000001b8,
0x00000000,
- 0xc0016900,
- 0x000001b9,
0x00000000,
0xc0016900,
0x00000225,
@@ -941,62 +679,30 @@ const u32 r7xx_default_state[] =
0xc0016900,
0x00000237,
0x00000000,
- 0xc0016900,
+ 0xc0046900,
0x00000100,
0x00000800,
- 0xc0016900,
- 0x00000101,
0x00000000,
- 0xc0016900,
- 0x00000102,
0x00000000,
- 0xc0016900,
- 0x000002a8,
0x00000000,
- 0xc0016900,
- 0x000002a9,
+ 0xc0116900,
+ 0x00000280,
0x00000000,
- 0xc0016900,
- 0x00000103,
0x00000000,
- 0xc0016900,
- 0x00000284,
+ 0x00000008,
+ 0x00000000,
0x00000000,
- 0xc0016900,
- 0x00000290,
0x00000000,
- 0xc0016900,
- 0x00000285,
0x00000000,
- 0xc0016900,
- 0x00000286,
0x00000000,
- 0xc0016900,
- 0x00000287,
0x00000000,
- 0xc0016900,
- 0x00000288,
0x00000000,
- 0xc0016900,
- 0x00000289,
0x00000000,
- 0xc0016900,
- 0x0000028a,
0x00000000,
- 0xc0016900,
- 0x0000028b,
0x00000000,
- 0xc0016900,
- 0x0000028c,
0x00000000,
- 0xc0016900,
- 0x0000028d,
0x00000000,
- 0xc0016900,
- 0x0000028e,
0x00000000,
- 0xc0016900,
- 0x0000028f,
0x00000000,
0xc0016900,
0x000002a1,
@@ -1004,61 +710,37 @@ const u32 r7xx_default_state[] =
0xc0016900,
0x000002a5,
0x00000000,
- 0xc0016900,
+ 0xc0026900,
+ 0x000002a8,
+ 0x00000000,
+ 0x00000000,
+ 0xc0036900,
0x000002ac,
0x00000000,
- 0xc0016900,
- 0x000002ad,
0x00000000,
- 0xc0016900,
- 0x000002ae,
0x00000000,
0xc0016900,
0x000002c8,
0x00000000,
0xc0016900,
- 0x00000206,
- 0x00000100,
- 0xc0016900,
- 0x00000204,
- 0x00010000,
- 0xc0036e00,
- 0x00000000,
- 0x00000012,
- 0x00000000,
- 0x00000000,
- 0xc0016900,
- 0x0000008f,
+ 0x0000008e,
0x0000000f,
0xc0016900,
- 0x000001e8,
- 0x00000001,
- 0xc0016900,
0x00000202,
0x00cc0000,
0xc0016900,
- 0x00000205,
- 0x00000244,
- 0xc0016900,
- 0x00000203,
- 0x00000210,
- 0xc0016900,
0x000001b1,
0x00000000,
0xc0016900,
0x00000185,
0x00000000,
0xc0016900,
+ 0x00000191,
+ 0x00000900,
+ 0xc0036900,
0x000001b3,
0x00000001,
- 0xc0016900,
- 0x000001b4,
0x00000000,
- 0xc0016900,
- 0x00000191,
- 0x00000b00,
- 0xc0016900,
- 0x000001b5,
0x00000000,
};
--
1.7.1.1
[-- Attachment #3: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-26 5:57 ` Alex Deucher
@ 2010-07-26 12:02 ` Rafał Miłecki
2010-07-26 18:55 ` Alex Deucher
0 siblings, 1 reply; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-26 12:02 UTC (permalink / raw)
To: Alex Deucher; +Cc: Dave Airlie, dri-devel
W dniu 26 lipca 2010 07:57 użytkownik Alex Deucher
<alexdeucher@gmail.com> napisał:
> How about v4 (attached)? Any better?
I counted up to 9 flashes after resume this time. Didn't try this
again (maybe different amount of flashses).
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-26 12:02 ` Rafał Miłecki
@ 2010-07-26 18:55 ` Alex Deucher
2010-07-26 23:26 ` Rafał Miłecki
0 siblings, 1 reply; 26+ messages in thread
From: Alex Deucher @ 2010-07-26 18:55 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Dave Airlie, dri-devel
2010/7/26 Rafał Miłecki <zajec5@gmail.com>:
> W dniu 26 lipca 2010 07:57 użytkownik Alex Deucher
> <alexdeucher@gmail.com> napisał:
>> How about v4 (attached)? Any better?
>
> I counted up to 9 flashes after resume this time. Didn't try this
> again (maybe different amount of flashses).
I've broken it down into 6 patches available here:
http://people.freedesktop.org/~agd5f/reduce_emit/
Alex
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-26 18:55 ` Alex Deucher
@ 2010-07-26 23:26 ` Rafał Miłecki
2010-07-26 23:33 ` Alex Deucher
2010-07-27 15:27 ` Alex Deucher
0 siblings, 2 replies; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-26 23:26 UTC (permalink / raw)
To: Alex Deucher; +Cc: Dave Airlie, dri-devel
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
W dniu 26 lipca 2010 20:55 użytkownik Alex Deucher
<alexdeucher@gmail.com> napisał:
> 2010/7/26 Rafał Miłecki <zajec5@gmail.com>:
>> W dniu 26 lipca 2010 07:57 użytkownik Alex Deucher
>> <alexdeucher@gmail.com> napisał:
>>> How about v4 (attached)? Any better?
>>
>> I counted up to 9 flashes after resume this time. Didn't try this
>> again (maybe different amount of flashses).
>
> I've broken it down into 6 patches available here:
> http://people.freedesktop.org/~agd5f/reduce_emit/
Thanks for this splitting your patch!
I got lock up after applying 0001 and 0002. I fixed it with attached
half-revert-patch. Didn't experiment with 0003 - 0006 yet.
--
Rafał
[-- Attachment #2: re-add-set_sampler-for-r6xx.diff --]
[-- Type: application/octet-stream, Size: 488 bytes --]
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
index 6160931..432c12e 100644
--- a/drivers/gpu/drm/radeon/r600_blit_shaders.c
+++ b/drivers/gpu/drm/radeon/r600_blit_shaders.c
@@ -653,6 +653,12 @@ const u32 r6xx_default_state[] =
0x00000204,
0x00010000, /* PA_CL_CLIP_CNTL */
+ 0xc0036e00, /* SET_SAMPLER */
+ 0x00000000,
+ 0x00000012,
+ 0x00000000,
+ 0x00000000,
+
0xc0016900,
0x0000008f,
0x0000000f, /* CB_SHADER_MASK */
[-- Attachment #3: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-26 23:26 ` Rafał Miłecki
@ 2010-07-26 23:33 ` Alex Deucher
2010-07-27 15:27 ` Alex Deucher
1 sibling, 0 replies; 26+ messages in thread
From: Alex Deucher @ 2010-07-26 23:33 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Dave Airlie, dri-devel
2010/7/26 Rafał Miłecki <zajec5@gmail.com>:
> W dniu 26 lipca 2010 20:55 użytkownik Alex Deucher
> <alexdeucher@gmail.com> napisał:
>> 2010/7/26 Rafał Miłecki <zajec5@gmail.com>:
>>> W dniu 26 lipca 2010 07:57 użytkownik Alex Deucher
>>> <alexdeucher@gmail.com> napisał:
>>>> How about v4 (attached)? Any better?
>>>
>>> I counted up to 9 flashes after resume this time. Didn't try this
>>> again (maybe different amount of flashses).
>>
>> I've broken it down into 6 patches available here:
>> http://people.freedesktop.org/~agd5f/reduce_emit/
>
> Thanks for this splitting your patch!
>
> I got lock up after applying 0001 and 0002. I fixed it with attached
> half-revert-patch. Didn't experiment with 0003 - 0006 yet.
Weird we shouldn't need the sampler state as we emit that later based
on the source surface we are copying. Can you try with all patches
both with and without the sampler emit put back?
Alex
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-26 23:26 ` Rafał Miłecki
2010-07-26 23:33 ` Alex Deucher
@ 2010-07-27 15:27 ` Alex Deucher
2010-07-27 21:53 ` Rafał Miłecki
1 sibling, 1 reply; 26+ messages in thread
From: Alex Deucher @ 2010-07-27 15:27 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Dave Airlie, dri-devel
2010/7/26 Rafał Miłecki <zajec5@gmail.com>:
> W dniu 26 lipca 2010 20:55 użytkownik Alex Deucher
> <alexdeucher@gmail.com> napisał:
>> 2010/7/26 Rafał Miłecki <zajec5@gmail.com>:
>>> W dniu 26 lipca 2010 07:57 użytkownik Alex Deucher
>>> <alexdeucher@gmail.com> napisał:
>>>> How about v4 (attached)? Any better?
>>>
>>> I counted up to 9 flashes after resume this time. Didn't try this
>>> again (maybe different amount of flashses).
>>
>> I've broken it down into 6 patches available here:
>> http://people.freedesktop.org/~agd5f/reduce_emit/
>
> Thanks for this splitting your patch!
>
> I got lock up after applying 0001 and 0002. I fixed it with attached
> half-revert-patch. Didn't experiment with 0003 - 0006 yet.
I'm an idiot. The sampler state needs to be there as it's not emitted
subsequently; I was thinking it got emitted with the texture fetch
constants like it does in the ddx. That was the issue all along.
Thanks for tracking that down. New set of patches:
http://people.freedesktop.org/~agd5f/reduce_emit/
Alex
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-27 15:27 ` Alex Deucher
@ 2010-07-27 21:53 ` Rafał Miłecki
2010-07-27 21:53 ` Rafał Miłecki
2010-07-27 23:01 ` Alex Deucher
0 siblings, 2 replies; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-27 21:53 UTC (permalink / raw)
To: Alex Deucher; +Cc: Dave Airlie, dri-devel
[-- Attachment #1: Type: text/plain, Size: 1018 bytes --]
W dniu 27 lipca 2010 17:27 użytkownik Alex Deucher
<alexdeucher@gmail.com> napisał:
> I'm an idiot. The sampler state needs to be there as it's not emitted
> subsequently; I was thinking it got emitted with the texture fetch
> constants like it does in the ddx. That was the issue all along.
> Thanks for tracking that down. New set of patches:
> http://people.freedesktop.org/~agd5f/reduce_emit/
Following refers to patches from 27-Jul-2010 08:26.
After applying all 7 patches I get hard lockup on suspend (not even
resume!). I decided to apply one by one to track this down.
Applying 0001 and 0002 doesn't cause any problem.
After applying 0003 (on top of 0001 and 0002) I get hard lockup just
like in case of all patches. Attached patch shows which part of 0003
has to be reverted to make suspending (and resuming) work. I think
it's still not minimal patch (maybe reverting just part of that code
would be enough) but hope it's small enough to give you some idea.
--
Rafał
[-- Attachment #2: 0003.partial.revert.patch --]
[-- Type: application/octet-stream, Size: 1090 bytes --]
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c
index 4f34b21..23f9f8e 100644
--- a/drivers/gpu/drm/radeon/r600_blit_shaders.c
+++ b/drivers/gpu/drm/radeon/r600_blit_shaders.c
@@ -154,22 +154,52 @@ const u32 r6xx_default_state[] =
0x00000080,
0x00000000, /* PA_SC_WINDOW_OFFSET */
- 0xc00b6900,
+ 0xc0016900,
0x00000083,
0x0000ffff, /* PA_SC_CLIP_RECT_RULE */
- 0x00000000, /* PA_SC_CLIPRECT_0_TL */
+
+ 0xc0016900,
+ 0x00000084,
+ 0x00000000, /* PA_SC_WINDOW_SCISSOR_TL */
+
+ 0xc0016900,
+ 0x00000085,
0x20002000,
+
+ 0xc0016900,
+ 0x00000086,
0x00000000,
+
+ 0xc0016900,
+ 0x00000087,
0x20002000,
+
+ 0xc0016900,
+ 0x00000088,
0x00000000,
+
+ 0xc0016900,
+ 0x00000089,
0x20002000,
+
+ 0xc0016900,
+ 0x0000008a,
0x00000000,
+
+ 0xc0016900,
+ 0x0000008b,
0x20002000,
+
+ 0xc0016900,
+ 0x0000008c,
0x00000000, /* PA_SC_EDGERULE */
- 0xc0026900,
+ 0xc0016900,
0x00000094,
0x80000000, /* PA_SC_VPORT_SCISSOR_0_TL */
+
+ 0xc0016900,
+ 0x00000095,
0x20002000, /* PA_SC_VPORT_SCISSOR_0_BR */
0xc0026900,
[-- Attachment #3: Type: text/plain, Size: 159 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-27 21:53 ` Rafał Miłecki
@ 2010-07-27 21:53 ` Rafał Miłecki
2010-07-27 23:01 ` Alex Deucher
1 sibling, 0 replies; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-27 21:53 UTC (permalink / raw)
To: Alex Deucher; +Cc: Dave Airlie, dri-devel
W dniu 27 lipca 2010 23:53 użytkownik Rafał Miłecki <zajec5@gmail.com> napisał:
> W dniu 27 lipca 2010 17:27 użytkownik Alex Deucher
> <alexdeucher@gmail.com> napisał:
>> I'm an idiot. The sampler state needs to be there as it's not emitted
>> subsequently; I was thinking it got emitted with the texture fetch
>> constants like it does in the ddx. That was the issue all along.
>> Thanks for tracking that down. New set of patches:
>> http://people.freedesktop.org/~agd5f/reduce_emit/
>
> Following refers to patches from 27-Jul-2010 08:26.
>
> After applying all 7 patches I get hard lockup on suspend (not even
> resume!). I decided to apply one by one to track this down.
>
> Applying 0001 and 0002 doesn't cause any problem.
>
> After applying 0003 (on top of 0001 and 0002) I get hard lockup just
> like in case of all patches. Attached patch shows which part of 0003
> has to be reverted to make suspending (and resuming) work. I think
> it's still not minimal patch (maybe reverting just part of that code
> would be enough) but hope it's small enough to give you some idea.
P.S.
Unfortunately attached patch doesn't apply on top of all 7 patches.
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-27 21:53 ` Rafał Miłecki
2010-07-27 21:53 ` Rafał Miłecki
@ 2010-07-27 23:01 ` Alex Deucher
2010-07-28 8:44 ` Rafał Miłecki
1 sibling, 1 reply; 26+ messages in thread
From: Alex Deucher @ 2010-07-27 23:01 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Dave Airlie, dri-devel
2010/7/27 Rafał Miłecki <zajec5@gmail.com>:
> W dniu 27 lipca 2010 17:27 użytkownik Alex Deucher
> <alexdeucher@gmail.com> napisał:
>> I'm an idiot. The sampler state needs to be there as it's not emitted
>> subsequently; I was thinking it got emitted with the texture fetch
>> constants like it does in the ddx. That was the issue all along.
>> Thanks for tracking that down. New set of patches:
>> http://people.freedesktop.org/~agd5f/reduce_emit/
>
> Following refers to patches from 27-Jul-2010 08:26.
>
> After applying all 7 patches I get hard lockup on suspend (not even
> resume!). I decided to apply one by one to track this down.
>
> Applying 0001 and 0002 doesn't cause any problem.
>
> After applying 0003 (on top of 0001 and 0002) I get hard lockup just
> like in case of all patches. Attached patch shows which part of 0003
> has to be reverted to make suspending (and resuming) work. I think
> it's still not minimal patch (maybe reverting just part of that code
> would be enough) but hope it's small enough to give you some idea.
Sorry, the count was wrong on that packet. New set of patches at the
same location:
http://people.freedesktop.org/~agd5f/reduce_emit/
Only 0003 had changed.
Alex
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-27 23:01 ` Alex Deucher
@ 2010-07-28 8:44 ` Rafał Miłecki
2010-07-28 14:13 ` Alex Deucher
0 siblings, 1 reply; 26+ messages in thread
From: Rafał Miłecki @ 2010-07-28 8:44 UTC (permalink / raw)
To: Alex Deucher; +Cc: Dave Airlie, dri-devel
W dniu 28 lipca 2010 01:01 użytkownik Alex Deucher
<alexdeucher@gmail.com> napisał:
> 2010/7/27 Rafał Miłecki <zajec5@gmail.com>:
>> W dniu 27 lipca 2010 17:27 użytkownik Alex Deucher
>> <alexdeucher@gmail.com> napisał:
>>> I'm an idiot. The sampler state needs to be there as it's not emitted
>>> subsequently; I was thinking it got emitted with the texture fetch
>>> constants like it does in the ddx. That was the issue all along.
>>> Thanks for tracking that down. New set of patches:
>>> http://people.freedesktop.org/~agd5f/reduce_emit/
>>
>> Following refers to patches from 27-Jul-2010 08:26.
>>
>> After applying all 7 patches I get hard lockup on suspend (not even
>> resume!). I decided to apply one by one to track this down.
>>
>> Applying 0001 and 0002 doesn't cause any problem.
>>
>> After applying 0003 (on top of 0001 and 0002) I get hard lockup just
>> like in case of all patches. Attached patch shows which part of 0003
>> has to be reverted to make suspending (and resuming) work. I think
>> it's still not minimal patch (maybe reverting just part of that code
>> would be enough) but hope it's small enough to give you some idea.
>
> Sorry, the count was wrong on that packet. New set of patches at the
> same location:
> http://people.freedesktop.org/~agd5f/reduce_emit/
> Only 0003 had changed.
Success this time! :) Thanks for fixing this.
--
Rafał
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: Suspend lockup: How to bisect d-r-t specific commits?
2010-07-28 8:44 ` Rafał Miłecki
@ 2010-07-28 14:13 ` Alex Deucher
0 siblings, 0 replies; 26+ messages in thread
From: Alex Deucher @ 2010-07-28 14:13 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: Dave Airlie, dri-devel
2010/7/28 Rafał Miłecki <zajec5@gmail.com>:
> W dniu 28 lipca 2010 01:01 użytkownik Alex Deucher
> <alexdeucher@gmail.com> napisał:
>> 2010/7/27 Rafał Miłecki <zajec5@gmail.com>:
>>> W dniu 27 lipca 2010 17:27 użytkownik Alex Deucher
>>> <alexdeucher@gmail.com> napisał:
>>>> I'm an idiot. The sampler state needs to be there as it's not emitted
>>>> subsequently; I was thinking it got emitted with the texture fetch
>>>> constants like it does in the ddx. That was the issue all along.
>>>> Thanks for tracking that down. New set of patches:
>>>> http://people.freedesktop.org/~agd5f/reduce_emit/
>>>
>>> Following refers to patches from 27-Jul-2010 08:26.
>>>
>>> After applying all 7 patches I get hard lockup on suspend (not even
>>> resume!). I decided to apply one by one to track this down.
>>>
>>> Applying 0001 and 0002 doesn't cause any problem.
>>>
>>> After applying 0003 (on top of 0001 and 0002) I get hard lockup just
>>> like in case of all patches. Attached patch shows which part of 0003
>>> has to be reverted to make suspending (and resuming) work. I think
>>> it's still not minimal patch (maybe reverting just part of that code
>>> would be enough) but hope it's small enough to give you some idea.
>>
>> Sorry, the count was wrong on that packet. New set of patches at the
>> same location:
>> http://people.freedesktop.org/~agd5f/reduce_emit/
>> Only 0003 had changed.
>
> Success this time! :) Thanks for fixing this.
Thanks for sticking with it and dealing with my stupid typos ;)
Alex
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2010-07-28 14:14 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-20 10:14 Suspend lockup: How to bisect d-r-t specific commits? Rafał Miłecki
2010-07-20 11:15 ` Marius Gröger
2010-07-20 21:23 ` Rafał Miłecki
2010-07-20 21:37 ` Rafał Miłecki
2010-07-20 22:36 ` Dave Airlie
2010-07-21 9:30 ` Rafał Miłecki
2010-07-21 14:21 ` Rafał Miłecki
2010-07-21 17:23 ` Alex Deucher
2010-07-24 8:38 ` Rafał Miłecki
2010-07-24 20:41 ` Alex Deucher
2010-07-25 12:14 ` Rafał Miłecki
2010-07-26 5:57 ` Alex Deucher
2010-07-26 12:02 ` Rafał Miłecki
2010-07-26 18:55 ` Alex Deucher
2010-07-26 23:26 ` Rafał Miłecki
2010-07-26 23:33 ` Alex Deucher
2010-07-27 15:27 ` Alex Deucher
2010-07-27 21:53 ` Rafał Miłecki
2010-07-27 21:53 ` Rafał Miłecki
2010-07-27 23:01 ` Alex Deucher
2010-07-28 8:44 ` Rafał Miłecki
2010-07-28 14:13 ` Alex Deucher
2010-07-20 16:21 ` Alex Deucher
2010-07-20 18:13 ` Rafał Miłecki
2010-07-20 18:44 ` Alex Deucher
2010-07-20 20:22 ` Rafał Miłecki
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.