xf86-video-intel: src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_display.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b3138bee8db7db6ebaa10ecdd09c47f899d24c8c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Aug 12 09:00:04 2014 +0100

    sna: Separate panel checks from adding default modes
    
    The flags are now separate, so treat them individually.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 7c20db4..4f69dac 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2864,7 +2864,7 @@ sna_output_get_modes(xf86OutputPtr output)
 	 * If it is incorrect, please fix me.
 	 */
 	sna_output->has_panel_limits = false;
-	if (sna_output->add_default_modes) {
+	if (sna_output->is_panel) {
 		sna_output->panel_hdisplay = sna_output->panel_vdisplay = 0;
 		for (i = 0; i < sna_output->num_modes; i++) {
 			struct drm_mode_modeinfo *m;
@@ -2878,10 +2878,10 @@ sna_output_get_modes(xf86OutputPtr output)
 		sna_output->has_panel_limits =
 			sna_output->panel_hdisplay &&
 			sna_output->panel_vdisplay;
-
-		Modes = sna_output_panel_edid(output, Modes);
 	}
 
+	if (sna_output->add_default_modes)
+		Modes = sna_output_panel_edid(output, Modes);
 
 	return Modes;
 }