3.10-stable patches

added patches:
	acpi-video-load-the-module-even-if-acpi-is-disabled.patch
	drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch

diff --git a/queue-3.10/acpi-video-load-the-module-even-if-acpi-is-disabled.patch b/queue-3.10/acpi-video-load-the-module-even-if-acpi-is-disabled.patch
new file mode 100644 (file)
index 0000000..a3c138b
--- /dev/null
+++ b/queue-3.10/acpi-video-load-the-module-even-if-acpi-is-disabled.patch
@@ -0,0 +1,48 @@
+From 6e17cb12881ba8d5e456b89f072dc6b70048af36 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun, 1 Mar 2015 10:41:37 +0000
+Subject: ACPI / video: Load the module even if ACPI is disabled
+
+From: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6e17cb12881ba8d5e456b89f072dc6b70048af36 upstream.
+
+i915.ko depends upon the acpi/video.ko module and so refuses to load if
+ACPI is disabled at runtime if for example the BIOS is broken beyond
+repair. acpi/video provides an optional service for i915.ko and so we
+should just allow the modules to load, but do no nothing in order to let
+the machines boot correctly.
+
+Reported-by: Bill Augur <bill-auger@programmer.net>
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
+Cc: Jani Nikula <jani.nikula@intel.com>
+Acked-by: Aaron Lu <aaron.lu@intel.com>
+[ rjw: Fixed up the new comment in acpi_video_init() ]
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/video.c |   11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/drivers/acpi/video.c
++++ b/drivers/acpi/video.c
+@@ -1953,6 +1953,17 @@ EXPORT_SYMBOL(acpi_video_unregister);
+ 
+ static int __init acpi_video_init(void)
+ {
++      /*
++       * Let the module load even if ACPI is disabled (e.g. due to
++       * a broken BIOS) so that i915.ko can still be loaded on such
++       * old systems without an AcpiOpRegion.
++       *
++       * acpi_video_register() will report -ENODEV later as well due
++       * to acpi_disabled when i915.ko tries to register itself afterwards.
++       */
++      if (acpi_disabled)
++              return 0;
++
+       dmi_check_system(video_dmi_table);
+ 
+       if (intel_opregion_present())

diff --git a/queue-3.10/drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch b/queue-3.10/drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch
new file mode 100644 (file)
index 0000000..29dca2c
--- /dev/null
+++ b/queue-3.10/drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch
@@ -0,0 +1,38 @@
+From dbfb00c3e7e18439f2ebf67fe99bf7a50b5bae1e Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 19 Feb 2015 16:02:15 -0500
+Subject: drm/radeon: fix 1 RB harvest config setup for TN/RL
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit dbfb00c3e7e18439f2ebf67fe99bf7a50b5bae1e upstream.
+
+The logic was reversed from what the hw actually exposed.
+Fixes graphics corruption in certain harvest configurations.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/ni.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/radeon/ni.c
++++ b/drivers/gpu/drm/radeon/ni.c
+@@ -930,12 +930,12 @@ static void cayman_gpu_init(struct radeo
+ 
+       if ((rdev->config.cayman.max_backends_per_se == 1) &&
+           (rdev->flags & RADEON_IS_IGP)) {
+-              if ((disabled_rb_mask & 3) == 1) {
+-                      /* RB0 disabled, RB1 enabled */
+-                      tmp = 0x11111111;
+-              } else {
++              if ((disabled_rb_mask & 3) == 2) {
+                       /* RB1 disabled, RB0 enabled */
+                       tmp = 0x00000000;
++              } else {
++                      /* RB0 disabled, RB1 enabled */
++                      tmp = 0x11111111;
+               }
+       } else {
+               tmp = gb_addr_config & NUM_PIPES_MASK;

diff --git a/queue-3.10/series b/queue-3.10/series
index d686cac0e2559d0e813f1a73445f47f6f4372420..9c0af601a3564a6b93e520720cdfcf952fc81b35 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -57,3 +57,5 @@ staging-comedi-cb_pcidas64-fix-incorrect-ai-range-code-handling.patch
 hid-input-fix-confusion-on-conflicting-mappings.patch
 hid-fixup-the-conflicting-keyboard-mappings-quirk.patch
 drivers-hv-vmbus-incorrect-device-name-is-printed-when-child-device-is-unregistered.patch
+drm-radeon-fix-1-rb-harvest-config-setup-for-tn-rl.patch
+acpi-video-load-the-module-even-if-acpi-is-disabled.patch