xf86-video-intel: 3 commits - src/intel_dri.c src/intel_driver.c src/intel_video.c

[Chris Wilson]

 src/intel_dri.c    |    5 ++---
 src/intel_driver.c |    3 +++
 src/intel_video.c  |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6d50f5a140dbefdf86eb25d18d08473aa7e42acc
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jan 3 23:06:14 2011 +0000

    If the crtc is not enabled, then it can't be on
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_driver.c b/src/intel_driver.c
index f09203a..1275e4b 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -811,6 +811,9 @@ Bool intel_crtc_on(xf86CrtcPtr crtc)
 	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
 	int i, active_outputs = 0;
 
+	if (!crtc->enabled)
+		return FALSE;
+
 	/* Kernel manages CRTC status based out output config */
 	for (i = 0; i < xf86_config->num_output; i++) {
 		xf86OutputPtr output = xf86_config->output[i];
commit 145c42a101c3150fb1e2cae8a1780b26e8b56f42
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jan 3 17:52:27 2011 -0500

    dri2: Fix interlace computation
    
    scrn->currentMode is a hack for xf86vidmode and in general is wrong for
    RANDRful drivers.  Use the mode on the associated CRTC instead.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    [ickle: crtc->mode is a ModeRec not Ptr]
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_dri.c b/src/intel_dri.c
index 7096369..7b60e14 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -433,8 +433,7 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
 
 	/* Wait for the scanline to be outside the region to be copied */
 	if (pixmap_is_scanout(get_drawable_pixmap(dst)) &&
-	    intel->swapbuffers_wait &&
-	    scrn->currentMode) {
+	    intel->swapbuffers_wait) {
 		BoxPtr box;
 		BoxRec crtcbox;
 		int y1, y2;
@@ -485,7 +484,7 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
 				    event = MI_WAIT_FOR_PIPEB_SVBLANK;
 			}
 
-			if (scrn->currentMode->Flags & V_INTERLACE) {
+			if (crtc->mode.Flags & V_INTERLACE) {
 				/* DSL count field lines */
 				y1 /= 2;
 				y2 /= 2;
commit b0d10ff04a24a951256a79710ba22b325b549ba4
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jan 3 17:52:26 2011 -0500

    xv: Fix interlace computation
    
    scrn->currentMode is a hack for xf86vidmode and in general is wrong for
    RANDRful drivers.  Use the mode on the associated CRTC instead.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    [ickle: crtc->mode is a ModeRec]
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_video.c b/src/intel_video.c
index cdff149..2786201 100644
--- a/src/intel_video.c
+++ b/src/intel_video.c
@@ -1348,7 +1348,7 @@ intel_wait_for_scanline(ScrnInfoPtr scrn, PixmapPtr pixmap,
 			event = MI_WAIT_FOR_PIPEB_SVBLANK;
 	}
 
-	if (scrn->currentMode->Flags & V_INTERLACE) {
+	if (crtc->mode.Flags & V_INTERLACE) {
 		/* DSL count field lines */
 		y1 /= 2;
 		y2 /= 2;