[Regression + patch] i915 / PM: System resume broken on 945GM

[Regression + patch] i915 / PM: System resume broken on 945GM

[Rafael J. Wysocki]

Hi Chris,

Unfortunately, your commit

commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Mar 21 10:48:18 2012 +0000

    drm/i915: Mark untiled BLT commands as fenced on gen2/3

breaks system resume on my Toshiba Portege R500 (945GM) which hangs hard
during or right after returning to X.

The appended patch fixes the issue for me, FWIW.

Thanks,
Rafael

---
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux/drivers/gpu/drm/i915/i915_gem_execbuffer.c
===================================================================
--- linux.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ linux/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -498,7 +498,7 @@ pin_and_fence_object(struct drm_i915_gem
 				if (ret)
 					goto err_unpin;
 			}
-			obj->pending_fenced_gpu_access = true;
+			obj->pending_fenced_gpu_access = need_fence;
 		}
 	}
 

Re: [Regression + patch] i915 / PM: System resume broken on 945GM

[Greg Kroah-Hartman]

On Thu, Apr 12, 2012 at 12:12:46AM +0200, Rafael J. Wysocki wrote:
> Hi Chris,
> 
> Unfortunately, your commit
> 
> commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
> Author: Chris Wilson <chris@chris-wilson.co.uk>
> Date:   Wed Mar 21 10:48:18 2012 +0000
> 
>     drm/i915: Mark untiled BLT commands as fenced on gen2/3
> 
> breaks system resume on my Toshiba Portege R500 (945GM) which hangs hard
> during or right after returning to X.

Luckily this patch didn't apply properly to the 3.3-stable tree :)

greg k-h

Re: [Regression + patch] i915 / PM: System resume broken on 945GM

[Rafael J. Wysocki]

Hi,

On Thursday, April 12, 2012, Greg Kroah-Hartman wrote:
> On Thu, Apr 12, 2012 at 12:12:46AM +0200, Rafael J. Wysocki wrote:
> > Hi Chris,
> > 
> > Unfortunately, your commit
> > 
> > commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
> > Author: Chris Wilson <chris@chris-wilson.co.uk>
> > Date:   Wed Mar 21 10:48:18 2012 +0000
> > 
> >     drm/i915: Mark untiled BLT commands as fenced on gen2/3
> > 
> > breaks system resume on my Toshiba Portege R500 (945GM) which hangs hard
> > during or right after returning to X.
> 
> Luckily this patch didn't apply properly to the 3.3-stable tree :)

Your box hanged during resume from suspend with it IIRC, though, or was that
a different issue?

Rafael

Re: [Regression + patch] i915 / PM: System resume broken on 945GM

[Greg Kroah-Hartman]

On Thu, Apr 12, 2012 at 12:56:48AM +0200, Rafael J. Wysocki wrote:
> Hi,
> 
> On Thursday, April 12, 2012, Greg Kroah-Hartman wrote:
> > On Thu, Apr 12, 2012 at 12:12:46AM +0200, Rafael J. Wysocki wrote:
> > > Hi Chris,
> > > 
> > > Unfortunately, your commit
> > > 
> > > commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
> > > Author: Chris Wilson <chris@chris-wilson.co.uk>
> > > Date:   Wed Mar 21 10:48:18 2012 +0000
> > > 
> > >     drm/i915: Mark untiled BLT commands as fenced on gen2/3
> > > 
> > > breaks system resume on my Toshiba Portege R500 (945GM) which hangs hard
> > > during or right after returning to X.
> > 
> > Luckily this patch didn't apply properly to the 3.3-stable tree :)
> 
> Your box hanged during resume from suspend with it IIRC, though, or was that
> a different issue?

Different issue, that was fixed by
dba69d1092e291e257fb5673a3ad0e4c87878ebc (x86, kvm: Call
restore_sched_clock_state() only after %gs is initialized), which went
into Linus's tree right after 3.4-rc1 was out.  All is good in 3.4-rc2
for me, thankfully.

thanks,

greg k-h

Re: [Regression + patch] i915 / PM: System resume broken on 945GM

[Woody Suwalski]

Rafael J. Wysocki wrote:
> Hi Chris,
>
> Unfortunately, your commit
>
> commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
> Author: Chris Wilson<chris@chris-wilson.co.uk>
> Date:   Wed Mar 21 10:48:18 2012 +0000
>
>      drm/i915: Mark untiled BLT commands as fenced on gen2/3
>
> breaks system resume on my Toshiba Portege R500 (945GM) which hangs hard
> during or right after returning to X.
>
> The appended patch fixes the issue for me, FWIW.
>
> Thanks,
> Rafael
>
> ---
>   drivers/gpu/drm/i915/i915_gem_execbuffer.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> ===================================================================
> --- linux.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ linux/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -498,7 +498,7 @@ pin_and_fence_object(struct drm_i915_gem
>   				if (ret)
>   					goto err_unpin;
>   			}
> -			obj->pending_fenced_gpu_access = true;
> +			obj->pending_fenced_gpu_access = need_fence;
>   		}
>   	}
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
Helps on Eeepc as well...

Thanks, Woody