Commit e58c2cac authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Andi Shyti
Browse files

drm/i915/display: Use intel_uncore alias if defined 



Alias is shorter and more readable.

Signed-off-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221006163200.2803722-3-andrzej.hajda@intel.com
parent 3703060d

drivers/gpu/drm/i915/i915_irq.c

+7 −7
Original line number Diff line number Diff line
@@ -3020,7 +3020,7 @@ static void vlv_display_irq_reset(struct drm_i915_private *dev_priv) 
		intel_uncore_write(uncore, DPINVGTT, DPINVGTT_STATUS_MASK_VLV);



	i915_hotplug_interrupt_update_locked(dev_priv, 0xffffffff, 0);

	intel_uncore_write(uncore, PORT_HOTPLUG_STAT, intel_uncore_read(&dev_priv->uncore, PORT_HOTPLUG_STAT));

	intel_uncore_write(uncore, PORT_HOTPLUG_STAT, intel_uncore_read(uncore, PORT_HOTPLUG_STAT));



	i9xx_pipestat_irq_reset(dev_priv);
@@ -3118,7 +3118,7 @@ static void gen8_irq_reset(struct drm_i915_private *dev_priv) 
{

	struct intel_uncore *uncore = &dev_priv->uncore;



	gen8_master_intr_disable(dev_priv->uncore.regs);

	gen8_master_intr_disable(uncore->regs);



	gen8_gt_irq_reset(to_gt(dev_priv));

	gen8_display_irq_reset(dev_priv);
@@ -3250,7 +3250,7 @@ static void cherryview_irq_reset(struct drm_i915_private *dev_priv) 
{

	struct intel_uncore *uncore = &dev_priv->uncore;



	intel_uncore_write(&dev_priv->uncore, GEN8_MASTER_IRQ, 0);

	intel_uncore_write(uncore, GEN8_MASTER_IRQ, 0);

	intel_uncore_posting_read(&dev_priv->uncore, GEN8_MASTER_IRQ);



	gen8_gt_irq_reset(to_gt(dev_priv));
@@ -4110,7 +4110,7 @@ static void i915_irq_postinstall(struct drm_i915_private *dev_priv) 
	struct intel_uncore *uncore = &dev_priv->uncore;

	u32 enable_mask;



	intel_uncore_write(&dev_priv->uncore, EMR, ~(I915_ERROR_PAGE_TABLE |

	intel_uncore_write(uncore, EMR, ~(I915_ERROR_PAGE_TABLE |

					  I915_ERROR_MEMORY_REFRESH));



	/* Unmask the interrupts that we always want on. */
@@ -4206,7 +4206,7 @@ static void i965_irq_reset(struct drm_i915_private *dev_priv) 
	struct intel_uncore *uncore = &dev_priv->uncore;



	i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);

	intel_uncore_write(&dev_priv->uncore, PORT_HOTPLUG_STAT, intel_uncore_read(&dev_priv->uncore, PORT_HOTPLUG_STAT));

	intel_uncore_write(uncore, PORT_HOTPLUG_STAT, intel_uncore_read(uncore, PORT_HOTPLUG_STAT));



	i9xx_pipestat_irq_reset(dev_priv);
@@ -4233,7 +4233,7 @@ static void i965_irq_postinstall(struct drm_i915_private *dev_priv) 
		error_mask = ~(I915_ERROR_PAGE_TABLE |

			       I915_ERROR_MEMORY_REFRESH);

	}

	intel_uncore_write(&dev_priv->uncore, EMR, error_mask);

	intel_uncore_write(uncore, EMR, error_mask);



	/* Unmask the interrupts that we always want on. */

	dev_priv->irq_mask =