From: Dave Airlie <airlied@redhat.com>
Date: Wed, 12 Sep 2012 05:55:05 +0000 (+1000)
Subject: drm: allow open of dynamic off devices.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=13bb9cc8726c716a7f271fc2c760ba15e1fdd38c;p=openwrt%2Fstaging%2Fblogic.git

drm: allow open of dynamic off devices.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 2d2401e9c5ae..136c949307ba 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -219,7 +219,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 		return -EBUSY;	/* No exclusive opens */
 	if (!drm_cpu_valid())
 		return -EINVAL;
-	if (dev->switch_power_state != DRM_SWITCH_POWER_ON)
+	if (dev->switch_power_state != DRM_SWITCH_POWER_ON && dev->switch_power_state != DRM_SWITCH_POWER_DYNAMIC_OFF)
 		return -EINVAL;
 
 	DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor_id);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 90833dccc919..0e3d51793b65 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1220,6 +1220,7 @@ struct drm_device {
 #define DRM_SWITCH_POWER_ON 0
 #define DRM_SWITCH_POWER_OFF 1
 #define DRM_SWITCH_POWER_CHANGING 2
+#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
 
 static __inline__ int drm_core_check_feature(struct drm_device *dev,
 					     int feature)