Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 778eb334 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Remove I915_HAS_HOTPLUG() check from i915_hpd_irq_setup() 



The dev_priv->display.hpd_irq_setup hook is optional, so we can move the
I915_HAS_HOTPLUG() check out of i915_hpd_irq_setup() and only set up the
hook when hotplug support is present.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7c7e10db

drivers/gpu/drm/i915/i915_irq.c

+20 −22
Original line number Diff line number Diff line
@@ -4129,7 +4129,6 @@ static void i915_hpd_irq_setup(struct drm_device *dev) 


	assert_spin_locked(&dev_priv->irq_lock);



	if (I915_HAS_HOTPLUG(dev)) {

	hotplug_en = I915_READ(PORT_HOTPLUG_EN);

	hotplug_en &= ~HOTPLUG_INT_EN_MASK;

	/* Note HDMI and DP share hotplug bits */
@@ -4149,7 +4148,6 @@ static void i915_hpd_irq_setup(struct drm_device *dev) 
	/* Ignore TV since it's buggy */

	I915_WRITE(PORT_HOTPLUG_EN, hotplug_en);

}

}



static irqreturn_t i965_irq_handler(int irq, void *arg)

{
@@ -4412,14 +4410,14 @@ void intel_irq_init(struct drm_i915_private *dev_priv) 
			dev->driver->irq_postinstall = i915_irq_postinstall;

			dev->driver->irq_uninstall = i915_irq_uninstall;

			dev->driver->irq_handler = i915_irq_handler;

			dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup;

		} else {

			dev->driver->irq_preinstall = i965_irq_preinstall;

			dev->driver->irq_postinstall = i965_irq_postinstall;

			dev->driver->irq_uninstall = i965_irq_uninstall;

			dev->driver->irq_handler = i965_irq_handler;

			dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup;

		}

		if (I915_HAS_HOTPLUG(dev_priv))

			dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup;

		dev->driver->enable_vblank = i915_enable_vblank;

		dev->driver->disable_vblank = i915_disable_vblank;

	}