From: Adam Jackson Subject: [PATCH 2/2] dri2: Fix interlace computation Date: Mon, 3 Jan 2011 17:52:27 -0500 Message-ID: <1294095147-21017-2-git-send-email-ajax@redhat.com> References: <1294095147-21017-1-git-send-email-ajax@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 80F859EDD7 for ; Mon, 3 Jan 2011 14:52:29 -0800 (PST) Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p03MqSfu031941 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 3 Jan 2011 17:52:29 -0500 Received: from ihatethathostname.lab.bos.redhat.com (ihatethathostname.lab.bos.redhat.com [10.16.43.238]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p03MqRrD003204 for ; Mon, 3 Jan 2011 17:52:28 -0500 In-Reply-To: <1294095147-21017-1-git-send-email-ajax@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org 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 --- src/intel_dri.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/intel_dri.c b/src/intel_dri.c index 7096369..0e74b7d 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; @@ -449,7 +448,7 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, * Make sure the CRTC is valid and this is the real front * buffer */ - if (crtc != NULL && !crtc->rotatedData) { + if (crtc != NULL && crtc->mode && !crtc->rotatedData) { pipe = intel_crtc_to_pipe(crtc); /* @@ -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; -- 1.7.3.4