Re: Intel i915 freeze on latest git

2011-02-13 Thread Francesco Allertsen
On Fri, Feb 11, 2011 at 09:16:33AM -0800, Jesse Barnes wrote:
> On Fri, 11 Feb 2011 08:28:37 +0100
> Francesco Allertsen  wrote:
> 
> > On Thu, Feb 10, 2011 at 03:25:33PM -0800, Jesse Barnes wrote:
> > > Does this kernel have the problem patch included?  Or is it reverted?
> > 
> > That was without the patch reverted, now I've reverted it and this is
> > the output:
> > 
> > ---
> > HD boost: yes
> > Boost freq: 3
> > HW control enabled: no
> > SW control enabled: yes
> > Gated voltage change: no
> > Starting frequency: P9
> > Max P-state: P0
> > Min P-state: P9
> > RS1 VID: 0
> > RS2 VID: 8
> > Render standby enabled: yes
> > Current RS state: RS2 (RC6)
> > RSTDBYCTL: 0x474c3000
> > ---
> > 
> > It seems the same.
> 
> Interesting, so your RSTDBYCTL is the same and you're still in RC6.  So
> something else in the cleanup patch is causing trouble.
> 
> Francesco, if you revert d5bb081b027b520f9e59b4fb8faea83a136ec15e do
> both the hangs at X startup and suspend/resume go away?

I've tried to revert it and it hangs the same on the suspend/resume, so
I've setted inittab to work only in tty mode, and bisected the
suspend/resume problem from -rc4.

The bad commit is another:


commit 88271da3f3da75d6eaef5e768c82a1627edf7088
Author: Jesse Barnes 
Date:   Wed Jan 5 12:01:24 2011 -0800

drm/i915: re-enable rc6 support for Ironlake+

Re-enable rc6 support on Ironlake for power savings.  Adds a debugfs
file to check current RC state, adds a missing workaround for Ironlake
MI_SET_CONTEXT instructions, and renames MCHBAR_RENDER_STANDBY to
RSTDBYCTL to match the docs.

Keep RC6 and the power context disabled on pre-ILK.  It only seems to
hang and doesn't save any power.

Signed-off-by: Jesse Barnes 
Signed-off-by: Chris Wilson 

I've tried to rever it on top of -rc4 to check if the suspend/resume
works, but it doesn't revert clean, and now I don't have the time to
check.

If you need some more information just let me know, anyway this seems
another unrelated problem.

Bye
Francesco
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-12 Thread Grissiom
On Sat, Feb 12, 2011 at 1:16 AM, Jesse Barnes  wrote:
> On Fri, 11 Feb 2011 08:28:37 +0100
> Francesco Allertsen  wrote:
>
>> On Thu, Feb 10, 2011 at 03:25:33PM -0800, Jesse Barnes wrote:
>> > Does this kernel have the problem patch included?  Or is it reverted?
>>
>> That was without the patch reverted, now I've reverted it and this is
>> the output:
>>
>> ---
>> HD boost: yes
>> Boost freq: 3
>> HW control enabled: no
>> SW control enabled: yes
>> Gated voltage change: no
>> Starting frequency: P9
>> Max P-state: P0
>> Min P-state: P9
>> RS1 VID: 0
>> RS2 VID: 8
>> Render standby enabled: yes
>> Current RS state: RS2 (RC6)
>> RSTDBYCTL: 0x474c3000
>> ---
>>
>> It seems the same.
>
> Interesting, so your RSTDBYCTL is the same and you're still in RC6.  So
> something else in the cleanup patch is causing trouble.
>
> Francesco, if you revert d5bb081b027b520f9e59b4fb8faea83a136ec15e do
> both the hangs at X startup and suspend/resume go away?
>
> Gui, same question for you.  And can you try this patch and dump
> the contents of /sys/kernel/debug/dri/0/i915_drpc_info as well?  Your
> settings are probably the same but I want to double check.

I'm new in this thread so I found the patch by myself. I hope it's the
right one:

http://www.spinics.net/lists/dri-devel/msg08028.html

But that patch doesn't apply to latest git, so I just added the seq_printf
call to the end of the swith of i915_drpc_info.

I finally found the way setup /sys/kernel/debug... My
/sys/kernel/debug/dri/0/i915_drpc_info is:

HD boost: no
Boost freq: 6
HW control enabled: no
SW control enabled: yes
Gated voltage change: no
Starting frequency: P5
Max P-state: P0
Min P-state: P7
RS1 VID: 0
RS2 VID: 8
Render standby enabled: yes
Current RS state: RS2 (RC6)
RSTDBYCTL: 0x474c3000

And there is a /sys/kernel/debug/dri/64/i915_drpc_info with the
same content. Whether X is running or not, the result is the same.

But even with d5bb081b027b52 reverted, the system could not resume
from suspend. I haven't checked it before so I've no idea about this.

Please keep me informed, thanks a lot ;-)

-- 
Cheers,
Grissiom
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-11 Thread Jesse Barnes
On Fri, 11 Feb 2011 08:28:37 +0100
Francesco Allertsen  wrote:

> On Thu, Feb 10, 2011 at 03:25:33PM -0800, Jesse Barnes wrote:
> > Does this kernel have the problem patch included?  Or is it reverted?
> 
> That was without the patch reverted, now I've reverted it and this is
> the output:
> 
> ---
> HD boost: yes
> Boost freq: 3
> HW control enabled: no
> SW control enabled: yes
> Gated voltage change: no
> Starting frequency: P9
> Max P-state: P0
> Min P-state: P9
> RS1 VID: 0
> RS2 VID: 8
> Render standby enabled: yes
> Current RS state: RS2 (RC6)
> RSTDBYCTL: 0x474c3000
> ---
> 
> It seems the same.

Interesting, so your RSTDBYCTL is the same and you're still in RC6.  So
something else in the cleanup patch is causing trouble.

Francesco, if you revert d5bb081b027b520f9e59b4fb8faea83a136ec15e do
both the hangs at X startup and suspend/resume go away?

Gui, same question for you.  And can you try this patch and dump
the contents of /sys/kernel/debug/dri/0/i915_drpc_info as well?  Your
settings are probably the same but I want to double check.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-10 Thread Francesco Allertsen
On Thu, Feb 10, 2011 at 03:25:33PM -0800, Jesse Barnes wrote:
> Does this kernel have the problem patch included?  Or is it reverted?

That was without the patch reverted, now I've reverted it and this is
the output:

---
HD boost: yes
Boost freq: 3
HW control enabled: no
SW control enabled: yes
Gated voltage change: no
Starting frequency: P9
Max P-state: P0
Min P-state: P9
RS1 VID: 0
RS2 VID: 8
Render standby enabled: yes
Current RS state: RS2 (RC6)
RSTDBYCTL: 0x474c3000
---

It seems the same.

Bye
Francesco
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-10 Thread Jesse Barnes
On Fri, 11 Feb 2011 00:23:09 +0100
Francesco Allertsen  wrote:

> On Thu, Feb 10, 2011 at 10:34:43AM -0800, Jesse Barnes wrote:
> > Since intel_reg_read won't work, can you try this patch instead?  Just
> > patch it in, then cat /sys/kernel/debug/dri/0/i915_drpc_info
> 
> This is the output:
> 
> ---
> HD boost: yes
> Boost freq: 3
> HW control enabled: no
> SW control enabled: yes
> Gated voltage change: no
> Starting frequency: P9
> Max P-state: P0
> Min P-state: P9
> RS1 VID: 0
> RS2 VID: 8
> Render standby enabled: yes
> Current RS state: RS2 (RC6)
> RSTDBYCTL: 0x474c3000
> ---

Does this kernel have the problem patch included?  Or is it reverted?

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-10 Thread Francesco Allertsen
On Thu, Feb 10, 2011 at 10:34:43AM -0800, Jesse Barnes wrote:
> Since intel_reg_read won't work, can you try this patch instead?  Just
> patch it in, then cat /sys/kernel/debug/dri/0/i915_drpc_info

This is the output:

---
HD boost: yes
Boost freq: 3
HW control enabled: no
SW control enabled: yes
Gated voltage change: no
Starting frequency: P9
Max P-state: P0
Min P-state: P9
RS1 VID: 0
RS2 VID: 8
Render standby enabled: yes
Current RS state: RS2 (RC6)
RSTDBYCTL: 0x474c3000
---

Bye
Francesco
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-10 Thread Jesse Barnes
On Thu, 10 Feb 2011 13:10:26 +0100
Francesco Allertsen  wrote:

> On Wed, Feb 09, 2011 at 05:09:10PM +, Chris Wilson wrote:
> > I was optimistic that we might spot the real issue... However, you appear
> > to be not alone and so I've pushed a disabling patch onto -fixes:
> > 
> > commit ac66808814036b4c33dd98091b2176ae6157f1a8
> > Author: Chris Wilson 
> > Date:   Wed Feb 9 16:15:32 2011 +
> > 
> > drm/i915: Disable RC6 on Ironlake
> > 
> > The automatic powersaving feature is once again causing havoc, with 100%
> > reliable hangs on boot and resume on affected machines.
> > 
> > Reported-by: Francesco Allertsen 
> > Reported-by: Gui Rui 
> > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=28582
> > Signed-off-by: Chris Wilson 
> > 
> > That should work its way upstream shortly.
> 
> I've tried to apply it on top of 2.6.38-rc4, and now it doesn't hang
> when I start X, but it hangs when I resume from suspend to RAM.

Since intel_reg_read won't work, can you try this patch instead?  Just
patch it in, then cat /sys/kernel/debug/dri/0/i915_drpc_info

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1018,6 +1018,8 @@ static int i915_drpc_info(struct seq_file *m, void *unused
break;
}
 
+   seq_printf(m, "RSTDBYCTL: 0x%08x\n", rstdbyctl);
+
return 0;
 }
 
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-10 Thread Francesco Allertsen
On Wed, Feb 09, 2011 at 05:09:10PM +, Chris Wilson wrote:
> I was optimistic that we might spot the real issue... However, you appear
> to be not alone and so I've pushed a disabling patch onto -fixes:
> 
> commit ac66808814036b4c33dd98091b2176ae6157f1a8
> Author: Chris Wilson 
> Date:   Wed Feb 9 16:15:32 2011 +
> 
> drm/i915: Disable RC6 on Ironlake
> 
> The automatic powersaving feature is once again causing havoc, with 100%
> reliable hangs on boot and resume on affected machines.
> 
> Reported-by: Francesco Allertsen 
> Reported-by: Gui Rui 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=28582
> Signed-off-by: Chris Wilson 
> 
> That should work its way upstream shortly.

I've tried to apply it on top of 2.6.38-rc4, and now it doesn't hang
when I start X, but it hangs when I resume from suspend to RAM.

Bye
Francesco
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-09 Thread Chris Wilson
On Wed, 9 Feb 2011 09:50:47 -0800, Jesse Barnes  
wrote:
> On Wed, 09 Feb 2011 17:09:10 +
> Chris Wilson  wrote:
> > I was optimistic that we might spot the real issue... However, you appear
> > to be not alone and so I've pushed a disabling patch onto -fixes:
> > 
> > commit ac66808814036b4c33dd98091b2176ae6157f1a8
> > Author: Chris Wilson 
> > Date:   Wed Feb 9 16:15:32 2011 +
> > 
> > drm/i915: Disable RC6 on Ironlake
> 
> reverting the cleanup wasn't sufficient?

Considering we've been burnt badly by rc6 in the past, and we now have two
independent regression reports of hard hangs at completely different
stages, disabling it seemed the prudent course. I left a switch in place so
we can continue testing.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-09 Thread Jesse Barnes
On Wed, 9 Feb 2011 09:53:26 -0800
Jesse Barnes  wrote:

> On Wed, 9 Feb 2011 09:50:47 -0800
> Jesse Barnes  wrote:
> 
> > On Wed, 09 Feb 2011 17:09:10 +
> > Chris Wilson  wrote:
> > 
> > > On Wed, 9 Feb 2011 13:52:38 +0100, Francesco Allertsen 
> > >  wrote:
> > > > On Wed, Feb 02, 2011 at 09:59:54AM +, Chris Wilson wrote:
> > > > > Hmm, that was the only change I could spot between the two patches. 
> > > > > Care
> > > > > to disable that function and see what happens? [i.e. put a return 
> > > > > before
> > > > > we write anything to the ring]
> > > > 
> > > > Ping?
> > > 
> > > I was optimistic that we might spot the real issue... However, you appear
> > > to be not alone and so I've pushed a disabling patch onto -fixes:
> > > 
> > > commit ac66808814036b4c33dd98091b2176ae6157f1a8
> > > Author: Chris Wilson 
> > > Date:   Wed Feb 9 16:15:32 2011 +
> > > 
> > > drm/i915: Disable RC6 on Ironlake
> > > 
> > > The automatic powersaving feature is once again causing havoc, with 
> > > 100%
> > > reliable hangs on boot and resume on affected machines.
> > > 
> > > Reported-by: Francesco Allertsen 
> > > Reported-by: Gui Rui 
> > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=28582
> > > Signed-off-by: Chris Wilson 
> > > 
> > > That should work its way upstream shortly.
> > 
> > reverting the cleanup wasn't sufficient?
> > 
> > Francesco, if you revert the cleanup patch you bisected to, what
> > does /sys/kernel/debug/dri/0/i915_drpc_info report?
> 
> In particular, I'm curious if it reports that you're in RC6, so you
> might need to cat it a couple of times while gfx is idle (like from the
> console or an ssh session while nothing is drawing).

Oh and one more request, what does "intel_reg_read 0x111b8" return on
your system?

I really don't want to disable RC6; it saves way too much power.  So
I'd like to understand what's going on here so we can either fix your
system or reliably find a way to disable it on systems where the BIOS
isn't allowing it...

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-09 Thread Jesse Barnes
On Wed, 9 Feb 2011 09:50:47 -0800
Jesse Barnes  wrote:

> On Wed, 09 Feb 2011 17:09:10 +
> Chris Wilson  wrote:
> 
> > On Wed, 9 Feb 2011 13:52:38 +0100, Francesco Allertsen 
> >  wrote:
> > > On Wed, Feb 02, 2011 at 09:59:54AM +, Chris Wilson wrote:
> > > > Hmm, that was the only change I could spot between the two patches. Care
> > > > to disable that function and see what happens? [i.e. put a return before
> > > > we write anything to the ring]
> > > 
> > > Ping?
> > 
> > I was optimistic that we might spot the real issue... However, you appear
> > to be not alone and so I've pushed a disabling patch onto -fixes:
> > 
> > commit ac66808814036b4c33dd98091b2176ae6157f1a8
> > Author: Chris Wilson 
> > Date:   Wed Feb 9 16:15:32 2011 +
> > 
> > drm/i915: Disable RC6 on Ironlake
> > 
> > The automatic powersaving feature is once again causing havoc, with 100%
> > reliable hangs on boot and resume on affected machines.
> > 
> > Reported-by: Francesco Allertsen 
> > Reported-by: Gui Rui 
> > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=28582
> > Signed-off-by: Chris Wilson 
> > 
> > That should work its way upstream shortly.
> 
> reverting the cleanup wasn't sufficient?
> 
> Francesco, if you revert the cleanup patch you bisected to, what
> does /sys/kernel/debug/dri/0/i915_drpc_info report?

In particular, I'm curious if it reports that you're in RC6, so you
might need to cat it a couple of times while gfx is idle (like from the
console or an ssh session while nothing is drawing).

-- 
Jesse Barnes, Intel Open Source Technology Center
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-09 Thread Jesse Barnes
On Wed, 09 Feb 2011 17:09:10 +
Chris Wilson  wrote:

> On Wed, 9 Feb 2011 13:52:38 +0100, Francesco Allertsen  
> wrote:
> > On Wed, Feb 02, 2011 at 09:59:54AM +, Chris Wilson wrote:
> > > Hmm, that was the only change I could spot between the two patches. Care
> > > to disable that function and see what happens? [i.e. put a return before
> > > we write anything to the ring]
> > 
> > Ping?
> 
> I was optimistic that we might spot the real issue... However, you appear
> to be not alone and so I've pushed a disabling patch onto -fixes:
> 
> commit ac66808814036b4c33dd98091b2176ae6157f1a8
> Author: Chris Wilson 
> Date:   Wed Feb 9 16:15:32 2011 +
> 
> drm/i915: Disable RC6 on Ironlake
> 
> The automatic powersaving feature is once again causing havoc, with 100%
> reliable hangs on boot and resume on affected machines.
> 
> Reported-by: Francesco Allertsen 
> Reported-by: Gui Rui 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=28582
> Signed-off-by: Chris Wilson 
> 
> That should work its way upstream shortly.

reverting the cleanup wasn't sufficient?

Francesco, if you revert the cleanup patch you bisected to, what
does /sys/kernel/debug/dri/0/i915_drpc_info report?

-- 
Jesse Barnes, Intel Open Source Technology Center
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-09 Thread Chris Wilson
On Wed, 9 Feb 2011 13:52:38 +0100, Francesco Allertsen  
wrote:
> On Wed, Feb 02, 2011 at 09:59:54AM +, Chris Wilson wrote:
> > Hmm, that was the only change I could spot between the two patches. Care
> > to disable that function and see what happens? [i.e. put a return before
> > we write anything to the ring]
> 
> Ping?

I was optimistic that we might spot the real issue... However, you appear
to be not alone and so I've pushed a disabling patch onto -fixes:

commit ac66808814036b4c33dd98091b2176ae6157f1a8
Author: Chris Wilson 
Date:   Wed Feb 9 16:15:32 2011 +

drm/i915: Disable RC6 on Ironlake

The automatic powersaving feature is once again causing havoc, with 100%
reliable hangs on boot and resume on affected machines.

Reported-by: Francesco Allertsen 
Reported-by: Gui Rui 
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=28582
Signed-off-by: Chris Wilson 

That should work its way upstream shortly.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-09 Thread Francesco Allertsen
On Wed, Feb 02, 2011 at 09:59:54AM +, Chris Wilson wrote:
> Hmm, that was the only change I could spot between the two patches. Care
> to disable that function and see what happens? [i.e. put a return before
> we write anything to the ring]

Ping?

I've tried the -rc4 (there are some drm updates) but I get the same
hang.

Bye
Francesco
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-02 Thread Francesco Allertsen
On Wed, Feb 02, 2011 at 09:59:54AM +, Chris Wilson wrote:
> Hmm, that was the only change I could spot between the two patches. Care
> to disable that function and see what happens? [i.e. put a return before
> we write anything to the ring]

I've tried with the following patch

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 7769768..2ef0333 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6505,6 +6505,8 @@ void ironlake_enable_rc6(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;
int ret;
 
+   return;
+
/*
 * GPU can automatically power down the render unit if given a page
 * to save state.

So to return at the beginning of the function, and everything works
again.

Bye
Francesco
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-02 Thread Chris Wilson
On Wed, 2 Feb 2011 10:56:57 +0100, Francesco Allertsen  
wrote:
> On Tue, Feb 01, 2011 at 04:57:37PM +, Chris Wilson wrote:
> > So, if this is the issue, then simply commenting out the tweaking of
> > RSTDBYCTL in ironlake_enable_rc6() should prevent the hang.
> 
> I've tried the following patch
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c 
> b/drivers/gpu/drm/i915/intel_display.c
> index d7f237d..7769768 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6527,7 +6527,6 @@ void ironlake_enable_rc6(struct drm_device *dev)
>   ADVANCE_LP_RING();
>  
>   I915_WRITE(PWRCTXA, dev_priv->pwrctx->gtt_offset | PWRCTX_EN);
> - I915_WRITE(RSTDBYCTL, I915_READ(RSTDBYCTL) & ~RCX_SW_EXIT);
>  }
>  
>  /* Set up chip specific display functions */
> 
> And it still hangs.

Hmm, that was the only change I could spot between the two patches. Care
to disable that function and see what happens? [i.e. put a return before
we write anything to the ring]
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-02 Thread Francesco Allertsen
On Tue, Feb 01, 2011 at 04:57:37PM +, Chris Wilson wrote:
> So, if this is the issue, then simply commenting out the tweaking of
> RSTDBYCTL in ironlake_enable_rc6() should prevent the hang.

I've tried the following patch

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index d7f237d..7769768 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6527,7 +6527,6 @@ void ironlake_enable_rc6(struct drm_device *dev)
ADVANCE_LP_RING();
 
I915_WRITE(PWRCTXA, dev_priv->pwrctx->gtt_offset | PWRCTX_EN);
-   I915_WRITE(RSTDBYCTL, I915_READ(RSTDBYCTL) & ~RCX_SW_EXIT);
 }
 
 /* Set up chip specific display functions */

And it still hangs.

Bye
Francesco
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-01 Thread Jesse Barnes
On Tue, 01 Feb 2011 16:57:37 +
Chris Wilson  wrote:

> On Tue, 1 Feb 2011 08:31:12 -0800, Jesse Barnes  
> wrote:
> > The bisect is interesting, I'd have expected a failure when we
> > re-enabled rc6 on ILK or when we fixed up the ring buffer init.
> 
> Yes, that was my instinct as well.
> 
> Though that patch does do have one subtlety:
> 
> ironlake_enable_rc6():
> +  I915_WRITE(RSTDBYCTL, I915_READ(RSTDBYCTL) & ~RCX_SW_EXIT);
> 
> So it appears the patch may in fact be enabling render standby, when it
> was actually dropped in
> 
> commit 88271da3f3da75d6eaef5e768c82a1627edf7088
> Author: Jesse Barnes 
> Date:   Wed Jan 5 12:01:24 2011 -0800
> 
> drm/i915: re-enable rc6 support for Ironlake+
> 
> intel_enable_clock_gating():
> - I915_WRITE(MCHBAR_RENDER_STANDBY,
> -I915_READ(MCHBAR_RENDER_STANDBY) & ~RCX_SW_EXIT);
> 
> 
> So, if this is the issue, then simply commenting out the tweaking of
> RSTDBYCTL in ironlake_enable_rc6() should prevent the hang.

IIRC that really was a cleanup, clearing RCX_SW_EXIT on my machine was
unnecessary, since it was already clear.  But it's worth trying
anyway...

-- 
Jesse Barnes, Intel Open Source Technology Center
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-01 Thread Chris Wilson
On Tue, 1 Feb 2011 08:31:12 -0800, Jesse Barnes  
wrote:
> The bisect is interesting, I'd have expected a failure when we
> re-enabled rc6 on ILK or when we fixed up the ring buffer init.

Yes, that was my instinct as well.

Though that patch does do have one subtlety:

ironlake_enable_rc6():
+  I915_WRITE(RSTDBYCTL, I915_READ(RSTDBYCTL) & ~RCX_SW_EXIT);

So it appears the patch may in fact be enabling render standby, when it
was actually dropped in

commit 88271da3f3da75d6eaef5e768c82a1627edf7088
Author: Jesse Barnes 
Date:   Wed Jan 5 12:01:24 2011 -0800

drm/i915: re-enable rc6 support for Ironlake+

intel_enable_clock_gating():
-   I915_WRITE(MCHBAR_RENDER_STANDBY,
-  I915_READ(MCHBAR_RENDER_STANDBY) & ~RCX_SW_EXIT);


So, if this is the issue, then simply commenting out the tweaking of
RSTDBYCTL in ironlake_enable_rc6() should prevent the hang.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-01 Thread Francesco Allertsen
On Tue, Feb 01, 2011 at 12:05:52PM +, Chris Wilson wrote:
> It would be useful to give us a few more details, such the drm.debug=0xe
> dmesg and the Xorg.log (from when it does starts!)

Sorry, I forgot to turn on the debug last time, this is the dmesg output
from when I start X.

Other (hope useful) information: the frame buffer works perfect.

Bye
Francesco
[   76.637864] [drm:drm_crtc_helper_set_config], 
[   76.637870] [drm:drm_crtc_helper_set_config], [CRTC:3] [FB:9] #connectors=1 
(x y) (0 0)
[   76.637886] [drm:drm_crtc_helper_set_config], [CONNECTOR:5:LVDS-1] to 
[CRTC:3]
[   76.637892] [drm:drm_crtc_helper_set_config], Setting connector DPMS state 
to on
[   76.637897] [drm:drm_crtc_helper_set_config],[CONNECTOR:5:LVDS-1] 
set DPMS on
[   76.652132] [drm:i915_driver_open], 
[   76.652232] [drm:drm_crtc_helper_set_config], 
[   76.652242] [drm:drm_crtc_helper_set_config], [CRTC:3] [FB:9] #connectors=1 
(x y) (0 0)
[   76.652257] [drm:drm_crtc_helper_set_config], [CONNECTOR:5:LVDS-1] to 
[CRTC:3]
[   76.652267] [drm:drm_crtc_helper_set_config], Setting connector DPMS state 
to on
[   76.652278] [drm:drm_crtc_helper_set_config],[CONNECTOR:5:LVDS-1] 
set DPMS on
[   76.652288] [drm:drm_crtc_helper_set_config], 
[   76.652295] [drm:drm_crtc_helper_set_config], [CRTC:4] [FB:9] #connectors=0 
(x y) (0 0)
[   76.652307] [drm:drm_crtc_helper_set_config], crtc has no fb, full mode set
[   76.652316] [drm:drm_crtc_helper_set_config], [CONNECTOR:5:LVDS-1] to 
[CRTC:3]
[   76.652337] [drm:drm_crtc_helper_set_config], Setting connector DPMS state 
to on
[   76.652418] [drm:i915_driver_open], 
[   76.652825] [drm:drm_mode_getresources], CRTC[2] CONNECTORS[4] ENCODERS[4]
[   76.652841] [drm:drm_mode_getresources], CRTC[2] CONNECTORS[4] ENCODERS[4]
[   76.652964] [drm:drm_mode_getconnector], [CONNECTOR:5:?]
[   76.652980] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:5:LVDS-1]
[   76.653010] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:5:LVDS-1] probed modes :
[   76.653023] [drm:drm_mode_debug_printmodeline], Modeline 21:"1440x900" 50 
74080 1440 1464 1480 1600 900 903 909 926 0x48 0xa
[   76.653044] [drm:drm_mode_getconnector], [CONNECTOR:5:?]
[   76.653322] [drm:drm_mode_getconnector], [CONNECTOR:12:?]
[   76.653340] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:12:VGA-1]
[   76.653355] [drm:intel_ironlake_crt_detect_hotplug], ironlake hotplug 
adpa=0xf40018, result 0
[   76.653369] [drm:intel_crt_detect], CRT not detected via hotplug
[   76.653382] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:12:VGA-1] disconnected
[   76.653403] [drm:drm_mode_getconnector], [CONNECTOR:12:?]
[   76.653417] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:12:VGA-1]
[   76.653431] [drm:intel_ironlake_crt_detect_hotplug], ironlake hotplug 
adpa=0xf40018, result 0
[   76.653444] [drm:intel_crt_detect], CRT not detected via hotplug
[   76.653457] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:12:VGA-1] disconnected
[   76.653544] [drm:drm_mode_getconnector], [CONNECTOR:15:?]
[   76.653560] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:15:HDMI-A-1]
[   76.655880] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:15:HDMI-A-1] disconnected
[   76.655896] [drm:drm_mode_getconnector], [CONNECTOR:15:?]
[   76.655905] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:15:HDMI-A-1]
[   76.658225] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:15:HDMI-A-1] disconnected
[   76.658290] [drm:drm_mode_getconnector], [CONNECTOR:17:?]
[   76.658301] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:17:DP-1]
[   76.658834] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x5145003e
[   76.658843] [drm:ironlake_dp_detect], DPCD: 
[   76.658852] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:17:DP-1] disconnected
[   76.658864] [drm:drm_mode_getconnector], [CONNECTOR:17:?]
[   76.658872] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:17:DP-1]
[   76.659391] [drm:intel_dp_aux_ch], dp_aux_ch timeout status 0x5145003e
[   76.659403] [drm:ironlake_dp_detect], DPCD: 
[   76.659412] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:17:DP-1] disconnected
[   76.659492] [drm:drm_mode_getconnector], [CONNECTOR:5:?]
[   76.659503] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:5:LVDS-1]
[   76.659521] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:5:LVDS-1] probed modes :
[   76.659531] [drm:drm_mode_debug_printmodeline], Modeline 21:"1440x900" 50 
74080 1440 1464 1480 1600 900 903 909 926 0x48 0xa
[   76.659546] [drm:drm_mode_getconnector], [CONNECTOR:5:?]
[   76.661321] [drm:drm_mode_getconnector], [CONNECTOR:12:?]
[   76.661337] [drm:drm_helper_probe_single_connector_modes], 
[CONNECTOR:12:VGA-1]
[   76.661347] [drm:intel_ironlake_crt_detect_hotplug], ironlake hotplug 
adpa=0xf40018, result 0
[   76.661358] [drm:intel_crt_detect], CRT not detected v

Re: Intel i915 freeze on latest git

2011-02-01 Thread Francesco Allertsen
On Tue, Feb 01, 2011 at 12:05:52PM +, Chris Wilson wrote:
> It would be useful to give us a few more details, such the drm.debug=0xe
> dmesg and the Xorg.log (from when it does starts!), and explain what you
> mean by complete freeze? Such as is the machine still accessible over the
> network, did it die whilst oopsing, etc.

I've tried to use netconsole to get the output of dmesg, but there is
no output.

Attached there is the Xorg.log, but I don't see any useful infomation.

The freeze means that nothing respond after less than a second, there
are no oops and no network access and even the sysrq doesn't work.

Bye
Francesco
[92.201] 
X.Org X Server 1.9.2
Release Date: 2010-10-30
[92.211] X Protocol Version 11, Revision 0
[92.214] Build Operating System: Slackware 13.1 Slackware Linux Project
[92.215] Current Operating System: Linux fujiko 2.6.38-rc3-1-g1c3e850 
#118 SMP Tue Feb 1 12:19:19 CET 2011 i686
[92.217] Kernel command line: BOOT_IMAGE=Linux-git ro root=802 
vt.default_utf8=0
[92.218] Build Date: 20 November 2010  11:40:12PM
[92.220]  
[92.222] Current version of pixman: 0.20.0
[92.225]Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
[92.228] Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
[92.233] (==) Log file: "/var/log/Xorg.0.log", Time: Tue Feb  1 13:21:58 
2011
[92.238] (==) Using system config directory "/usr/share/X11/xorg.conf.d"
[92.243] (==) No Layout section.  Using the first Screen section.
[92.243] (==) No screen section available. Using defaults.
[92.243] (**) |-->Screen "Default Screen Section" (0)
[92.243] (**) |   |-->Monitor ""
[92.243] (==) No monitor specified for screen "Default Screen Section".
Using a default monitor configuration.
[92.243] (==) Automatically adding devices
[92.243] (==) Automatically enabling devices
[92.244] (WW) The directory "/usr/share/fonts/local" does not exist.
[92.244]Entry deleted from font path.
[92.244] (WW) The directory "/usr/share/fonts/CID" does not exist.
[92.244]Entry deleted from font path.
[92.246] (==) FontPath set to:
/usr/share/fonts/TTF,
/usr/share/fonts/OTF,
/usr/share/fonts/Type1,
/usr/share/fonts/misc,
/usr/share/fonts/75dpi/:unscaled,
/usr/share/fonts/100dpi/:unscaled,
/usr/share/fonts/75dpi,
/usr/share/fonts/100dpi,
/usr/share/fonts/cyrillic
[92.246] (==) ModulePath set to "/usr/lib/xorg/modules"
[92.246] (II) The server relies on udev to provide the list of input 
devices.
If no devices become available, reconfigure udev or disable 
AutoAddDevices.
[92.246] (II) Loader magic: 0x81f1640
[92.246] (II) Module ABI versions:
[92.246]X.Org ANSI C Emulation: 0.4
[92.246]X.Org Video Driver: 8.0
[92.246]X.Org XInput driver : 11.0
[92.246]X.Org Server Extension : 4.0
[92.247] (--) PCI:*(0:0:2:0) 8086:0046:17aa:215a rev 2, Mem @ 
0xf200/4194304, 0xd000/268435456, I/O @ 0x1800/8
[92.247] (II) Open ACPI successful (/var/run/acpid.socket)
[92.247] (II) LoadModule: "extmod"
[92.248] (II) Loading /usr/lib/xorg/modules/extensions/libextmod.so
[92.249] (II) Module extmod: vendor="X.Org Foundation"
[92.249]compiled for 1.9.2, module version = 1.0.0
[92.249]Module class: X.Org Server Extension
[92.249]ABI class: X.Org Server Extension, version 4.0
[92.249] (II) Loading extension MIT-SCREEN-SAVER
[92.250] (II) Loading extension XFree86-VidModeExtension
[92.250] (II) Loading extension XFree86-DGA
[92.250] (II) Loading extension DPMS
[92.250] (II) Loading extension XVideo
[92.250] (II) Loading extension XVideo-MotionCompensation
[92.250] (II) Loading extension X-Resource
[92.250] (II) LoadModule: "dbe"
[92.250] (II) Loading /usr/lib/xorg/modules/extensions/libdbe.so
[92.250] (II) Module dbe: vendor="X.Org Foundation"
[92.250]compiled for 1.9.2, module version = 1.0.0
[92.250]Module class: X.Org Server Extension
[92.250]ABI class: X.Org Server Extension, version 4.0
[92.250] (II) Loading extension DOUBLE-BUFFER
[92.250] (II) LoadModule: "glx"
[92.251] (II) Loading /usr/lib/xorg/modules/extensions/libglx.so
[92.252] (II) Module glx: vendor="X.Org Foundation"
[92.252]compiled for 1.9.2, module version = 1.0.0
[92.252]ABI class: X.Org Server Extension, version 4.0
[92.253] (==) AIGLX enabled
[92.253] (II) Loading extension GLX
[92.253] (II) LoadModule: "record"
[92.253] (II) Loading /usr/lib/xorg/modules/extensions/librecord.so
[92.254] (II) Module record: vendor="X.Org Foundation"
[92.254]compiled for 1.9.2, module version

Re: Intel i915 freeze on latest git

2011-02-01 Thread Jesse Barnes
On Tue, 1 Feb 2011 15:07:55 +0100
Francesco Allertsen  wrote:

> On Tue, Feb 01, 2011 at 01:16:01PM +, Chris Wilson wrote:
> > Useful for me. Just confirms that you have an equivalent machine to
> > this Lenovo x201s, on which those patches were tested after receiving
> > from Jesse. :|
> 
> Yes, I have a Lenovo x201s :-P.
> 
> > The dmesg would have been useful to know whether the i915.ko module is
> > loaded during X startup, and so reveal some information about the sequence
> > of function calls (i.e. whether the modified routines were running at the
> > time of the hang, or whether they had completed much earlier during boot).
> > The drm.debug dmesg is usually a gold mine of information.
> 
> Attacched there is the full dmesg log.
> 
> > Another useful test is whether i915.powersave=0 also prevents the hang?
> 
> No, it doesn't have any effect.

Yeah I don't think we use that flag for rc6, though we probably should.

The bisect is interesting, I'd have expected a failure when we
re-enabled rc6 on ILK or when we fixed up the ring buffer init.

The cleanup patch should be just that, but at least reverting it
shouldn't cause any trouble.

-- 
Jesse Barnes, Intel Open Source Technology Center
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-01 Thread Chris Wilson
On Tue, 1 Feb 2011 14:00:41 +0100, Francesco Allertsen  
wrote:
> On Tue, Feb 01, 2011 at 12:05:52PM +, Chris Wilson wrote:
> > It would be useful to give us a few more details, such the drm.debug=0xe
> > dmesg and the Xorg.log (from when it does starts!)
> 
> Sorry, I forgot to turn on the debug last time, this is the dmesg output
> from when I start X.

Can you attach the dmesg from when the module loads as well?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-01 Thread Chris Wilson
On Tue, 1 Feb 2011 13:29:45 +0100, Francesco Allertsen  
wrote:
> On Tue, Feb 01, 2011 at 12:05:52PM +, Chris Wilson wrote:
> > It would be useful to give us a few more details, such the drm.debug=0xe
> > dmesg and the Xorg.log (from when it does starts!), and explain what you
> > mean by complete freeze? Such as is the machine still accessible over the
> > network, did it die whilst oopsing, etc.
> 
> I've tried to use netconsole to get the output of dmesg, but there is
> no output.
> 
> Attached there is the Xorg.log, but I don't see any useful infomation.

Useful for me. Just confirms that you have an equivalent machine to
this Lenovo x201s, on which those patches were tested after receiving
from Jesse. :|

The dmesg would have been useful to know whether the i915.ko module is
loaded during X startup, and so reveal some information about the sequence
of function calls (i.e. whether the modified routines were running at the
time of the hang, or whether they had completed much earlier during boot).
The drm.debug dmesg is usually a gold mine of information.

Another useful test is whether i915.powersave=0 also prevents the hang?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: Intel i915 freeze on latest git

2011-02-01 Thread Chris Wilson
On Tue, 1 Feb 2011 12:22:02 +0100, Francesco Allertsen  
wrote:
> Hi Chris and all,
> 
> I have tried the latest git (-rc3) and I get a complete freeze when X
> starts.

It would be useful to give us a few more details, such the drm.debug=0xe
dmesg and the Xorg.log (from when it does starts!), and explain what you
mean by complete freeze? Such as is the machine still accessible over the
network, did it die whilst oopsing, etc.

Several other 'hangs when X starts' were resolved with

commit 9334ef755f060e251f3f395caeda1a58b6834ea3
Author: Chris Wilson 
Date:   Fri Jan 28 11:53:03 2011 +

drm: Don't switch fb when disabling an output

Anyway, I look forward to seeing your debug logs.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel