xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/drmmode_display.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit ce8299962003de572122561a6f7f61eaccf633b2
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Nov 17 15:23:30 2009 +1000

    kms: check for 0 mask for cloned outputs.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index d78a82a..29c3ff1 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -951,12 +951,17 @@ uint32_t find_clones(ScrnInfoPtr scrn, xf86OutputPtr output)
 	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
 	int index_mask = 0;
 
+	if (drmmode_output->enc_clone_mask == 0)
+		return index_mask;
+
 	for (i = 0; i < xf86_config->num_output; i++) {
 		clone_output = xf86_config->output[i];
 		clone_drmout = clone_output->driver_private;
 		if (output == clone_output)
 			continue;
 		
+		if (clone_drmout->enc_mask == 0)
+			continue;
 		if (drmmode_output->enc_clone_mask == clone_drmout->enc_mask)
 			index_mask |= (1 << i);
 	}