From 145c42a101c3150fb1e2cae8a1780b26e8b56f42 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 3 Jan 2011 17:52:27 -0500 Subject: 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 [ickle: crtc->mode is a ModeRec not Ptr] Signed-off-by: Chris Wilson --- src/intel_dri.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/intel_dri.c b/src/intel_dri.c index 70963693..7b60e140 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; -- cgit v1.2.3