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

[Rafael J. Wysocki]

Hi Chris,

Unfortunately, your commit

commit 7dd4906586274f3945f2aeaaa5a33b451c3b4bba
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/