p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: Future proof interrupt handler. 

These functions are already being called for gen >= 9,
so let's be sure when this happens we use whatever is
there already for the latest platform.

No functional change.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Rodrigo Vivi 2015-09-02 15:19:24 -07:00 committed by Daniel Vetter
parent 3a41a05d70
commit b4834a508a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/i915_irq.c
View File

@ -2155,7 +2155,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
if (!intel_irqs_enabled(dev_priv)) if (!intel_irqs_enabled(dev_priv))
return IRQ_NONE; return IRQ_NONE;
if (IS_GEN9(dev)) if (INTEL_INFO(dev_priv)->gen >= 9)
aux_mask |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C | aux_mask |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
GEN9_AUX_CHANNEL_D; GEN9_AUX_CHANNEL_D;
@ -2238,7 +2238,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
intel_pipe_handle_vblank(dev, pipe)) intel_pipe_handle_vblank(dev, pipe))
intel_check_page_flip(dev, pipe); intel_check_page_flip(dev, pipe);
if (IS_GEN9(dev)) if (INTEL_INFO(dev_priv)->gen >= 9)
flip_done = pipe_iir & GEN9_PIPE_PLANE1_FLIP_DONE; flip_done = pipe_iir & GEN9_PIPE_PLANE1_FLIP_DONE;
else else
flip_done = pipe_iir & GEN8_PIPE_PRIMARY_FLIP_DONE; flip_done = pipe_iir & GEN8_PIPE_PRIMARY_FLIP_DONE;
@ -2256,7 +2256,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
pipe); pipe);
if (IS_GEN9(dev)) if (INTEL_INFO(dev_priv)->gen >= 9)
fault_errors = pipe_iir & GEN9_DE_PIPE_IRQ_FAULT_ERRORS; fault_errors = pipe_iir & GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
else else
fault_errors = pipe_iir & GEN8_DE_PIPE_IRQ_FAULT_ERRORS; fault_errors = pipe_iir & GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
@ -3539,7 +3539,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
u32 de_port_enables; u32 de_port_enables;
enum pipe pipe; enum pipe pipe;
if (IS_GEN9(dev_priv)) { if (INTEL_INFO(dev_priv)->gen >= 9) {
de_pipe_masked |= GEN9_PIPE_PLANE1_FLIP_DONE | de_pipe_masked |= GEN9_PIPE_PLANE1_FLIP_DONE |
GEN9_DE_PIPE_IRQ_FAULT_ERRORS; GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
de_port_masked |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C | de_port_masked |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |