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

Commit 4984979b authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/irq: simplify irq checks in drm_wait_vblank



Checking for both an irq number _and_ whether it's enabled is
redundant. Originally I've thought the drm_dev_to_irq call would break
drivers which do their own irq checking, but those shouldn't have
DRIVER_HAVE_IRQ set as Thierry Reding pointed out. But such drivers
already need to set dev->irq_enabled for other reasons, so we might as
well ditch that check, too.

v2: Also drop the HAVE_IRQ check.

Cc: Thierry Reding <thierry.reding@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a798c10f
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -1160,8 +1160,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
	int ret;
	unsigned int flags, seq, crtc, high_crtc;

	if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
		if ((!drm_dev_to_irq(dev)) || (!dev->irq_enabled))
	if (!dev->irq_enabled)
		return -EINVAL;

	if (vblwait->request.type & _DRM_VBLANK_SIGNAL)