From 9e982bbe419a2b3fb1f5cebaed30acffab828d6e Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 14 Jan 2013 16:05:56 +0000
Subject: [PATCH] --- yaml --- r: 358151 b: refs/heads/master c:
 03f6509df9218c760ae74f41a609233220d33f19 h: refs/heads/master i:   358149:
 22441622a34d486e1d1853444191182dbce8cdc5   358147:
 d7eb6a3ea924a86210b50425a615f0b495c67630   358143:
 8a426b6a1e547860c06c0bdb047af4adfdd2fda0 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/gpu/drm/drm_irq.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 78471ac26a11..d7e401775e75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e6d17a5df848cf8e483b689c6295776e9d6d997
+refs/heads/master: 03f6509df9218c760ae74f41a609233220d33f19
diff --git a/trunk/drivers/gpu/drm/drm_irq.c b/trunk/drivers/gpu/drm/drm_irq.c
index 19c01ca3cc76..71f820565637 100644
--- a/trunk/drivers/gpu/drm/drm_irq.c
+++ b/trunk/drivers/gpu/drm/drm_irq.c
@@ -1218,8 +1218,9 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 	int ret;
 	unsigned int flags, seq, crtc, high_crtc;
 
-	if ((!drm_dev_to_irq(dev)) || (!dev->irq_enabled))
-		return -EINVAL;
+	if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
+		if ((!drm_dev_to_irq(dev)) || (!dev->irq_enabled))
+			return -EINVAL;
 
 	if (vblwait->request.type & _DRM_VBLANK_SIGNAL)
 		return -EINVAL;