xf86-video-intel: src/intel_display.c

[Chris Wilson]

 src/intel_display.c |   16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 19c48d3b3f33582baa87a9b3a9189e320e4cea45
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Aug 9 10:13:58 2010 +0100

    display: outputs are enabled automatically by KMS
    
    When an output is attached to a crtc and that crtc is enabled, the
    output is automatically enabled so we can remove the redundant manual
    dpms on.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_display.c b/src/intel_display.c
index 352b8a9..6e7ec2a 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -326,7 +326,7 @@ intel_crtc_apply(xf86CrtcPtr crtc)
 	uint32_t *output_ids;
 	int output_count = 0;
 	int fb_id, x, y;
-	int i, ret;
+	int i, ret = FALSE;
 
 	output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
 	if (!output_ids)
@@ -377,26 +377,14 @@ intel_crtc_apply(xf86CrtcPtr crtc)
 	} else
 		ret = TRUE;
 
-	/* Turn on any outputs on this crtc that may have been disabled */
-	for (i = 0; i < xf86_config->num_output; i++) {
-		xf86OutputPtr output = xf86_config->output[i];
-
-		if (output->crtc != crtc)
-			continue;
-
-		intel_output_dpms(output, DPMSModeOn);
-	}
-
 	intel_set_gem_max_sizes(scrn);
 
 	if (scrn->pScreen)
 		xf86_reload_cursors(scrn->pScreen);
 
-	return ret;
-
 done:
 	free(output_ids);
-	return FALSE;
+	return ret;
 }
 
 static Bool