From 8b8af19065a5bfd06fd0d97b891cfff807704935 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 3 May 2017 09:38:13 +0100 Subject: [PATCH] i965: Set modifier for imported and duplicated images When a buffer is being created from FD or GEM flink import, the current API makes no provision for passing modifier information along with this. Set the modifier for such images to DRM_FORMAT_MOD_INVALID. Also preserve the modifier when duplicating an image, as will be done by GBM when importing from a wl_buffer. This doubly tripped up Wayland, as the images would first have been created (as wl_buffers) with a 0 modifier, and then lost what modifier they would've had when being duplicated into gbm_bos. Fixes: d78a36ea624 ("i965/dri: Handle the linear fb modifier") Signed-off-by: Daniel Stone Reviewed-by: Emil Velikov --- src/mesa/drivers/dri/i965/intel_screen.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 30b20b38881..00ab3071686 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -313,6 +313,20 @@ modifier_to_tiling(uint64_t modifier) unreachable(); } +static uint64_t +tiling_to_modifier(uint32_t tiling) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(tiling_modifier_map); i++) { + if (tiling_modifier_map[i].tiling == tiling) + return tiling_modifier_map[i].modifier; + } + + assert(0 && "tiling_to_modifier received unknown tiling mode"); + unreachable(); +} + static void intel_image_warn_if_unaligned(__DRIimage *image, const char *func) { @@ -430,6 +444,7 @@ intel_create_image_from_name(__DRIscreen *dri_screen, free(image); return NULL; } + image->modifier = tiling_to_modifier(image->bo->tiling_mode); return image; } @@ -458,6 +473,7 @@ intel_create_image_from_renderbuffer(__DRIcontext *context, image->internal_format = rb->InternalFormat; image->format = rb->Format; + image->modifier = tiling_to_modifier(irb->mt->tiling); image->offset = 0; image->data = loaderPrivate; brw_bo_unreference(image->bo); @@ -519,6 +535,7 @@ intel_create_image_from_texture(__DRIcontext *context, int target, image->internal_format = obj->Image[face][level]->InternalFormat; image->format = obj->Image[face][level]->TexFormat; + image->modifier = tiling_to_modifier(iobj->mt->tiling); image->data = loaderPrivate; intel_setup_image_from_mipmap_tree(brw, image, iobj->mt, level, zoffset); image->dri_format = driGLFormatToImageFormat(image->format); @@ -727,6 +744,7 @@ intel_dup_image(__DRIimage *orig_image, void *loaderPrivate) image->planar_format = orig_image->planar_format; image->dri_format = orig_image->dri_format; image->format = orig_image->format; + image->modifier = orig_image->modifier; image->offset = orig_image->offset; image->width = orig_image->width; image->height = orig_image->height; @@ -845,6 +863,7 @@ intel_create_image_from_fds(__DRIscreen *dri_screen, free(image); return NULL; } + image->modifier = tiling_to_modifier(image->bo->tiling_mode); if (f->nplanes == 1) { image->offset = image->offsets[0]; @@ -932,6 +951,7 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate) image->bo = parent->bo; brw_bo_reference(parent->bo); + image->modifier = parent->modifier; image->width = width; image->height = height; -- 2.30.2