xf86-video-intel: 2 commits - src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_display.c |   20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit ad5b6a303b44ba0ae9f8df075a7efec92a2e41ff
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 15 12:48:27 2013 +0100

    Revert "sna: Preserve the user backlight value for get_property calls"
    
    This reverts commit 41b6b792d8e9c84c0a71a4bd7600e1c42e86b5bd in favour
    of the better fix to not ask RRChangeOutputProperty to reset the known
    hardware values.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index f74adf4..2257faa 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2456,7 +2456,6 @@ sna_output_get_property(xf86OutputPtr output, Atom property)
 	int err;
 
 	if (property == backlight_atom || property == backlight_deprecated_atom) {
-		int old_backlight;
 		INT32 val;
 
 		if (!sna_output->backlight_iface)
@@ -2466,18 +2465,10 @@ sna_output_get_property(xf86OutputPtr output, Atom property)
 		if (val < 0)
 			return FALSE;
 
-		/* Preserve our value of the current user backlight level so that we
-		 * avoid mixing in automatic resetting of the backlight across DPMS
-		 * events. The property query should ideally always be idempotent.
-		 */
-		old_backlight = sna_output->backlight_active_level;
-
 		err = RRChangeOutputProperty(output->randr_output, property,
 					     XA_INTEGER, 32, PropModeReplace, 1, &val,
 					     FALSE, FALSE);
 
-		sna_output->backlight_active_level = old_backlight;
-
 		if (err != 0) {
 			xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
 				   "RRChangeOutputProperty error, %d\n", err);
commit e76b08cad2770015346fd4cd757de3bb3b6ff37c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Oct 15 12:46:09 2013 +0100

    sna: Disable updating properties upon reading their values
    
    When we assign the hardware values to the output properties, we do not
    need to process the set_property callback to write those values back to
    hardware. This callback is triggered by the pending update flag passed
    to RRChangeOutputProperty.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70406
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 31d1ceb..f74adf4 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1965,7 +1965,7 @@ sna_output_attach_edid(xf86OutputPtr output)
 					       XA_INTEGER, 8, PropModeReplace,
 					       sna_output->edid_len,
 					       sna_output->edid_raw,
-					       FALSE, TRUE);
+					       FALSE, FALSE);
 
 			return;
 		}
@@ -2271,8 +2271,8 @@ sna_output_create_ranged_atom(xf86OutputPtr output, Atom *atom,
 			   "RRConfigureOutputProperty error, %d\n", err);
 
 	err = RRChangeOutputProperty(output->randr_output, *atom, XA_INTEGER,
-				     32, PropModeReplace, 1, &value, FALSE,
-				     TRUE);
+				     32, PropModeReplace, 1, &value,
+				     FALSE, FALSE);
 	if (err != 0)
 		xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
 			   "RRChangeOutputProperty error, %d\n", err);
@@ -2344,7 +2344,8 @@ sna_output_create_resources(xf86OutputPtr output)
 					break;
 			/* there's always a matching value */
 			err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
-						     XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1], FALSE, TRUE);
+						     XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1],
+						     FALSE, FALSE);
 			if (err != 0) {
 				xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
 					   "RRChangeOutputProperty error, %d\n", err);
@@ -2473,7 +2474,7 @@ sna_output_get_property(xf86OutputPtr output, Atom property)
 
 		err = RRChangeOutputProperty(output->randr_output, property,
 					     XA_INTEGER, 32, PropModeReplace, 1, &val,
-					     FALSE, TRUE);
+					     FALSE, FALSE);
 
 		sna_output->backlight_active_level = old_backlight;