[Bug 82340] [HSW Bisected] Fail to resume from S4, causing system hang (once out of 5 test circles)
bugzilla-daemon at freedesktop.org
bugzilla-daemon at freedesktop.org
Sun Aug 17 20:03:13 PDT 2014
https://bugs.freedesktop.org/show_bug.cgi?id=82340
--- Comment #8 from yaoming <ming.yao at intel.com> ---
(In reply to comment #7)
> Perhaps
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c
> b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index f3fd448505f1..968e21300849 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -1316,6 +1316,16 @@ void i915_check_and_clear_faults(struct drm_device
> *dev)
> POSTING_READ(RING_FAULT_REG(&dev_priv->ring[RCS]));
> }
>
> +static void i915_ggtt_flush(struct drm_device *dev)
> +{
> + if (INTEL_INFO(dev)->gen < 6) {
> + intel_gtt_chipset_flush();
> + } else {
> + I915_WRITE(GFX_FLSH_CNTL_GEN6, GFX_FLSH_CNTL_EN);
> + POSTING_READ(GFX_FLSH_CNTL_GEN6);
> + }
> +}
> +
> void i915_gem_suspend_gtt_mappings(struct drm_device *dev)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -1332,6 +1342,8 @@ void i915_gem_suspend_gtt_mappings(struct drm_device
> *dev)
> dev_priv->gtt.base.start,
> dev_priv->gtt.base.total,
> true);
> +
> + i915_ggtt_flush(dev);
> }
>
> void i915_gem_restore_gtt_mappings(struct drm_device *dev)
> @@ -1384,7 +1396,7 @@ void i915_gem_restore_gtt_mappings(struct drm_device
> *dev)
> gen6_write_pdes(container_of(vm, struct i915_hw_ppgtt,
> base));
> }
>
> - i915_gem_chipset_flush(dev);
> + i915_ggtt_flush(dev);
> }
>
> int i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj)
Add patch failed, so I modified i915_gem_gtt.c manually. But also failed to
make when build kernel with kcloud.
--
You are receiving this mail because:
You are the QA Contact for the bug.
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20140818/c84448d8/attachment.html>
More information about the intel-gfx-bugs
mailing list