[Intel-gfx] [PATCH 2/2] drm/i915: sanitize RPS resetting during GPU reset

[Daniel Vetter]

On Thu, Nov 27, 2014 at 01:08:58PM +0200, Imre Deak wrote:
> On Thu, 2014-11-20 at 23:01 +0200, Imre Deak wrote:
> > Atm, we don't disable RPS interrupts and related work items before
> > resetting the GPU. This may interfere with the following GPU
> > initialization and cause RPS interrupts to show up in PM_IIR too early
> > before calling gen6_enable_rps_interrupts() (triggering a WARN there).
> > 
> > Solve this by disabling RPS interrupts and flushing any related work
> > items before resetting the GPU.
> > 
> > Reported-by: He, Shuang <shuang.he at intel.com>
> > Testcase: igt/gem_reset_stats/ban-render
> > Signed-off-by: Imre Deak <imre.deak at intel.com>
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86644

Also this fixes a regression introduced in

commit 3cc134e3ee09055d5a87193fc7eb0ecf4a59eaa1
Author: Imre Deak <imre.deak at intel.com>
Date:   Wed Nov 19 15:30:03 2014 +0200

    drm/i915: sanitize rps irq enabling

Paulo, can you please review Imre's patches?
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch