i965: Fix offset-aligned-to-tile test in dma_buf import.

v1 of the patch got pushed, insted of the v2 that I had reviewed.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Eric Anholt
2014-04-25 11:17:41 -07:00
parent 6db640da22
commit 65e025f99c
+1 -3
View File
@@ -637,7 +637,6 @@ intel_create_image_from_fds(__DRIscreen *screen,
{
struct intel_screen *intelScreen = screen->driverPrivate;
struct intel_image_format *f;
uint32_t mask_x, mask_y;
__DRIimage *image;
int i, index;
@@ -673,8 +672,7 @@ intel_create_image_from_fds(__DRIscreen *screen,
if (f->nplanes == 1) {
image->offset = image->offsets[0];
intel_region_get_tile_masks(image->region, &mask_x, &mask_y, false);
if (image->offset & mask_x)
if (image->region->tiling != I915_TILING_NONE && (image->offset & 0xfff))
_mesa_warning(NULL,
"intel_create_image_from_fds: offset not on tile boundary");
}