i915 / PM: System resume broken on 945GM

PATCH In review Rafael J. Wysocki 3 participants 5 messages Apr 11, 2012

Subsystems (2)

DRM drivers Intel i915

lore

Share & tools

lore

Rafael J. Wysocki

author

2012-04-11 22:08 UTC #0 lore raw

PATCH 1/1 i915 / PM: System resume broken on 945GM

Hi Chris,

Unfortunately, your commit

commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba

Author: Chris Wilson <[email protected]>
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(-)

drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1

Index: 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;
 		}
 	}

Greg Kroah-Hartman

2012-04-11 22:20 UTC #1 lore raw

Quoted 4 lines · Rafael J. Wysocki

Hi Chris,
Unfortunately, your commit

Quoted 8 lines

commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
Author: Chris Wilson <[email protected]>
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

Rafael J. Wysocki

author

2012-04-11 22:52 UTC #2 lore raw

Hi,

Quoted 9 lines · Greg Kroah-Hartman

Quoted 8 lines · Rafael J. Wysocki
Hi Chris,
Unfortunately, your commit
commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
Author: Chris Wilson <[email protected]>
Date:   Wed Mar 21 10:48:18 2012 +0000

Quoted 6 lines

Quoted 4 lines
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

Greg Kroah-Hartman

2012-04-11 23:01 UTC #3 lore raw

Quoted 14 lines · Rafael J. Wysocki

Hi,
Quoted 11 lines · Greg Kroah-Hartman
Quoted 10 lines · Rafael J. Wysocki
Hi Chris,
Unfortunately, your commit
commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
Author: Chris Wilson <[email protected]>
Date:   Wed Mar 21 10:48:18 2012 +0000
drm/i915: Mark untiled BLT commands as fenced on gen2/3

Quoted 7 lines

Quoted 4 lines
Quoted 2 lines
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

Woody Suwalski

2012-04-11 22:42 UTC #4 lore raw

In reply to Rafael J. Wysocki

Quoted 36 lines · Rafael J. Wysocki

Hi Chris,
Unfortunately, your commit
commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
Author: Chris Wilson<[email protected]>
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
===================================================================
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -2
@@ -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;
  		}
  	}
 
--

Quoted 4 lines

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
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