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

Commit 71e0ffa5 authored by Jesse Barnes's avatar Jesse Barnes Committed by Dave Airlie
Browse files

drm/i915: don't enable vblanks on disabled pipes 



In some cases userland may be confused and try to wait on vblank events from
pipes that aren't actually enabled.  We shouldn't allow this, so return
-EINVAL if the pipe isn't on.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 3d14bdad

drivers/gpu/drm/i915/i915_irq.c

+6 −0
Original line number Diff line number Diff line
@@ -411,6 +411,12 @@ int i915_enable_vblank(struct drm_device *dev, int pipe) 
{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	unsigned long irqflags;

	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;

	u32 pipeconf;



	pipeconf = I915_READ(pipeconf_reg);

	if (!(pipeconf & PIPEACONF_ENABLE))

		return -EINVAL;



	spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);

	if (IS_I965G(dev))