[kernel] r16723 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Mon Dec 20 22:49:23 2010
New Revision: 16723

Log:
drm/radeon/kms: add workaround for dce3 ddc line vbios bug

fixes black screen on HP notebook, from 2.6.35 stable
(minimal backport needed).

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Dec 20 10:29:47 2010	(r16722)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 20 22:49:23 2010	(r16723)
@@ -23,6 +23,7 @@
   * drm/i915: Free hardware status page on unload when physically mapped.
   * drm/i915/overlay: Ensure that the reg_bo is in the GTT prior to writing.
   * drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode().
+  * drm/radeon/kms: add workaround for dce3 ddc line vbios bug.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch	Mon Dec 20 22:49:23 2010	(r16723)
@@ -0,0 +1,41 @@
+From 3074adc8b6d9bf28b574a58241b958057a69a7a0 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Tue, 30 Nov 2010 00:15:10 -0500
+Subject: drm/radeon/kms: add workaround for dce3 ddc line vbios bug
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit 3074adc8b6d9bf28b574a58241b958057a69a7a0 upstream.
+
+fixes:
+https://bugzilla.kernel.org/show_bug.cgi?id=23752
+
+[AK: Dropped hunk for non existing i2c code in .35]
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+
+---
+ drivers/gpu/drm/radeon/radeon_atombios.c |    8 ++++++++
+ 2 file changed, 8 insertions(+)
+
+Index: linux/drivers/gpu/drm/radeon/radeon_atombios.c
+===================================================================
+--- linux.orig/drivers/gpu/drm/radeon/radeon_atombios.c
++++ linux/drivers/gpu/drm/radeon/radeon_atombios.c
+@@ -84,6 +84,14 @@ static inline struct radeon_i2c_bus_rec
+ 	for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE; i++) {
+ 		gpio = &i2c_info->asGPIO_Info[i];
+ 
++			/* some DCE3 boards have bad data for this entry */
++			if (ASIC_IS_DCE3(rdev)) {
++				if ((i == 4) &&
++				    (gpio->usClkMaskRegisterIndex == 0x1fda) &&
++				    (gpio->sucI2cId.ucAccess == 0x94))
++					gpio->sucI2cId.ucAccess = 0x14;
++			}
++
+ 		if (gpio->sucI2cId.ucAccess == id) {
+ 			i2c.mask_clk_reg = le16_to_cpu(gpio->usClkMaskRegisterIndex) * 4;
+ 			i2c.mask_data_reg = le16_to_cpu(gpio->usDataMaskRegisterIndex) * 4;

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:29:47 2010	(r16722)
+++ dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 22:49:23 2010	(r16723)
@@ -11,3 +11,4 @@
 + bugfix/all/drm-i915-free-hardware-status-page-on-unload-when-physically-mapped.patch
 + bugfix/all/drm-i915-overlay-ensure-that-the-reg_bo-is-in-the-gtt-prior-to-writing.patch
 + bugfix/all/drm-radeon-kms-atom-set-sane-defaults-in-atombios_get_encoder_mode.patch
++ bugfix/all/drm-radeon-kms-add-workaround-for-dce3-ddc-line-vbios-bug.patch