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

[Chris Wilson]

 src/sna/sna_display.c |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

New commits:
commit 60d716b53993b08a2a00c22f523c575e62e0a18d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 27 14:11:00 2013 +0100

    sna: Add the probed CRTC mode to the list of output modes
    
    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 4bad2ea..0b40fb2 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3082,6 +3082,8 @@ static bool sna_probe_initial_configuration(struct sna *sna)
 			xf86CrtcPtr crtc = config->crtc[j];
 			if (to_sna_crtc(crtc)->id == enc.crtc_id) {
 				if (crtc->desiredMode.status == MODE_OK) {
+					DisplayModePtr M;
+
 					xf86DrvMsg(scrn->scrnIndex, X_INFO,
 						   "Output %s using initial mode %s on pipe %d\n",
 						   output->name,
@@ -3096,6 +3098,14 @@ static bool sna_probe_initial_configuration(struct sna *sna)
 						output->mm_height = (crtc->desiredMode.VDisplay * 254) / (10*DEFAULT_DPI);
 						output->mm_width = (crtc->desiredMode.HDisplay * 254) / (10*DEFAULT_DPI);
 					}
+
+					M = calloc(1, sizeof(DisplayModeRec));
+					if (M) {
+						*M = crtc->desiredMode;
+						M->name = strdup(M->name);
+						output->probed_modes =
+							xf86ModesAdd(output->probed_modes, M);
+					}
 				}
 				break;
 			}
commit 263e87d5e1915e6c40fa8bc1b325a36f21f92b30
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 27 13:57:22 2013 +0100

    sna: Set the current mode when initialising CRTCs
    
    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 e1199d9..4bad2ea 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3013,6 +3013,13 @@ static bool sna_probe_initial_configuration(struct sna *sna)
 		crtc->desiredY = mode.y;
 		crtc->desiredTransformPresent = FALSE;
 
+		crtc->mode = crtc->desiredMode;
+		crtc->mode.name = NULL;
+		crtc->x = mode.x;
+		crtc->y = mode.y;
+		crtc->rotation = RR_Rotate_0;
+		crtc->transformPresent = FALSE;
+
 		memset(&crtc->panningTotalArea, 0, sizeof(BoxRec));
 		memset(&crtc->panningTrackingArea, 0, sizeof(BoxRec));
 		memset(crtc->panningBorder, 0, 4 * sizeof(INT16));