From: Adam Jackson Subject: [PATCH 1/2] xv: Fix interlace computation Date: Mon, 3 Jan 2011 17:52:26 -0500 Message-ID: <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 2B9CC9EE9D 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 p03MqSCX023894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 3 Jan 2011 17:52:28 -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 p03MqRrC003204 for ; Mon, 3 Jan 2011 17:52:28 -0500 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_video.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/intel_video.c b/src/intel_video.c index cdff149..d086cbf 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 && (crtc->mode->Flags & V_INTERLACE)) { /* DSL count field lines */ y1 /= 2; y2 /= 2; -- 1.7.3.4