xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/drmmode_display.c |    2 ++
 src/radeon_output.c   |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit b90cb61ccb0f4f80e0627141f223354a9371d47d
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Sep 7 11:51:16 2010 -0400

    radeon: set interlaced and doublescan enabled for randr outputs
    
    interlaced used to work without setting these parameters.  Changes
    in the xserver seem to require them now.
    
    Should fix:
    https://bugs.freedesktop.org/show_bug.cgi?id=29591

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 6a4a32d..a6038b2 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -960,6 +960,8 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
 	output->mm_height = koutput->mmHeight;
 
 	output->subpixel_order = subpixel_conv_table[koutput->subpixel];
+	output->interlaceAllowed = TRUE;
+	output->doubleScanAllowed = TRUE;
 	output->driver_private = drmmode_output;
 	
 	output->possible_crtcs = 0x7f;
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 121be75..283d32f 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -3083,6 +3083,8 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
 	    if (!output) {
 		return FALSE;
 	    }
+	    output->interlaceAllowed = TRUE;
+	    output->doubleScanAllowed = TRUE;
 	    output->driver_private = radeon_output;
 	    if (IS_DCE4_VARIANT) {
 		output->possible_crtcs = 0x3f;