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

Commit 2795aa48 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Clarify irq_lock locking, intel_tv_detect 



->detect callbacks are only ever called from process context, and
there's no fancy nesting going on here. So plain _irq spinlock
variants is what we want.

Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5b254c59

drivers/gpu/drm/i915/intel_tv.c

+4 −5
Original line number Diff line number Diff line
@@ -1182,18 +1182,17 @@ intel_tv_detect_type(struct intel_tv *intel_tv, 
	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct drm_device *dev = encoder->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	unsigned long irqflags;

	u32 tv_ctl, save_tv_ctl;

	u32 tv_dac, save_tv_dac;

	int type;



	/* Disable TV interrupts around load detect or we'll recurse */

	if (connector->polled & DRM_CONNECTOR_POLL_HPD) {

		spin_lock_irqsave(&dev_priv->irq_lock, irqflags);

		spin_lock_irq(&dev_priv->irq_lock);

		i915_disable_pipestat(dev_priv, 0,

				      PIPE_HOTPLUG_INTERRUPT_STATUS |

				      PIPE_HOTPLUG_TV_INTERRUPT_STATUS);

		spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

		spin_unlock_irq(&dev_priv->irq_lock);

	}



	save_tv_dac = tv_dac = I915_READ(TV_DAC);
@@ -1266,11 +1265,11 @@ intel_tv_detect_type(struct intel_tv *intel_tv, 


	/* Restore interrupt config */

	if (connector->polled & DRM_CONNECTOR_POLL_HPD) {

		spin_lock_irqsave(&dev_priv->irq_lock, irqflags);

		spin_lock_irq(&dev_priv->irq_lock);

		i915_enable_pipestat(dev_priv, 0,

				     PIPE_HOTPLUG_INTERRUPT_STATUS |

				     PIPE_HOTPLUG_TV_INTERRUPT_STATUS);

		spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

		spin_unlock_irq(&dev_priv->irq_lock);

	}



	return type;