3.0-stable patches

added patches:
	drm-radeon-add-msi-quirk-for-gateway-rs690.patch
	drm-radeon-force-msis-on-rs690-asics.patch
	drm-radeon-only-adjust-default-clocks-on-ni-gpus.patch

diff --git a/queue-3.0/drm-radeon-add-msi-quirk-for-gateway-rs690.patch b/queue-3.0/drm-radeon-add-msi-quirk-for-gateway-rs690.patch
new file mode 100644 (file)
index 0000000..d3e6120
--- /dev/null
+++ b/queue-3.0/drm-radeon-add-msi-quirk-for-gateway-rs690.patch
@@ -0,0 +1,34 @@
+From 3a6d59df80897cc87812b6826d70085905bed013 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Wed, 26 Sep 2012 12:31:45 -0400
+Subject: drm/radeon: Add MSI quirk for gateway RS690
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 3a6d59df80897cc87812b6826d70085905bed013 upstream.
+
+Fixes another system on:
+https://bugs.freedesktop.org/show_bug.cgi?id=37679
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_irq_kms.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
++++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
+@@ -143,6 +143,12 @@ static bool radeon_msi_ok(struct radeon_
+           (rdev->pdev->subsystem_device == 0x01fd))
+               return true;
+ 
++      /* Gateway RS690 only seems to work with MSIs. */
++      if ((rdev->pdev->device == 0x791f) &&
++          (rdev->pdev->subsystem_vendor == 0x107b) &&
++          (rdev->pdev->subsystem_device == 0x0185))
++              return true;
++
+       /* RV515 seems to have MSI issues where it loses
+        * MSI rearms occasionally. This leads to lockups and freezes.
+        * disable it by default.

diff --git a/queue-3.0/drm-radeon-force-msis-on-rs690-asics.patch b/queue-3.0/drm-radeon-force-msis-on-rs690-asics.patch
new file mode 100644 (file)
index 0000000..46db510
--- /dev/null
+++ b/queue-3.0/drm-radeon-force-msis-on-rs690-asics.patch
@@ -0,0 +1,33 @@
+From fb6ca6d154cdcd53e7f27f8dbba513830372699b Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Wed, 26 Sep 2012 12:40:45 -0400
+Subject: drm/radeon: force MSIs on RS690 asics
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit fb6ca6d154cdcd53e7f27f8dbba513830372699b upstream.
+
+There are so many quirks, lets just try and force
+this for all RS690s.  See:
+https://bugs.freedesktop.org/show_bug.cgi?id=37679
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_irq_kms.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
++++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
+@@ -149,6 +149,10 @@ static bool radeon_msi_ok(struct radeon_
+           (rdev->pdev->subsystem_device == 0x0185))
+               return true;
+ 
++      /* try and enable MSIs by default on all RS690s */
++      if (rdev->family == CHIP_RS690)
++              return true;
++
+       /* RV515 seems to have MSI issues where it loses
+        * MSI rearms occasionally. This leads to lockups and freezes.
+        * disable it by default.

diff --git a/queue-3.0/drm-radeon-only-adjust-default-clocks-on-ni-gpus.patch b/queue-3.0/drm-radeon-only-adjust-default-clocks-on-ni-gpus.patch
new file mode 100644 (file)
index 0000000..bc4317c
--- /dev/null
+++ b/queue-3.0/drm-radeon-only-adjust-default-clocks-on-ni-gpus.patch
@@ -0,0 +1,43 @@
+From 2e3b3b105ab3bb5b6a37198da4f193cd13781d13 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 14 Sep 2012 10:59:26 -0400
+Subject: drm/radeon: only adjust default clocks on NI GPUs
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 2e3b3b105ab3bb5b6a37198da4f193cd13781d13 upstream.
+
+SI asics store voltage information differently so we
+don't have a way to deal with it properly yet.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_pm.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_pm.c
++++ b/drivers/gpu/drm/radeon/radeon_pm.c
+@@ -535,7 +535,9 @@ void radeon_pm_suspend(struct radeon_dev
+ void radeon_pm_resume(struct radeon_device *rdev)
+ {
+       /* set up the default clocks if the MC ucode is loaded */
+-      if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) {
++      if ((rdev->family >= CHIP_BARTS) &&
++          (rdev->family <= CHIP_CAYMAN) &&
++          rdev->mc_fw) {
+               if (rdev->pm.default_vddc)
+                       radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
+                                               SET_VOLTAGE_TYPE_ASIC_VDDC);
+@@ -590,7 +592,9 @@ int radeon_pm_init(struct radeon_device
+               radeon_pm_print_states(rdev);
+               radeon_pm_init_profile(rdev);
+               /* set up the default clocks if the MC ucode is loaded */
+-              if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) {
++              if ((rdev->family >= CHIP_BARTS) &&
++                  (rdev->family <= CHIP_CAYMAN) &&
++                  rdev->mc_fw) {
+                       if (rdev->pm.default_vddc)
+                               radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
+                                                       SET_VOLTAGE_TYPE_ASIC_VDDC);

diff --git a/queue-3.0/series b/queue-3.0/series
index 5df85ff7579833ead8b4707aeca9e0fbb6715a49..c90bd60b60b93ba082933ca61e6e8f201b16db67 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -54,3 +54,6 @@ alsa-aloop-add-locking-to-timer-access.patch
 alsa-hda-limit-internal-mic-boost-for-asus-x202e.patch
 alsa-usb-disable-broken-hw-volume-for-tenx-tp6911.patch
 alsa-usb-support-for-original-xbox-communicator.patch
+drm-radeon-only-adjust-default-clocks-on-ni-gpus.patch
+drm-radeon-add-msi-quirk-for-gateway-rs690.patch
+drm-radeon-force-msis-on-rs690-asics.patch