@@ -1566,9 +1566,15 @@ I830PutImageTextured(ScrnInfoPtr scrn,
drm_intel_bo_gem_create_from_name(intel->bufmgr,
"xvmc surface",
(uintptr_t)buf);
+ } else if (IS_I915(intel)
+ && !(IS_I915G(intel) || IS_I915GM(intel))) {
+ adaptor_priv->buf =
+ drm_intel_bo_gem_create_from_name(intel->bufmgr,
+ "XvMC surface",
+ (uintptr_t) buf);
} else {
- /* XXX: i915 is not support and needs some serious care.
- * grep for KMS in i915_hwmc.c */
+ /* XXX: i915G/GM is not support and needs some serious
+ * care. grep for KMS in i915_hwmc.c */
return BadAlloc;
}
} else {
@@ -817,7 +817,7 @@ static int i915_xvmc_put_image(ScrnInfoPtr scrn,
/* use char *buf to hold our surface offset...hacky! */
buf =
(unsigned char *)pXvMC->sfprivs[xvmc_cmd->srfNo]->
- surface->offset;
+ surface->bo->handle;
break;
default:
return 0;