--- /home/christian/i915_suspend.c~	2013-06-18 08:24:10.609364427 -0400
+++ i915_suspend.c	2013-06-18 07:58:43.475590334 -0400
@@ -199,7 +199,7 @@
 
 	/* This is only meaningful in non-KMS mode */
 	/* Don't regfile.save them in KMS mode */
-	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+	if (1)
 		i915_save_display_reg(dev);
 
 	/* LVDS state */
@@ -249,7 +249,7 @@
 		}
 	}
 
-	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+	if (1)
 		i915_save_vga(dev);
 }
 
@@ -262,7 +262,7 @@
 	if (INTEL_INFO(dev)->gen <= 4)
 		I915_WRITE(DSPARB, dev_priv->regfile.saveDSPARB);
 
-	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+	if (1)
 		i915_restore_display_reg(dev);
 
 	/* LVDS state */
@@ -319,7 +319,7 @@
 		}
 	}
 
-	if (!drm_core_check_feature(dev, DRIVER_MODESET))
+	if (1)
 		i915_restore_vga(dev);
 	else
 		i915_redisable_vga(dev);
@@ -336,7 +336,7 @@
 
 	i915_save_display(dev);
 
-	if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
+	if (1) {
 		/* Interrupt state */
 		if (HAS_PCH_SPLIT(dev)) {
 			dev_priv->regfile.saveDEIER = I915_READ(DEIER);
@@ -386,7 +386,7 @@
 
 	i915_restore_display(dev);
 
-	if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
+	if (1) {
 		/* Interrupt state */
 		if (HAS_PCH_SPLIT(dev)) {
 			I915_WRITE(DEIER, dev_priv->regfile.saveDEIER);