File xf86-video-intel-brightness-addon.patch of Package xorg-x11-driver-video

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-video-intel-brightness-addon.patch of Package xorg-x11-driver-video (Revision e5c7dc80732585cec5ba9a8a7937ed95)

Currently displaying revision e5c7dc80732585cec5ba9a8a7937ed95 , Show latest

From a26f7fda5dc68dc7c54de8a2a734900344f65317 Mon Sep 17 00:00:00 2001
From: Matthias Hopf <mhopf@suse.de>
Date: Tue, 18 Aug 2009 18:01:08 +0200
Subject: [PATCH] Also write to bl_power when setting brightness.

Switches backlight on/off on controllers that support this api.
---
 src/drmmode_display.c |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 4fb20d9..f41b978 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -109,6 +109,12 @@ static char *backlight_interfaces[] = {
 /* Enough for 10 digits of backlight + '\n' + '\0' */
 #define BACKLIGHT_VALUE_LEN 12
 
+/* Constants from include/linux/fb.h */
+enum {
+	FB_BLANK_UNBLANK   = 0,
+	FB_BLANK_POWERDOWN = 4
+};
+
 static void
 drmmode_backlight_set(xf86OutputPtr output, int level)
 {
@@ -121,22 +127,37 @@ drmmode_backlight_set(xf86OutputPtr output, int level)
     if (! drmmode_output->backlight_iface || level < 0)
 	return;
 
-    len = snprintf(val, BACKLIGHT_VALUE_LEN, "%d\n", level);
     sprintf(path, "%s/%s/brightness",
 	    BACKLIGHT_CLASS, drmmode_output->backlight_iface);
+    len = snprintf(val, BACKLIGHT_VALUE_LEN, "%d\n", level);
     fd = open(path, O_RDWR);
     if (fd == -1) {
 	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, "failed to open %s for backlight "
 		   "control: %s\n", path, strerror(errno));
 	return;
     }
-
     ret = write(fd, val, len);
     if (ret == -1) {
 	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, "write to %s for backlight "
 		   "control failed: %s\n", path, strerror(errno));
     }
+    close(fd);
 
+    sprintf(path, "%s/%s/bl_power",
+	    BACKLIGHT_CLASS, drmmode_output->backlight_iface);
+    len = snprintf(val, BACKLIGHT_VALUE_LEN, "%d\n",
+		   level > 0 ? FB_BLANK_UNBLANK : FB_BLANK_POWERDOWN);
+    fd = open(path, O_RDWR);
+    if (fd == -1) {
+	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, "failed to open %s for backlight "
+		   "control: %s\n", path, strerror(errno));
+	return;
+    }
+    ret = write(fd, val, len);
+    if (ret == -1) {
+	xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, "write to %s for backlight "
+		   "control failed: %s\n", path, strerror(errno));
+    }
     close(fd);
 }
 
-- 
1.6.0.2

From 1b7ff8fee1a28e38b006c2e6b83f25e2d37c6dcb Mon Sep 17 00:00:00 2001
From: Matthias Hopf <mhopf@suse.de>
Date: Tue, 18 Aug 2009 18:05:45 +0200
Subject: [PATCH] Don't ignore backlight level change to the same level.

If set externally to a different level, this would result in a no-op.
OTOH if the display is switched off (DPMS) you do not want the change to take
place immediately, but rather to be saved and set later when the display is
active again.
---
 src/drmmode_display.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index f41b978..64b28ef 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1096,10 +1096,9 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
 	if (val < 0 || val > drmmode_output->backlight_max)
 	    return FALSE;
 
-	if (val != drmmode_output->backlight_active_level) {
+	if (drmmode_output->dpms_mode == DPMSModeOn)
 	    drmmode_backlight_set(output, val);
-	    drmmode_output->backlight_active_level = val;
-	}
+	drmmode_output->backlight_active_level = val;
 	return TRUE;
     }
 
-- 
1.6.0.2

From c394eabe88ddb1179adf7f56c3fdb642e3722c3d Mon Sep 17 00:00:00 2001
From: Matthias Hopf <mhopf@suse.de>
Date: Tue, 18 Aug 2009 18:34:45 +0200
Subject: [PATCH] Add get_property support.

So far only BACKLIGHT is changed.
---
 src/drmmode_display.c |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 64b28ef..ab73b4f 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1048,10 +1048,7 @@ drmmode_output_create_resources(xf86OutputPtr output)
     if (drmmode_output->backlight_iface) {
 	INT32 data, backlight_range[2];
 	/* Set up the backlight property, which takes effect immediately
-	 * and accepts values only within the backlight_range.
-	 *
-	 * FIXME: there is no get_property yet.
-	 */
+	 * and accepts values only within the backlight_range. */
 	backlight_atom = MakeAtom(BACKLIGHT_NAME, sizeof(BACKLIGHT_NAME) - 1,
 	    TRUE);
 
@@ -1143,10 +1140,41 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
     return TRUE;
 }
 
+static Bool
+drmmode_output_get_property(xf86OutputPtr output, Atom property)
+{
+    drmmode_output_private_ptr drmmode_output = output->driver_private;
+    int err;
+
+    if (property == backlight_atom) {
+	INT32 val;
+
+	if (! drmmode_output->backlight_iface)
+	    return FALSE;
+
+	val = drmmode_backlight_get(output);
+	if (val < 0)
+	    return FALSE;
+	err = RRChangeOutputProperty(output->randr_output, backlight_atom,
+	                             XA_INTEGER, 32, PropModeReplace, 1, &val,
+	                             FALSE, TRUE);
+	if (err != 0) {
+	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+	               "RRChangeOutputProperty error, %d\n", err);
+	    return FALSE;
+	}
+
+	return TRUE;
+    }
+
+    return TRUE;
+}
+
 static const xf86OutputFuncsRec drmmode_output_funcs = {
 	.create_resources = drmmode_output_create_resources,
 #ifdef RANDR_12_INTERFACE
 	.set_property = drmmode_output_set_property,
+	.get_property = drmmode_output_get_property,
 #endif
 	.dpms = drmmode_output_dpms,
 #if 0
-- 
1.6.0.2

From 3fb5acbdb976e0a3bf60cd86a993f8377c76c8f2 Mon Sep 17 00:00:00 2001
From: Matthias Hopf <mhopf@suse.de>
Date: Tue, 18 Aug 2009 18:44:38 +0200
Subject: [PATCH] Use "Backlight" as backlight brightness property.

BACKLIGHT is now deprecated, though still usable.
---
 src/drmmode_display.c |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index ab73b4f..7522f1c 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -957,8 +957,9 @@ drmmode_property_ignore(drmModePropertyPtr prop)
     return FALSE;
 }
 
-#define BACKLIGHT_NAME  "BACKLIGHT"
-static Atom backlight_atom;
+#define BACKLIGHT_NAME             "Backlight"
+#define BACKLIGHT_DEPRECATED_NAME  "BACKLIGHT"
+static Atom backlight_atom, backlight_deprecated_atom;
 
 static void
 drmmode_output_create_resources(xf86OutputPtr output)
@@ -1049,8 +1050,9 @@ drmmode_output_create_resources(xf86OutputPtr output)
 	INT32 data, backlight_range[2];
 	/* Set up the backlight property, which takes effect immediately
 	 * and accepts values only within the backlight_range. */
-	backlight_atom = MakeAtom(BACKLIGHT_NAME, sizeof(BACKLIGHT_NAME) - 1,
-	    TRUE);
+	backlight_atom = MakeAtom(BACKLIGHT_NAME, sizeof(BACKLIGHT_NAME) - 1, TRUE);
+	backlight_deprecated_atom = MakeAtom(BACKLIGHT_DEPRECATED_NAME,
+		sizeof(BACKLIGHT_DEPRECATED_NAME) - 1, TRUE);
 
 	backlight_range[0] = 0;
 	backlight_range[1] = drmmode_output->backlight_max;
@@ -1060,6 +1062,12 @@ drmmode_output_create_resources(xf86OutputPtr output)
 	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
 	               "RRConfigureOutputProperty error, %d\n", err);
 	}
+	err = RRConfigureOutputProperty(output->randr_output, backlight_deprecated_atom,
+	                                FALSE, TRUE, FALSE, 2, backlight_range);
+	if (err != 0) {
+	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+	               "RRConfigureOutputProperty error, %d\n", err);
+	}
 	/* Set the current value of the backlight property */
 	data = drmmode_output->backlight_active_level;
 	err = RRChangeOutputProperty(output->randr_output, backlight_atom,
@@ -1069,6 +1077,13 @@ drmmode_output_create_resources(xf86OutputPtr output)
 	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
 	               "RRChangeOutputProperty error, %d\n", err);
 	}
+	err = RRChangeOutputProperty(output->randr_output, backlight_deprecated_atom,
+	                             XA_INTEGER, 32, PropModeReplace, 1, &data,
+	                             FALSE, TRUE);
+	if (err != 0) {
+	    xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+	               "RRChangeOutputProperty error, %d\n", err);
+	}
     }
 }
 
@@ -1080,7 +1095,7 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
     drmmode_ptr drmmode = drmmode_output->drmmode;
     int i;
 
-    if (property == backlight_atom) {
+    if (property == backlight_atom || property == backlight_deprecated_atom) {
 	INT32 val;
 
 	if (value->type != XA_INTEGER || value->format != 32 ||
@@ -1146,7 +1161,7 @@ drmmode_output_get_property(xf86OutputPtr output, Atom property)
     drmmode_output_private_ptr drmmode_output = output->driver_private;
     int err;
 
-    if (property == backlight_atom) {
+    if (property == backlight_atom || property == backlight_deprecated_atom) {
 	INT32 val;
 
 	if (! drmmode_output->backlight_iface)
@@ -1155,7 +1170,7 @@ drmmode_output_get_property(xf86OutputPtr output, Atom property)
 	val = drmmode_backlight_get(output);
 	if (val < 0)
 	    return FALSE;
-	err = RRChangeOutputProperty(output->randr_output, backlight_atom,
+	err = RRChangeOutputProperty(output->randr_output, property,
 	                             XA_INTEGER, 32, PropModeReplace, 1, &val,
 	                             FALSE, TRUE);
 	if (err != 0) {
-- 
1.6.0.2

Places

File xf86-video-intel-brightness-addon.patch of Package xorg-x11-driver-video (Revision e5c7dc80732585cec5ba9a8a7937ed95)

Places