From patchwork Thu Oct 21 08:55:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 270371 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 o9L8xYR1012632 for ; Thu, 21 Oct 2010 08:59:55 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D114B9F66D for ; Thu, 21 Oct 2010 01:59:34 -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 DB7DC9F6A2 for ; Thu, 21 Oct 2010 01:57:15 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 21 Oct 2010 01:57:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.58,216,1286175600"; d="scan'208";a="566065714" 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:15 -0700 From: "Xiang, Haihao" To: intel-gfx@lists.freedesktop.org Date: Thu, 21 Oct 2010 16:55:45 +0800 Message-Id: <1287651346-8041-6-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 5/6] Xv: enable TextureAdaptor for Sandybridge X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 08:59:55 +0000 (UTC) diff --git a/src/intel_video.c b/src/intel_video.c index 5d16778..afc2405 100644 --- a/src/intel_video.c +++ b/src/intel_video.c @@ -364,7 +364,6 @@ void I830InitVideo(ScreenPtr screen) */ if (scrn->bitsPerPixel >= 16 && INTEL_INFO(intel)->gen >= 30 && - INTEL_INFO(intel)->gen < 60 && !intel->use_shadow) { texturedAdaptor = I830SetupImageVideoTextured(screen); if (texturedAdaptor != NULL) { @@ -1583,7 +1582,12 @@ I830PutImageTextured(ScrnInfoPtr scrn, intel_wait_for_scanline(scrn, pixmap, crtc, clipBoxes); } - if (INTEL_INFO(intel)->gen >= 40) { + if (INTEL_INFO(intel)->gen >= 60) { + Gen6DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes, + width, height, dstPitch, dstPitch2, + src_w, src_h, + drw_w, drw_h, pixmap); + } else if (INTEL_INFO(intel)->gen >= 40) { I965DisplayVideoTextured(scrn, adaptor_priv, id, clipBoxes, width, height, dstPitch, dstPitch2, src_w, src_h,