Mesa (master): i965: Fix offset-aligned-to-tile test in dma_buf import.
Eric Anholt
anholt at kemper.freedesktop.org
Thu May 1 22:16:53 UTC 2014
Module: Mesa
Branch: master
Commit: 65e025f99ce55f9679f009b5a6d3a9ca94ff561e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=65e025f99ce55f9679f009b5a6d3a9ca94ff561e
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 25 11:17:41 2014 -0700
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 at whitecape.org>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
---
src/mesa/drivers/dri/i965/intel_screen.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 4e1747f..0a82f1f 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -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");
}
More information about the mesa-commit
mailing list