From ad5b6a303b44ba0ae9f8df075a7efec92a2e41ff Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 15 Oct 2013 12:48:27 +0100 Subject: [PATCH] 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 --- src/sna/sna_display.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index f74adf43..2257faad 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);