OSDN Git Service

drm/i915: move clearing of RPS interrupt bits from disable to reset time
authorImre Deak <imre.deak@intel.com>
Mon, 23 Mar 2015 17:11:35 +0000 (19:11 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 24 Mar 2015 09:14:48 +0000 (10:14 +0100)
commit096fad9ebfadb4922332f98895ea948e8d7fe6a7
tree1d2f122d240b5b0e4ff4b9ebd5c208b44bc399cf
parent58072ccbb81c6f2d67c5b4cc7597707c4fb86a5e
drm/i915: move clearing of RPS interrupt bits from disable to reset time

The logical place for clearing the RPS latched interrupt bits is when
resetting the RPS interrupts, so move the corresponding part from the RPS
disable function to the reset function. During resetting we already
cleared the IIR bits, so the only thing missing there was clearing pm_iir.

Note that we call gen6_disable_rps_interrupts() also during driver load
and resume time via intel_uncore_sanitize() when i915 interrupts are
still not installed. If there are any pending RPS bits at this point
(which after this patch wouldn't be cleared) they will be cleared by the
reset code via the interrupt preinstall hooks.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c