summaryrefslogtreecommitdiff
path: root/src/intel_video.c
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2010-10-15 11:20:22 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2010-11-01 08:51:51 +0800
commit9e73cbd7eea61f2fe69692056ca446a4d95e17c2 (patch)
tree554b9c093170555bfca575c7f35ef07b88c8f94b /src/intel_video.c
parent3213849907bf1b1468872668d10764054c1034fe (diff)
Xv: enable TextureAdaptor for Sandybridge
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Diffstat (limited to 'src/intel_video.c')
-rw-r--r--src/intel_video.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/intel_video.c b/src/intel_video.c
index 5d167789..afc24058 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,