diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index 9bda006..32b6fb6 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -1118,7 +1118,7 @@ intel_output_dpms(xf86OutputPtr output, int dpms)
 
 		if (!strcmp(props->name, "DPMS")) {
 			/* Make sure to reverse the order between on and off. */
-			if (dpms == DPMSModeOff)
+			if (dpms != DPMSModeOn)
 				intel_output_dpms_backlight(output,
 							    intel_output->dpms_mode,
 							    dpms);
@@ -1129,7 +1129,7 @@ intel_output_dpms(xf86OutputPtr output, int dpms)
 							    props->prop_id,
 							    dpms);
 
-			if (dpms != DPMSModeOff)
+			if (dpms == DPMSModeOn)
 				intel_output_dpms_backlight(output,
 							    intel_output->dpms_mode,
 							    dpms);
@@ -1391,7 +1391,7 @@ intel_output_get_property(xf86OutputPtr output, Atom property)
 
 		err = RRChangeOutputProperty(output->randr_output, property,
 					     XA_INTEGER, 32, PropModeReplace, 1, &val,
-					     FALSE, TRUE);
+					     FALSE, FALSE);
 		if (err != 0) {
 			xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
 				   "RRChangeOutputProperty error, %d\n", err);