summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2014-04-25 11:17:41 -0700
committerEric Anholt <[email protected]>2014-05-01 15:12:26 -0700
commit65e025f99ce55f9679f009b5a6d3a9ca94ff561e (patch)
tree612a486a080ccd7b3e33bb618b524943e3679160 /src/mesa
parent6db640da221539dd7e564717665b664f6ee913b2 (diff)
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 <[email protected]> Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/intel_screen.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 4e1747f476f..0a82f1fa736 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");
}