Browse Source

drm/omap: fix operation without fbdev

omapdrm should work fine even if fbdev is missing. The current driver
crashes in that case, though, as it is missing checks for the fbdev.

Add the checks so that we don't free fbdev or restore fbdev mode when
there's no fbdev.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tomi Valkeinen 11 years ago
parent
commit
c7c1aecd8e
1 changed files with 7 additions and 4 deletions
  1. 7 4
      drivers/gpu/drm/omapdrm/omap_drv.c

+ 7 - 4
drivers/gpu/drm/omapdrm/omap_drv.c

@@ -530,7 +530,8 @@ static int dev_unload(struct drm_device *dev)
 
 
 	drm_kms_helper_poll_fini(dev);
 	drm_kms_helper_poll_fini(dev);
 
 
-	omap_fbdev_free(dev);
+	if (priv->fbdev)
+		omap_fbdev_free(dev);
 
 
 	/* flush crtcs so the fbs get released */
 	/* flush crtcs so the fbs get released */
 	for (i = 0; i < priv->num_crtcs; i++)
 	for (i = 0; i < priv->num_crtcs; i++)
@@ -599,9 +600,11 @@ static void dev_lastclose(struct drm_device *dev)
 		}
 		}
 	}
 	}
 
 
-	ret = drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
-	if (ret)
-		DBG("failed to restore crtc mode");
+	if (priv->fbdev) {
+		ret = drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
+		if (ret)
+			DBG("failed to restore crtc mode");
+	}
 }
 }
 
 
 static void dev_preclose(struct drm_device *dev, struct drm_file *file)
 static void dev_preclose(struct drm_device *dev, struct drm_file *file)