[kernel] r16724 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series
Maximilian Attems
maks at alioth.debian.org
Mon Dec 20 22:59:37 UTC 2010
Author: maks
Date: Mon Dec 20 22:59:35 2010
New Revision: 16724
Log:
drm/radeon/kms: fix interlaced and doublescan handling
minimal forward porting from 2.6.35 stable
Added:
dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-fix-interlaced-and-doublescan-handling.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 22:49:23 2010 (r16723)
+++ dists/sid/linux-2.6/debian/changelog Mon Dec 20 22:59:35 2010 (r16724)
@@ -24,6 +24,7 @@
* 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.
+ * drm/radeon/kms: fix interlaced and doublescan handling.
-- 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-fix-interlaced-and-doublescan-handling.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-fix-interlaced-and-doublescan-handling.patch Mon Dec 20 22:59:35 2010 (r16724)
@@ -0,0 +1,140 @@
+From c49948f4bd39e27dd06a1cdb0c3743ca2a734f5e Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Tue, 30 Nov 2010 15:46:47 -0500
+Subject: drm/radeon/kms: fix interlaced and doublescan handling
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit c49948f4bd39e27dd06a1cdb0c3743ca2a734f5e upstream.
+
+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_connectors.c | 34 +++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+
+Index: linux/drivers/gpu/drm/radeon/radeon_connectors.c
+===================================================================
+--- linux.orig/drivers/gpu/drm/radeon/radeon_connectors.c
++++ linux/drivers/gpu/drm/radeon/radeon_connectors.c
+@@ -1083,6 +1083,8 @@ radeon_add_atom_connector(struct drm_dev
+ drm_connector_attach_property(&radeon_connector->base,
+ rdev->mode_info.load_detect_property,
+ 1);
++ connector->interlace_allowed = true;
++ connector->doublescan_allowed = true;
+ break;
+ case DRM_MODE_CONNECTOR_DVIA:
+ drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
+@@ -1096,6 +1098,8 @@ radeon_add_atom_connector(struct drm_dev
+ drm_connector_attach_property(&radeon_connector->base,
+ rdev->mode_info.load_detect_property,
+ 1);
++ connector->interlace_allowed = true;
++ connector->doublescan_allowed = true;
+ break;
+ case DRM_MODE_CONNECTOR_DVII:
+ case DRM_MODE_CONNECTOR_DVID:
+@@ -1122,6 +1126,11 @@ radeon_add_atom_connector(struct drm_dev
+ rdev->mode_info.load_detect_property,
+ 1);
+ }
++ connector->interlace_allowed = true;
++ if (connector_type == DRM_MODE_CONNECTOR_DVII)
++ connector->doublescan_allowed = true;
++ else
++ connector->doublescan_allowed = false;
+ break;
+ case DRM_MODE_CONNECTOR_HDMIA:
+ case DRM_MODE_CONNECTOR_HDMIB:
+@@ -1142,6 +1151,11 @@ radeon_add_atom_connector(struct drm_dev
+ rdev->mode_info.coherent_mode_property,
+ 1);
+ subpixel_order = SubPixelHorizontalRGB;
++ connector->interlace_allowed = true;
++ if (connector_type == DRM_MODE_CONNECTOR_HDMIB)
++ connector->doublescan_allowed = true;
++ else
++ connector->doublescan_allowed = false;
+ break;
+ case DRM_MODE_CONNECTOR_DisplayPort:
+ case DRM_MODE_CONNECTOR_eDP:
+@@ -1172,6 +1186,9 @@ radeon_add_atom_connector(struct drm_dev
+ drm_connector_attach_property(&radeon_connector->base,
+ rdev->mode_info.coherent_mode_property,
+ 1);
++ connector->interlace_allowed = true;
++ /* in theory with a DP to VGA converter... */
++ connector->doublescan_allowed = false;
+ break;
+ case DRM_MODE_CONNECTOR_SVIDEO:
+ case DRM_MODE_CONNECTOR_Composite:
+@@ -1187,6 +1204,8 @@ radeon_add_atom_connector(struct drm_dev
+ rdev->mode_info.tv_std_property,
+ radeon_atombios_get_tv_info(rdev));
+ }
++ connector->interlace_allowed = false;
++ connector->doublescan_allowed = false;
+ break;
+ case DRM_MODE_CONNECTOR_LVDS:
+ radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL);
+@@ -1206,6 +1225,8 @@ radeon_add_atom_connector(struct drm_dev
+ dev->mode_config.scaling_mode_property,
+ DRM_MODE_SCALE_FULLSCREEN);
+ subpixel_order = SubPixelHorizontalRGB;
++ connector->interlace_allowed = false;
++ connector->doublescan_allowed = false;
+ break;
+ }
+
+@@ -1277,6 +1298,8 @@ radeon_add_legacy_connector(struct drm_d
+ drm_connector_attach_property(&radeon_connector->base,
+ rdev->mode_info.load_detect_property,
+ 1);
++ connector->interlace_allowed = true;
++ connector->doublescan_allowed = true;
+ break;
+ case DRM_MODE_CONNECTOR_DVIA:
+ drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
+@@ -1290,6 +1313,8 @@ radeon_add_legacy_connector(struct drm_d
+ drm_connector_attach_property(&radeon_connector->base,
+ rdev->mode_info.load_detect_property,
+ 1);
++ connector->interlace_allowed = true;
++ connector->doublescan_allowed = true;
+ break;
+ case DRM_MODE_CONNECTOR_DVII:
+ case DRM_MODE_CONNECTOR_DVID:
+@@ -1307,6 +1332,11 @@ radeon_add_legacy_connector(struct drm_d
+ 1);
+ }
+ subpixel_order = SubPixelHorizontalRGB;
++ connector->interlace_allowed = true;
++ if (connector_type == DRM_MODE_CONNECTOR_DVII)
++ connector->doublescan_allowed = true;
++ else
++ connector->doublescan_allowed = false;
+ break;
+ case DRM_MODE_CONNECTOR_SVIDEO:
+ case DRM_MODE_CONNECTOR_Composite:
+@@ -1329,6 +1359,8 @@ radeon_add_legacy_connector(struct drm_d
+ rdev->mode_info.tv_std_property,
+ radeon_combios_get_tv_info(rdev));
+ }
++ connector->interlace_allowed = false;
++ connector->doublescan_allowed = false;
+ break;
+ case DRM_MODE_CONNECTOR_LVDS:
+ drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);
+@@ -1342,6 +1374,8 @@ radeon_add_legacy_connector(struct drm_d
+ dev->mode_config.scaling_mode_property,
+ DRM_MODE_SCALE_FULLSCREEN);
+ subpixel_order = SubPixelHorizontalRGB;
++ connector->interlace_allowed = false;
++ connector->doublescan_allowed = false;
+ break;
+ }
+
Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30 Mon Dec 20 22:49:23 2010 (r16723)
+++ dists/sid/linux-2.6/debian/patches/series/30 Mon Dec 20 22:59:35 2010 (r16724)
@@ -12,3 +12,4 @@
+ 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
++ bugfix/all/drm-radeon-kms-fix-interlaced-and-doublescan-handling.patch
More information about the Kernel-svn-changes
mailing list