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)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 3 Apr 2014 15:16:45 +0000 (17:16 +0200)
commit9991ae787a0c87fe7c783b4b6f4754c3cdbb6213
treecddcf373cf7540e5f486b0c15d61c9e0e32168f2
parent057f6a8ad7691d028681ba443d7f5e482a6a80a4
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.

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>
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_ringbuffer.h