drm/i915: Move all ring resets before setting the HWS page
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 2 Apr 2014 15:36:07 +0000 (16:36 +0100)
committerJani Nikula <jani.nikula@intel.com>
Fri, 25 Apr 2014 13:01:14 +0000 (16:01 +0300)
commit78f2975eec9faff353a6194e854d3d39907bab68
tree5ef29601b8fc2ee8c9d48f9fce67a63caccf4ef6
parent3ff04a160a891e56cdcee5c198d4c764d1c8c78b
drm/i915: Move all ring resets before setting the HWS page

In commit a51435a3137ad8ae75c288c39bd2d8b2696bae8f
Author: Naresh Kumar Kachhi <naresh.kumar.kachhi@intel.com>
Date:   Wed Mar 12 16:39:40 2014 +0530

    drm/i915: disable rings before HW status page setup

we reordered stopping the rings to do so before we set the HWS register.
However, there is an extra workaround for g45 to reset the rings twice,
and for consistency we should apply that workaround before setting the
HWS to be sure that the rings are truly stopped.

Reference: http://lkml.kernel.org/r/20140423202248.GA3621@amd.pavel.ucw.cz
Tested-by: Pavel Machek <pavel@ucw.cz>
Cc: Naresh Kumar Kachhi <naresh.kumar.kachhi@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_ringbuffer.h