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

[Maximilian Attems]

Author: maks
Date: Mon Dec 20 10:28:43 2010
New Revision: 16721

Log:
drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode().

fix from 2.6.35 longterm

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-atom-set-sane-defaults-in-atombios_get_encoder_mode.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:28:37 2010	(r16720)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 20 10:28:43 2010	(r16721)
@@ -22,6 +22,7 @@
   * drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx.
   * 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().
 
  -- 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-atom-set-sane-defaults-in-atombios_get_encoder_mode.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-atom-set-sane-defaults-in-atombios_get_encoder_mode.patch	Mon Dec 20 10:28:43 2010	(r16721)
@@ -0,0 +1,53 @@
+From c7a71fc761551dc8be8543f14a90d08cda4e77f9 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed, 17 Nov 2010 02:49:40 -0500
+Subject: drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode()
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit c7a71fc761551dc8be8543f14a90d08cda4e77f9 upstream.
+
+If there was no connector mapped to the encoder, atombios_get_encoder_mode()
+returned 0 which is the id for DP.  Return something sane instead based on
+the encoder id.  This avoids hitting the DP paths on non-DP encoders.
+
+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_encoders.c |   18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+Index: linux/drivers/gpu/drm/radeon/radeon_encoders.c
+===================================================================
+--- linux.orig/drivers/gpu/drm/radeon/radeon_encoders.c
++++ linux/drivers/gpu/drm/radeon/radeon_encoders.c
+@@ -626,11 +626,23 @@ atombios_get_encoder_mode(struct drm_enc
+ 	struct drm_connector *connector;
+ 	struct radeon_connector *radeon_connector;
+ 	struct radeon_connector_atom_dig *dig_connector;
++	struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
+ 
+ 	connector = radeon_get_connector_for_encoder(encoder);
+-	if (!connector)
+-		return 0;
+-
++	if (!connector) {
++		switch (radeon_encoder->encoder_id) {
++		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
++		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
++		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
++		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
++		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:
++			return ATOM_ENCODER_MODE_DVI;
++		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
++		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
++		default:
++			return ATOM_ENCODER_MODE_CRT;
++		}
++	}
+ 	radeon_connector = to_radeon_connector(connector);
+ 
+ 	switch (connector->connector_type) {

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:28:37 2010	(r16720)
+++ dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:28:43 2010	(r16721)
@@ -10,3 +10,4 @@
 + bugfix/all/drm-radeon-kms-fix-handling-of-tex-lookup-disable-in-cs-checker-on-r2xx.patch
 + 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