From 9ae0d05908fadc8beea29cb46e7f904d7635058b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 7 Jul 2014 16:23:54 -0700 Subject: [PATCH] 3.4-stable patches added patches: acpi-video-add-asus-ul30a-to-acpi-video-detect-blacklist.patch acpi-video-add-asus-ul30vt-to-acpi-video-detect-blacklist.patch acpi-video-ignore-bios-initial-backlight-value-for-hp-1000.patch acpi-video_detect-blacklist-samsung-x360.patch staging-comedi-das08-correct-ai-encoding-for-das08jr-16-ao.patch --- ...ul30a-to-acpi-video-detect-blacklist.patch | 42 +++++++++++ ...l30vt-to-acpi-video-detect-blacklist.patch | 44 ++++++++++++ ...-initial-backlight-value-for-hp-1000.patch | 41 +++++++++++ ...-video_detect-blacklist-samsung-x360.patch | 70 +++++++++++++++++++ queue-3.4/series | 5 ++ ...orrect-ai-encoding-for-das08jr-16-ao.patch | 42 +++++++++++ 6 files changed, 244 insertions(+) create mode 100644 queue-3.4/acpi-video-add-asus-ul30a-to-acpi-video-detect-blacklist.patch create mode 100644 queue-3.4/acpi-video-add-asus-ul30vt-to-acpi-video-detect-blacklist.patch create mode 100644 queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-1000.patch create mode 100644 queue-3.4/acpi-video_detect-blacklist-samsung-x360.patch create mode 100644 queue-3.4/staging-comedi-das08-correct-ai-encoding-for-das08jr-16-ao.patch diff --git a/queue-3.4/acpi-video-add-asus-ul30a-to-acpi-video-detect-blacklist.patch b/queue-3.4/acpi-video-add-asus-ul30a-to-acpi-video-detect-blacklist.patch new file mode 100644 index 00000000000..509905ed5c0 --- /dev/null +++ b/queue-3.4/acpi-video-add-asus-ul30a-to-acpi-video-detect-blacklist.patch @@ -0,0 +1,42 @@ +From 2114b0ee38405ced73040bc1228c6cd42ecac8e2 Mon Sep 17 00:00:00 2001 +From: Bastian Triller +Date: Sun, 19 May 2013 11:52:33 +0000 +Subject: ACPI / video: Add "Asus UL30A" to ACPI video detect blacklist + +From: Bastian Triller + +commit c8f6d8351ba8c89d5cd4c562552ec7ec29274e31 upstream. + +Like on UL30VT, the ACPI video driver can't control backlight correctly on +Asus UL30A. Vendor driver (asus-laptop) can work. This patch is to +add "Asus UL30A" to ACPI video detect blacklist in order to use +asus-laptop for video control on the "Asus UL30A" rather than ACPI +video driver. + +Signed-off-by: Bastian Triller +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Ben Hutchings +Cc: Yijing Wang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/video_detect.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/acpi/video_detect.c ++++ b/drivers/acpi/video_detect.c +@@ -164,6 +164,14 @@ static struct dmi_system_id video_detect + DMI_MATCH(DMI_PRODUCT_NAME, "UL30VT"), + }, + }, ++ { ++ .callback = video_detect_force_vendor, ++ .ident = "Asus UL30A", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "UL30A"), ++ }, ++ }, + { }, + }; + diff --git a/queue-3.4/acpi-video-add-asus-ul30vt-to-acpi-video-detect-blacklist.patch b/queue-3.4/acpi-video-add-asus-ul30vt-to-acpi-video-detect-blacklist.patch new file mode 100644 index 00000000000..f8a9b173c3d --- /dev/null +++ b/queue-3.4/acpi-video-add-asus-ul30vt-to-acpi-video-detect-blacklist.patch @@ -0,0 +1,44 @@ +From 449a2eba6930a77f00c0bc11afaab9a40cd8b417 Mon Sep 17 00:00:00 2001 +From: Lan Tianyu +Date: Fri, 30 Nov 2012 13:02:50 +0100 +Subject: ACPI / video: Add "Asus UL30VT" to ACPI video detect blacklist + +From: Lan Tianyu + +commit d0c2ce16bec0afa6013b4c5220ca4c9c67210215 upstream. + +The ACPI video driver can't control backlight correctly on +Asus UL30VT. Vendor driver (asus-laptop) can work. This patch is to +add "Asus UL30VT" to ACPI video detect blacklist in order to use +asus-laptop for video control on the "Asus UL30VT" rather than ACPI +video driver. + +References: https://bugzilla.kernel.org/show_bug.cgi?id=32592 +Reported-by: Alex Williamson +Signed-off-by: Lan Tianyu +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Ben Hutchings +Cc: Yijing Wang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/video_detect.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/acpi/video_detect.c ++++ b/drivers/acpi/video_detect.c +@@ -156,6 +156,14 @@ static struct dmi_system_id video_detect + DMI_MATCH(DMI_BOARD_NAME, "X360"), + }, + }, ++ { ++ .callback = video_detect_force_vendor, ++ .ident = "Asus UL30VT", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "UL30VT"), ++ }, ++ }, + { }, + }; + diff --git a/queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-1000.patch b/queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-1000.patch new file mode 100644 index 00000000000..8a7add51e91 --- /dev/null +++ b/queue-3.4/acpi-video-ignore-bios-initial-backlight-value-for-hp-1000.patch @@ -0,0 +1,41 @@ +From 36466ac6c36c955ec1e4eaf8f4ed6a192f430f9a Mon Sep 17 00:00:00 2001 +From: Alex Hung +Date: Mon, 6 May 2013 08:23:43 +0000 +Subject: ACPI video: ignore BIOS initial backlight value for HP 1000 + +From: Alex Hung + +commit 4ef366c583d6180b1c951147869ee5a3038834f2 upstream. + +On HP 1000 lapops, BIOS reports minimum backlight on boot and +causes backlight to dim completely. This ignores the initial backlight +values and set to max brightness. + +References:: https://bugs.launchpad.net/bugs/1167760 +Signed-off-by: Alex Hung +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Ben Hutchings +Cc: Yijing Wang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/video.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/acpi/video.c ++++ b/drivers/acpi/video.c +@@ -463,6 +463,14 @@ static struct dmi_system_id video_dmi_ta + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion m4 Notebook PC"), + }, + }, ++ { ++ .callback = video_ignore_initial_backlight, ++ .ident = "HP 1000 Notebook PC", ++ .matches = { ++ DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "HP 1000 Notebook PC"), ++ }, ++ }, + {} + }; + diff --git a/queue-3.4/acpi-video_detect-blacklist-samsung-x360.patch b/queue-3.4/acpi-video_detect-blacklist-samsung-x360.patch new file mode 100644 index 00000000000..849dc971be7 --- /dev/null +++ b/queue-3.4/acpi-video_detect-blacklist-samsung-x360.patch @@ -0,0 +1,70 @@ +From bd38add8120c2f6915d2e117b697843bd23ce573 Mon Sep 17 00:00:00 2001 +From: Corentin Chary +Date: Wed, 13 Jun 2012 09:32:04 +0200 +Subject: acpi/video_detect: blacklist samsung x360 + +From: Corentin Chary + +commit 084940d5b101e9ca91a689eb5048151b14076839 upstream. + +On Samsung X360, the BIOS will set a flag (VDRV) if the generic +ACPI backlight device is used. This flag will definitively break +the backlight interface (even the vendor interface) untill next +reboot. It's why we should prevent video.ko from being used here +and we can't rely on a later call to acpi_video_unregister(). + +Signed-off-by: Corentin Chary +Signed-off-by: Matthew Garrett +Signed-off-by: Ben Hutchings +Cc: Yijing Wang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/video_detect.c | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +--- a/drivers/acpi/video_detect.c ++++ b/drivers/acpi/video_detect.c +@@ -132,6 +132,33 @@ find_video(acpi_handle handle, u32 lvl, + return AE_OK; + } + ++/* Force to use vendor driver when the ACPI device is known to be ++ * buggy */ ++static int video_detect_force_vendor(const struct dmi_system_id *d) ++{ ++ acpi_video_support |= ACPI_VIDEO_BACKLIGHT_DMI_VENDOR; ++ return 0; ++} ++ ++static struct dmi_system_id video_detect_dmi_table[] = { ++ /* On Samsung X360, the BIOS will set a flag (VDRV) if generic ++ * ACPI backlight device is used. This flag will definitively break ++ * the backlight interface (even the vendor interface) untill next ++ * reboot. It's why we should prevent video.ko from being used here ++ * and we can't rely on a later call to acpi_video_unregister(). ++ */ ++ { ++ .callback = video_detect_force_vendor, ++ .ident = "X360", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "X360"), ++ DMI_MATCH(DMI_BOARD_NAME, "X360"), ++ }, ++ }, ++ { }, ++}; ++ + /* + * Returns the video capabilities of a specific ACPI graphics device + * +@@ -164,6 +191,8 @@ long acpi_video_get_capabilities(acpi_ha + * ACPI_VIDEO_BACKLIGHT_DMI_VENDOR; + *} + */ ++ ++ dmi_check_system(video_detect_dmi_table); + } else { + status = acpi_bus_get_device(graphics_handle, &tmp_dev); + if (ACPI_FAILURE(status)) { diff --git a/queue-3.4/series b/queue-3.4/series index 8263e4731b3..35187cc8871 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -25,3 +25,8 @@ nfsd-fix-rare-symlink-decoding-bug.patch tools-ffs-test-fix-header-values-endianess.patch md-flush-writes-before-starting-a-recovery.patch sym53c8xx_2-set-did_requeue-return-code-when-aborting-squeue.patch +acpi-video_detect-blacklist-samsung-x360.patch +acpi-video-add-asus-ul30vt-to-acpi-video-detect-blacklist.patch +acpi-video-add-asus-ul30a-to-acpi-video-detect-blacklist.patch +acpi-video-ignore-bios-initial-backlight-value-for-hp-1000.patch +staging-comedi-das08-correct-ai-encoding-for-das08jr-16-ao.patch diff --git a/queue-3.4/staging-comedi-das08-correct-ai-encoding-for-das08jr-16-ao.patch b/queue-3.4/staging-comedi-das08-correct-ai-encoding-for-das08jr-16-ao.patch new file mode 100644 index 00000000000..d24ab2f99d8 --- /dev/null +++ b/queue-3.4/staging-comedi-das08-correct-ai-encoding-for-das08jr-16-ao.patch @@ -0,0 +1,42 @@ +From 7672832a4ebe555d580a0cdb41a09da0cb8264ba Mon Sep 17 00:00:00 2001 +From: Ian Abbott +Date: Fri, 31 Aug 2012 20:41:29 +0100 +Subject: staging: comedi: das08: Correct AI encoding for das08jr-16-ao + +From: Ian Abbott + +commit e6391a182865efc896cb2a8d79e07b7ac2f45b48 upstream. + +The element of `das08_boards[]` for the 'das08jr-16-ao' board has the +`ai_encoding` member set to `das08_encode12`. It should be set to +`das08_encode16` same as the 'das08jr/16' board. After all, this board +has 16-bit AI resolution. + +The description of the A/D LSB register at offset 0 seems incorrect in +the user manual "cio-das08jr-16-ao.pdf" as it implies that the AI +resolution is only 12 bits. The diagrams of the A/D LSB and MSB +registers show 15 data bits and a sign bit, which matches what the +software expects for the `das08_encode16` AI encoding method. + +Signed-off-by: Ian Abbott +Signed-off-by: Greg Kroah-Hartman +[bwh: Backported to 3.2: adjust indentation] +Signed-off-by: Ben Hutchings +Cc: Yijing Wang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/comedi/drivers/das08.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/comedi/drivers/das08.c ++++ b/drivers/staging/comedi/drivers/das08.c +@@ -385,7 +385,7 @@ static const struct das08_board_struct d + .ai = das08_ai_rinsn, + .ai_nbits = 16, + .ai_pg = das08_pg_none, +- .ai_encoding = das08_encode12, ++ .ai_encoding = das08_encode16, + .ao = das08jr_ao_winsn, + .ao_nbits = 16, + .di = das08jr_di_rbits, -- 2.47.3