* [PATCH v2] drivers/acpi/video: fix brightness allocation
@ 2008-06-21 10:58 Julia Jomantaite
2008-06-23 1:22 ` Zhang Rui
0 siblings, 1 reply; 5+ messages in thread
From: Julia Jomantaite @ 2008-06-21 10:58 UTC (permalink / raw)
To: linux-acpi; +Cc: rui.zhang, lenb, akpm
This patch is to fix problem with device->brightness allocation.
--- orig/drivers/acpi/video.c 2008-06-12 17:15:08.000000000 +0100
+++ linux-2.6/drivers/acpi/video.c 2008-06-21 11:40:46.000000000 +0100
@@ -631,6 +631,75 @@
* device : video output device (LCD, CRT, ..)
*
* Return Value:
+ * Maximum brightness level
+ *
+ * Allocate and initialize device->brightness.
+ */
+
+static int
+acpi_video_init_brightness(struct acpi_video_device *device)
+{
+ union acpi_object *obj = NULL;
+ int i, max_level = 0, count = 0;
+ union acpi_object *o;
+ struct acpi_video_device_brightness *br = NULL;
+
+ if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device, &obj))) {
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available "
+ "LCD brightness level\n"));
+ goto out;
+ }
+
+ if (obj->package.count < 2)
+ goto out;
+
+ br = kzalloc(sizeof(*br), GFP_KERNEL);
+ if (!br) {
+ printk(KERN_ERR "can't allocate memory\n");
+ goto out;
+ }
+
+ br->levels = kmalloc(obj->package.count * sizeof *(br->levels), GFP_KERNEL);
+ if (!br->levels)
+ goto out_free;
+
+ for (i = 0; i < obj->package.count; i++) {
+ o = (union acpi_object *)&obj->package.elements[i];
+ if (o->type != ACPI_TYPE_INTEGER) {
+ printk(KERN_ERR PREFIX "Invalid data\n");
+ continue;
+ }
+ br->levels[count] = (u32) o->integer.value;
+
+ if (br->levels[count] > max_level)
+ max_level = br->levels[count];
+ count++;
+ }
+
+ if (count < 2)
+ goto out_free_levels;
+
+ br->count = count;
+ device->brightness = br;
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "found %d brightness levels\n", count));
+ kfree(obj);
+ return max_level;
+
+out_free_levels:
+ kfree(br->levels);
+out_free:
+ kfree(br);
+out:
+ device->brightness = NULL;
+ kfree(obj);
+ return 0;
+}
+
+/*
+ * Arg:
+ * device : video output device (LCD, CRT, ..)
+ *
+ * Return Value:
* None
*
* Find out all required AML methods defined under the output
@@ -640,10 +709,7 @@
static void acpi_video_device_find_cap(struct acpi_video_device *device)
{
acpi_handle h_dummy1;
- int i;
u32 max_level = 0;
- union acpi_object *obj = NULL;
- struct acpi_video_device_brightness *br = NULL;
memset(&device->cap, 0, sizeof(device->cap));
@@ -657,8 +723,9 @@
if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_BCM", &h_dummy1))) {
device->cap._BCM = 1;
}
- if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle,"_BQC",&h_dummy1)))
+ if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_BQC", &h_dummy1))) {
device->cap._BQC = 1;
+ }
if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
device->cap._DDC = 1;
}
@@ -672,54 +739,8 @@
device->cap._DSS = 1;
}
- if (ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device, &obj))) {
-
- if (obj->package.count >= 2) {
- int count = 0;
- union acpi_object *o;
-
- br = kzalloc(sizeof(*br), GFP_KERNEL);
- if (!br) {
- printk(KERN_ERR "can't allocate memory\n");
- } else {
- br->levels = kmalloc(obj->package.count *
- sizeof *(br->levels), GFP_KERNEL);
- if (!br->levels)
- goto out;
-
- for (i = 0; i < obj->package.count; i++) {
- o = (union acpi_object *)&obj->package.
- elements[i];
- if (o->type != ACPI_TYPE_INTEGER) {
- printk(KERN_ERR PREFIX "Invalid data\n");
- continue;
- }
- br->levels[count] = (u32) o->integer.value;
-
- if (br->levels[count] > max_level)
- max_level = br->levels[count];
- count++;
- }
- out:
- if (count < 2) {
- kfree(br->levels);
- kfree(br);
- } else {
- br->count = count;
- device->brightness = br;
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "found %d brightness levels\n",
- count));
- }
- }
- }
-
- } else {
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available LCD brightness level\n"));
- }
-
- kfree(obj);
-
+ max_level = acpi_video_init_brightness(device);
+
if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
int result;
static int count = 0;
@@ -1695,6 +1716,8 @@
acpi_video_switch_brightness(struct acpi_video_device *device, int event)
{
unsigned long level_current, level_next;
+ if (!device->brightness)
+ return;
acpi_video_device_lcd_get_level_current(device, &level_current);
level_next = acpi_video_get_next_level(device, level_current, event);
acpi_video_device_lcd_set_level(device, level_next);
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] drivers/acpi/video: fix brightness allocation
2008-06-21 10:58 [PATCH v2] drivers/acpi/video: fix brightness allocation Julia Jomantaite
@ 2008-06-23 1:22 ` Zhang Rui
2008-06-23 21:50 ` [PATCH v3] " Julia Jomantaite
0 siblings, 1 reply; 5+ messages in thread
From: Zhang Rui @ 2008-06-23 1:22 UTC (permalink / raw)
To: Julia Jomantaite; +Cc: linux-acpi, lenb, akpm
On Sat, 2008-06-21 at 18:58 +0800, Julia Jomantaite wrote:
> This patch is to fix problem with device->brightness allocation.
Looks good. Please run checkpatch to fix the coding style problems. :)
thanks,
rui
>
> --- orig/drivers/acpi/video.c 2008-06-12 17:15:08.000000000 +0100
> +++ linux-2.6/drivers/acpi/video.c 2008-06-21 11:40:46.000000000
> +0100
> @@ -631,6 +631,75 @@
> * device : video output device (LCD, CRT, ..)
> *
> * Return Value:
> + * Maximum brightness level
> + *
> + * Allocate and initialize device->brightness.
> + */
> +
> +static int
> +acpi_video_init_brightness(struct acpi_video_device *device)
> +{
> + union acpi_object *obj = NULL;
> + int i, max_level = 0, count = 0;
> + union acpi_object *o;
> + struct acpi_video_device_brightness *br = NULL;
> +
> + if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device,
> &obj))) {
> + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query
> available "
> + "LCD brightness level
> \n"));
> + goto out;
> + }
> +
> + if (obj->package.count < 2)
> + goto out;
> +
> + br = kzalloc(sizeof(*br), GFP_KERNEL);
> + if (!br) {
> + printk(KERN_ERR "can't allocate memory\n");
> + goto out;
> + }
> +
> + br->levels = kmalloc(obj->package.count * sizeof
> *(br->levels), GFP_KERNEL);
> + if (!br->levels)
> + goto out_free;
> +
> + for (i = 0; i < obj->package.count; i++) {
> + o = (union acpi_object *)&obj->package.elements[i];
> + if (o->type != ACPI_TYPE_INTEGER) {
> + printk(KERN_ERR PREFIX "Invalid data\n");
> + continue;
> + }
> + br->levels[count] = (u32) o->integer.value;
> +
> + if (br->levels[count] > max_level)
> + max_level = br->levels[count];
> + count++;
> + }
> +
> + if (count < 2)
> + goto out_free_levels;
> +
> + br->count = count;
> + device->brightness = br;
> + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "found %d brightness levels
> \n", count));
> + kfree(obj);
> + return max_level;
> +
> +out_free_levels:
> + kfree(br->levels);
> +out_free:
> + kfree(br);
> +out:
> + device->brightness = NULL;
> + kfree(obj);
> + return 0;
> +}
> +
> +/*
> + * Arg:
> + * device : video output device (LCD, CRT, ..)
> + *
> + * Return Value:
> * None
> *
> * Find out all required AML methods defined under the output
> @@ -640,10 +709,7 @@
> static void acpi_video_device_find_cap(struct acpi_video_device
> *device)
> {
> acpi_handle h_dummy1;
> - int i;
> u32 max_level = 0;
> - union acpi_object *obj = NULL;
> - struct acpi_video_device_brightness *br = NULL;
>
>
> memset(&device->cap, 0, sizeof(device->cap));
> @@ -657,8 +723,9 @@
> if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_BCM",
> &h_dummy1))) {
> device->cap._BCM = 1;
> }
> - if
> (ACPI_SUCCESS(acpi_get_handle(device->dev->handle,"_BQC",&h_dummy1)))
> + if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_BQC",
> &h_dummy1))) {
> device->cap._BQC = 1;
> + }
> if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC",
> &h_dummy1))) {
> device->cap._DDC = 1;
> }
> @@ -672,54 +739,8 @@
> device->cap._DSS = 1;
> }
>
> - if (ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device,
> &obj))) {
> -
> - if (obj->package.count >= 2) {
> - int count = 0;
> - union acpi_object *o;
> -
> - br = kzalloc(sizeof(*br), GFP_KERNEL);
> - if (!br) {
> - printk(KERN_ERR "can't allocate memory
> \n");
> - } else {
> - br->levels =
> kmalloc(obj->package.count *
> - sizeof
> *(br->levels), GFP_KERNEL);
> - if (!br->levels)
> - goto out;
> -
> - for (i = 0; i < obj->package.count; i
> ++) {
> - o = (union acpi_object
> *)&obj->package.
> - elements[i];
> - if (o->type !=
> ACPI_TYPE_INTEGER) {
> - printk(KERN_ERR PREFIX
> "Invalid data\n");
> - continue;
> - }
> - br->levels[count] = (u32)
> o->integer.value;
> -
> - if (br->levels[count] >
> max_level)
> - max_level =
> br->levels[count];
> - count++;
> - }
> - out:
> - if (count < 2) {
> - kfree(br->levels);
> - kfree(br);
> - } else {
> - br->count = count;
> - device->brightness = br;
> -
> ACPI_DEBUG_PRINT((ACPI_DB_INFO,
> - "found %d
> brightness levels\n",
> - count));
> - }
> - }
> - }
> -
> - } else {
> - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query
> available LCD brightness level\n"));
> - }
> -
> - kfree(obj);
> -
> + max_level = acpi_video_init_brightness(device);
> +
> if (device->cap._BCL && device->cap._BCM && device->cap._BQC
> && max_level > 0){
> int result;
> static int count = 0;
> @@ -1695,6 +1716,8 @@
> acpi_video_switch_brightness(struct acpi_video_device *device, int
> event)
> {
> unsigned long level_current, level_next;
> + if (!device->brightness)
> + return;
> acpi_video_device_lcd_get_level_current(device,
> &level_current);
> level_next = acpi_video_get_next_level(device, level_current,
> event);
> acpi_video_device_lcd_set_level(device, level_next);
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3] drivers/acpi/video: fix brightness allocation
2008-06-23 1:22 ` Zhang Rui
@ 2008-06-23 21:50 ` Julia Jomantaite
2008-06-24 2:26 ` Zhang Rui
0 siblings, 1 reply; 5+ messages in thread
From: Julia Jomantaite @ 2008-06-23 21:50 UTC (permalink / raw)
To: Zhang Rui; +Cc: linux-acpi, lenb, akpm
Fix use of uninitialized device->brightness.
Signed-off-by: Julia Jomantaite <julia.jomantaite@gmail.com>
---
--- orig/drivers/acpi/video.c 2008-06-12 17:15:08.000000000 +0100
+++ linux-2.6/drivers/acpi/video.c 2008-06-23 08:44:35.000000000 +0100
@@ -631,6 +631,76 @@ acpi_video_bus_DOS(struct acpi_video_bus
* device : video output device (LCD, CRT, ..)
*
* Return Value:
+ * Maximum brightness level
+ *
+ * Allocate and initialize device->brightness.
+ */
+
+static int
+acpi_video_init_brightness(struct acpi_video_device *device)
+{
+ union acpi_object *obj = NULL;
+ int i, max_level = 0, count = 0;
+ union acpi_object *o;
+ struct acpi_video_device_brightness *br = NULL;
+
+ if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device, &obj))) {
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available "
+ "LCD brightness level\n"));
+ goto out;
+ }
+
+ if (obj->package.count < 2)
+ goto out;
+
+ br = kzalloc(sizeof(*br), GFP_KERNEL);
+ if (!br) {
+ printk(KERN_ERR "can't allocate memory\n");
+ goto out;
+ }
+
+ br->levels = kmalloc(obj->package.count * sizeof *(br->levels),
+ GFP_KERNEL);
+ if (!br->levels)
+ goto out_free;
+
+ for (i = 0; i < obj->package.count; i++) {
+ o = (union acpi_object *)&obj->package.elements[i];
+ if (o->type != ACPI_TYPE_INTEGER) {
+ printk(KERN_ERR PREFIX "Invalid data\n");
+ continue;
+ }
+ br->levels[count] = (u32) o->integer.value;
+
+ if (br->levels[count] > max_level)
+ max_level = br->levels[count];
+ count++;
+ }
+
+ if (count < 2)
+ goto out_free_levels;
+
+ br->count = count;
+ device->brightness = br;
+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "found %d brightness levels\n", count));
+ kfree(obj);
+ return max_level;
+
+out_free_levels:
+ kfree(br->levels);
+out_free:
+ kfree(br);
+out:
+ device->brightness = NULL;
+ kfree(obj);
+ return 0;
+}
+
+/*
+ * Arg:
+ * device : video output device (LCD, CRT, ..)
+ *
+ * Return Value:
* None
*
* Find out all required AML methods defined under the output
@@ -640,10 +710,7 @@ acpi_video_bus_DOS(struct acpi_video_bus
static void acpi_video_device_find_cap(struct acpi_video_device *device)
{
acpi_handle h_dummy1;
- int i;
u32 max_level = 0;
- union acpi_object *obj = NULL;
- struct acpi_video_device_brightness *br = NULL;
memset(&device->cap, 0, sizeof(device->cap));
@@ -672,53 +739,7 @@ static void acpi_video_device_find_cap(s
device->cap._DSS = 1;
}
- if (ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device, &obj))) {
-
- if (obj->package.count >= 2) {
- int count = 0;
- union acpi_object *o;
-
- br = kzalloc(sizeof(*br), GFP_KERNEL);
- if (!br) {
- printk(KERN_ERR "can't allocate memory\n");
- } else {
- br->levels = kmalloc(obj->package.count *
- sizeof *(br->levels), GFP_KERNEL);
- if (!br->levels)
- goto out;
-
- for (i = 0; i < obj->package.count; i++) {
- o = (union acpi_object *)&obj->package.
- elements[i];
- if (o->type != ACPI_TYPE_INTEGER) {
- printk(KERN_ERR PREFIX "Invalid data\n");
- continue;
- }
- br->levels[count] = (u32) o->integer.value;
-
- if (br->levels[count] > max_level)
- max_level = br->levels[count];
- count++;
- }
- out:
- if (count < 2) {
- kfree(br->levels);
- kfree(br);
- } else {
- br->count = count;
- device->brightness = br;
- ACPI_DEBUG_PRINT((ACPI_DB_INFO,
- "found %d brightness levels\n",
- count));
- }
- }
- }
-
- } else {
- ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query available LCD brightness level\n"));
- }
-
- kfree(obj);
+ max_level = acpi_video_init_brightness(device);
if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
int result;
@@ -1695,6 +1716,8 @@ static void
acpi_video_switch_brightness(struct acpi_video_device *device, int event)
{
unsigned long level_current, level_next;
+ if (!device->brightness)
+ return;
acpi_video_device_lcd_get_level_current(device, &level_current);
level_next = acpi_video_get_next_level(device, level_current, event);
acpi_video_device_lcd_set_level(device, level_next);
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] drivers/acpi/video: fix brightness allocation
2008-06-23 21:50 ` [PATCH v3] " Julia Jomantaite
@ 2008-06-24 2:26 ` Zhang Rui
2008-06-27 15:51 ` Len Brown
0 siblings, 1 reply; 5+ messages in thread
From: Zhang Rui @ 2008-06-24 2:26 UTC (permalink / raw)
To: Julia Jomantaite; +Cc: linux-acpi, lenb, akpm
On Tue, 2008-06-24 at 05:50 +0800, Julia Jomantaite wrote:
> Fix use of uninitialized device->brightness.
>
> Signed-off-by: Julia Jomantaite <julia.jomantaite@gmail.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
thanks,
rui
> ---
> --- orig/drivers/acpi/video.c 2008-06-12 17:15:08.000000000 +0100
> +++ linux-2.6/drivers/acpi/video.c 2008-06-23 08:44:35.000000000
> +0100
> @@ -631,6 +631,76 @@ acpi_video_bus_DOS(struct acpi_video_bus
> * device : video output device (LCD, CRT, ..)
> *
> * Return Value:
> + * Maximum brightness level
> + *
> + * Allocate and initialize device->brightness.
> + */
> +
> +static int
> +acpi_video_init_brightness(struct acpi_video_device *device)
> +{
> + union acpi_object *obj = NULL;
> + int i, max_level = 0, count = 0;
> + union acpi_object *o;
> + struct acpi_video_device_brightness *br = NULL;
> +
> + if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device,
> &obj))) {
> + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query
> available "
> + "LCD brightness level
> \n"));
> + goto out;
> + }
> +
> + if (obj->package.count < 2)
> + goto out;
> +
> + br = kzalloc(sizeof(*br), GFP_KERNEL);
> + if (!br) {
> + printk(KERN_ERR "can't allocate memory\n");
> + goto out;
> + }
> +
> + br->levels = kmalloc(obj->package.count * sizeof
> *(br->levels),
> + GFP_KERNEL);
> + if (!br->levels)
> + goto out_free;
> +
> + for (i = 0; i < obj->package.count; i++) {
> + o = (union acpi_object *)&obj->package.elements[i];
> + if (o->type != ACPI_TYPE_INTEGER) {
> + printk(KERN_ERR PREFIX "Invalid data\n");
> + continue;
> + }
> + br->levels[count] = (u32) o->integer.value;
> +
> + if (br->levels[count] > max_level)
> + max_level = br->levels[count];
> + count++;
> + }
> +
> + if (count < 2)
> + goto out_free_levels;
> +
> + br->count = count;
> + device->brightness = br;
> + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "found %d brightness levels
> \n", count));
> + kfree(obj);
> + return max_level;
> +
> +out_free_levels:
> + kfree(br->levels);
> +out_free:
> + kfree(br);
> +out:
> + device->brightness = NULL;
> + kfree(obj);
> + return 0;
> +}
> +
> +/*
> + * Arg:
> + * device : video output device (LCD, CRT, ..)
> + *
> + * Return Value:
> * None
> *
> * Find out all required AML methods defined under the output
> @@ -640,10 +710,7 @@ acpi_video_bus_DOS(struct acpi_video_bus
> static void acpi_video_device_find_cap(struct acpi_video_device
> *device)
> {
> acpi_handle h_dummy1;
> - int i;
> u32 max_level = 0;
> - union acpi_object *obj = NULL;
> - struct acpi_video_device_brightness *br = NULL;
>
>
> memset(&device->cap, 0, sizeof(device->cap));
> @@ -672,53 +739,7 @@ static void acpi_video_device_find_cap(s
> device->cap._DSS = 1;
> }
>
> - if (ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device,
> &obj))) {
> -
> - if (obj->package.count >= 2) {
> - int count = 0;
> - union acpi_object *o;
> -
> - br = kzalloc(sizeof(*br), GFP_KERNEL);
> - if (!br) {
> - printk(KERN_ERR "can't allocate memory
> \n");
> - } else {
> - br->levels =
> kmalloc(obj->package.count *
> - sizeof
> *(br->levels), GFP_KERNEL);
> - if (!br->levels)
> - goto out;
> -
> - for (i = 0; i < obj->package.count; i
> ++) {
> - o = (union acpi_object
> *)&obj->package.
> - elements[i];
> - if (o->type !=
> ACPI_TYPE_INTEGER) {
> - printk(KERN_ERR PREFIX
> "Invalid data\n");
> - continue;
> - }
> - br->levels[count] = (u32)
> o->integer.value;
> -
> - if (br->levels[count] >
> max_level)
> - max_level =
> br->levels[count];
> - count++;
> - }
> - out:
> - if (count < 2) {
> - kfree(br->levels);
> - kfree(br);
> - } else {
> - br->count = count;
> - device->brightness = br;
> -
> ACPI_DEBUG_PRINT((ACPI_DB_INFO,
> - "found %d
> brightness levels\n",
> - count));
> - }
> - }
> - }
> -
> - } else {
> - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query
> available LCD brightness level\n"));
> - }
> -
> - kfree(obj);
> + max_level = acpi_video_init_brightness(device);
>
> if (device->cap._BCL && device->cap._BCM && device->cap._BQC
> && max_level > 0){
> int result;
> @@ -1695,6 +1716,8 @@ static void
> acpi_video_switch_brightness(struct acpi_video_device *device, int
> event)
> {
> unsigned long level_current, level_next;
> + if (!device->brightness)
> + return;
> acpi_video_device_lcd_get_level_current(device,
> &level_current);
> level_next = acpi_video_get_next_level(device, level_current,
> event);
> acpi_video_device_lcd_set_level(device, level_next);
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] drivers/acpi/video: fix brightness allocation
2008-06-24 2:26 ` Zhang Rui
@ 2008-06-27 15:51 ` Len Brown
0 siblings, 0 replies; 5+ messages in thread
From: Len Brown @ 2008-06-27 15:51 UTC (permalink / raw)
To: Zhang Rui; +Cc: Julia Jomantaite, linux-acpi, akpm
On Tue, 24 Jun 2008, Zhang Rui wrote:
>
> On Tue, 2008-06-24 at 05:50 +0800, Julia Jomantaite wrote:
> > Fix use of uninitialized device->brightness.
> >
> > Signed-off-by: Julia Jomantaite <julia.jomantaite@gmail.com>
> Acked-by: Zhang Rui <rui.zhang@intel.com>
applied.
thanks,
-Len
> > ---
> > --- orig/drivers/acpi/video.c 2008-06-12 17:15:08.000000000 +0100
> > +++ linux-2.6/drivers/acpi/video.c 2008-06-23 08:44:35.000000000
> > +0100
> > @@ -631,6 +631,76 @@ acpi_video_bus_DOS(struct acpi_video_bus
> > * device : video output device (LCD, CRT, ..)
> > *
> > * Return Value:
> > + * Maximum brightness level
> > + *
> > + * Allocate and initialize device->brightness.
> > + */
> > +
> > +static int
> > +acpi_video_init_brightness(struct acpi_video_device *device)
> > +{
> > + union acpi_object *obj = NULL;
> > + int i, max_level = 0, count = 0;
> > + union acpi_object *o;
> > + struct acpi_video_device_brightness *br = NULL;
> > +
> > + if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device,
> > &obj))) {
> > + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query
> > available "
> > + "LCD brightness level
> > \n"));
> > + goto out;
> > + }
> > +
> > + if (obj->package.count < 2)
> > + goto out;
> > +
> > + br = kzalloc(sizeof(*br), GFP_KERNEL);
> > + if (!br) {
> > + printk(KERN_ERR "can't allocate memory\n");
> > + goto out;
> > + }
> > +
> > + br->levels = kmalloc(obj->package.count * sizeof
> > *(br->levels),
> > + GFP_KERNEL);
> > + if (!br->levels)
> > + goto out_free;
> > +
> > + for (i = 0; i < obj->package.count; i++) {
> > + o = (union acpi_object *)&obj->package.elements[i];
> > + if (o->type != ACPI_TYPE_INTEGER) {
> > + printk(KERN_ERR PREFIX "Invalid data\n");
> > + continue;
> > + }
> > + br->levels[count] = (u32) o->integer.value;
> > +
> > + if (br->levels[count] > max_level)
> > + max_level = br->levels[count];
> > + count++;
> > + }
> > +
> > + if (count < 2)
> > + goto out_free_levels;
> > +
> > + br->count = count;
> > + device->brightness = br;
> > + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "found %d brightness levels
> > \n", count));
> > + kfree(obj);
> > + return max_level;
> > +
> > +out_free_levels:
> > + kfree(br->levels);
> > +out_free:
> > + kfree(br);
> > +out:
> > + device->brightness = NULL;
> > + kfree(obj);
> > + return 0;
> > +}
> > +
> > +/*
> > + * Arg:
> > + * device : video output device (LCD, CRT, ..)
> > + *
> > + * Return Value:
> > * None
> > *
> > * Find out all required AML methods defined under the output
> > @@ -640,10 +710,7 @@ acpi_video_bus_DOS(struct acpi_video_bus
> > static void acpi_video_device_find_cap(struct acpi_video_device
> > *device)
> > {
> > acpi_handle h_dummy1;
> > - int i;
> > u32 max_level = 0;
> > - union acpi_object *obj = NULL;
> > - struct acpi_video_device_brightness *br = NULL;
> >
> >
> > memset(&device->cap, 0, sizeof(device->cap));
> > @@ -672,53 +739,7 @@ static void acpi_video_device_find_cap(s
> > device->cap._DSS = 1;
> > }
> >
> > - if (ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device,
> > &obj))) {
> > -
> > - if (obj->package.count >= 2) {
> > - int count = 0;
> > - union acpi_object *o;
> > -
> > - br = kzalloc(sizeof(*br), GFP_KERNEL);
> > - if (!br) {
> > - printk(KERN_ERR "can't allocate memory
> > \n");
> > - } else {
> > - br->levels =
> > kmalloc(obj->package.count *
> > - sizeof
> > *(br->levels), GFP_KERNEL);
> > - if (!br->levels)
> > - goto out;
> > -
> > - for (i = 0; i < obj->package.count; i
> > ++) {
> > - o = (union acpi_object
> > *)&obj->package.
> > - elements[i];
> > - if (o->type !=
> > ACPI_TYPE_INTEGER) {
> > - printk(KERN_ERR PREFIX
> > "Invalid data\n");
> > - continue;
> > - }
> > - br->levels[count] = (u32)
> > o->integer.value;
> > -
> > - if (br->levels[count] >
> > max_level)
> > - max_level =
> > br->levels[count];
> > - count++;
> > - }
> > - out:
> > - if (count < 2) {
> > - kfree(br->levels);
> > - kfree(br);
> > - } else {
> > - br->count = count;
> > - device->brightness = br;
> > -
> > ACPI_DEBUG_PRINT((ACPI_DB_INFO,
> > - "found %d
> > brightness levels\n",
> > - count));
> > - }
> > - }
> > - }
> > -
> > - } else {
> > - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Could not query
> > available LCD brightness level\n"));
> > - }
> > -
> > - kfree(obj);
> > + max_level = acpi_video_init_brightness(device);
> >
> > if (device->cap._BCL && device->cap._BCM && device->cap._BQC
> > && max_level > 0){
> > int result;
> > @@ -1695,6 +1716,8 @@ static void
> > acpi_video_switch_brightness(struct acpi_video_device *device, int
> > event)
> > {
> > unsigned long level_current, level_next;
> > + if (!device->brightness)
> > + return;
> > acpi_video_device_lcd_get_level_current(device,
> > &level_current);
> > level_next = acpi_video_get_next_level(device, level_current,
> > event);
> > acpi_video_device_lcd_set_level(device, level_next);
> >
> >
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-06-27 15:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-21 10:58 [PATCH v2] drivers/acpi/video: fix brightness allocation Julia Jomantaite
2008-06-23 1:22 ` Zhang Rui
2008-06-23 21:50 ` [PATCH v3] " Julia Jomantaite
2008-06-24 2:26 ` Zhang Rui
2008-06-27 15:51 ` Len Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox