diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-01-03 17:52:27 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-03 23:04:13 +0000 |
| commit | 145c42a101c3150fb1e2cae8a1780b26e8b56f42 (patch) | |
| tree | 67b713871d74b49405ef71253b4b7cb82dbfe0e5 | |
| parent | b0d10ff04a24a951256a79710ba22b325b549ba4 (diff) | |
| download | xf86-video-intel-145c42a101c3150fb1e2cae8a1780b26e8b56f42.tar.gz xf86-video-intel-145c42a101c3150fb1e2cae8a1780b26e8b56f42.tar.bz2 xf86-video-intel-145c42a101c3150fb1e2cae8a1780b26e8b56f42.zip | |
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@redhat.com>
[ickle: crtc->mode is a ModeRec not Ptr]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/intel_dri.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/intel_dri.c b/src/intel_dri.c index 709636936..7b60e140d 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; |