summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-10-15 12:46:09 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2013-10-15 12:47:46 +0100
commite76b08cad2770015346fd4cd757de3bb3b6ff37c (patch)
tree192308e02feaaa90d5496ad686cfc1ee1ae76a21
parent41b6b792d8e9c84c0a71a4bd7600e1c42e86b5bd (diff)
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@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_display.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 31d1ceb6..f74adf43 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;