diff --git a/[refs] b/[refs]
index 8ef01be148f2..175307b36f1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee2e013131dcf6427334663662dbe760ccdba735
+refs/heads/master: 0ccb3a75fe81ec3c4ceb7344c34d0497cbabb369
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_display.c b/trunk/drivers/gpu/drm/nouveau/nv50_display.c
index 0ab868722114..f13ad0de9c8f 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv50_display.c
@@ -380,6 +380,9 @@ nv50_display_init(struct drm_device *dev)
 	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
 		struct nouveau_connector *conn = nouveau_connector(connector);
 
+		if (conn->dcb->gpio_tag == 0xff)
+			continue;
+
 		pgpio->irq_enable(dev, conn->dcb->gpio_tag, true);
 	}