From patchwork Thu Oct 21 08:55:46 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Xiang, Haihao" <haihao.xiang@intel.com>
X-Patchwork-Id: 270381
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9L8xxYG012859
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Thu, 21 Oct 2010 09:00:26 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id BCC709F72E
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Thu, 21 Oct 2010 01:59:59 -0700 (PDT)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
	by gabe.freedesktop.org (Postfix) with ESMTP id AEA409F6A2
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 21 Oct 2010 01:57:16 -0700 (PDT)
Received: from orsmga002.jf.intel.com ([10.7.209.21])
	by orsmga102.jf.intel.com with ESMTP; 21 Oct 2010 01:57:16 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.58,216,1286175600"; d="scan'208";a="566065722"
Received: from xhh-ilk32.sh.intel.com (HELO localhost.localdomain)
	([10.239.36.13])
	by orsmga002.jf.intel.com with ESMTP; 21 Oct 2010 01:57:16 -0700
From: "Xiang, Haihao" <haihao.xiang@intel.com>
To: intel-gfx@lists.freedesktop.org
Date: Thu, 21 Oct 2010 16:55:46 +0800
Message-Id: <1287651346-8041-7-git-send-email-haihao.xiang@intel.com>
X-Mailer: git-send-email 1.7.0.4
In-Reply-To: <1287651346-8041-1-git-send-email-haihao.xiang@intel.com>
References: <1287651346-8041-1-git-send-email-haihao.xiang@intel.com>
Subject: [Intel-gfx] [PATCH 6/6] Xv: don't call intel_wait_for_scanline on
	Sandybridge
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
MIME-Version: 1.0
Sender: 
 intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Thu, 21 Oct 2010 09:00:26 +0000 (UTC)


diff --git a/src/intel_video.c b/src/intel_video.c
index afc2405..cdff149 100644
--- a/src/intel_video.c
+++ b/src/intel_video.c
@@ -1578,7 +1578,7 @@ I830PutImageTextured(ScrnInfoPtr scrn,
 			return BadAlloc;
 	}
 
-	if (crtc && adaptor_priv->SyncToVblank != 0) {
+	if (crtc && adaptor_priv->SyncToVblank != 0 && INTEL_INFO(intel)->gen < 60) {
 		intel_wait_for_scanline(scrn, pixmap, crtc, clipBoxes);
 	}