<div dir="ltr"><div><div><div>Julien, </div>Mind if I ask what your use-case is? We've been talking about trying to remove tiled mapping from the driver and using blits instead. I don't want to suddenly drop someone off a performance cliff. </div>Thanks, </div>--Jason </div><div class="gmail_extra"> <div class="gmail_quote">On Tue, Nov 14, 2017 at 3:05 AM, Julien Isorce <<a href="mailto:julien.isorce@gmail.com" target="_blank">julien.isorce@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Already implemented for Gallium drivers. Useful for gbm_bo_(un)map. Tests: By porting wayland/weston/clients/simple-dmabuf-drm.c to GBM. kmscube --mode=rgba kmscube --mode=nv12-1img kmscube --mode=nv12-2img piglit ext_image_dma_buf_import-refcount -auto piglit ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 -auto piglit ext_image_dma_buf_import-sample_rgb -fmt=XR24 -alpha-one -auto piglit ext_image_dma_buf_import-sample_rgb -fmt=AR24 -auto piglit ext_image_dma_buf_import-sample_yuv -fmt=NV12 -auto piglit ext_image_dma_buf_import-sample_yuv -fmt=YU12 -auto piglit ext_image_dma_buf_import-sample_yuv -fmt=YV12 -auto v2: add early return if (flag & MAP_INTERNAL_MASK) v3: take input rect into account and test with kmscube and piglit. v4: handle wraparound and bo reference. v5: indent, exclude 0 width and height on the boundary, map bo independently of the image. Signed-off-by: Julien Isorce <<a href="mailto:jisorce@oblong.com">jisorce@oblong.com</a>> --- src/mesa/drivers/dri/i965/intel_screen.c | 65 +++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index cdc36ad..88bd982 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -755,6 +755,67 @@ intel_create_image(__DRIscreen *dri_screen, loaderPrivate); } +static void * +intel_map_image(__DRIcontext *context, __DRIimage *image, + int x0, int y0, int width, int height, + unsigned int flags, int *stride, void **map_info) +{ + struct brw_context *brw = NULL; + struct brw_bo *bo = NULL; + void *raw_data = NULL; + GLuint pix_w = 1; + GLuint pix_h = 1; + GLint pix_bytes = 1; + + if (!context || !image || !stride || !map_info || *map_info) + return NULL; + + if (x0 < 0 || x0 >= image->width || width > image->width - x0) + return NULL; + + if (y0 < 0 || y0 >= image->height || height > image->height - y0) + return NULL; + + if (flags & MAP_INTERNAL_MASK) + return NULL; + + brw = context->driverPrivate; + bo = image->bo; + + assert(brw); + assert(bo); + + /* DRI flags and GL_MAP.*_BIT flags are the same, so just pass them on. */ + raw_data = brw_bo_map(brw, bo, flags); + if (!raw_data) + return NULL; + + _mesa_get_format_block_size(image->format, &pix_w, &pix_h); + pix_bytes = _mesa_get_format_bytes(image->format); + + assert(pix_w); + assert(pix_h); + assert(pix_bytes > 0); + + raw_data += ((x0 / pix_w) * pix_bytes) + (y0 / pix_h) * image->pitch; + + brw_bo_reference(bo); + + *stride = image->pitch; + *map_info = bo; + + return raw_data; +} + +static void +intel_unmap_image(__DRIcontext *context, __DRIimage *image, void *map_info) +{ + struct brw_bo *bo = map_info; + + brw_bo_unmap(bo); + brw_bo_unreference(bo); +} + static __DRIimage * intel_create_image_with_modifiers(__DRIscreen *dri_screen, int width, int height, int format, @@ -1305,8 +1366,8 @@ static const __DRIimageExtension intelImageExtension = { .createImageFromDmaBufs = intel_create_image_from_dma_bufs, .blitImage = NULL, .getCapabilities = NULL, - .mapImage = NULL, - .unmapImage = NULL, + .mapImage = intel_map_image, + .unmapImage = intel_unmap_image, .createImageWithModifiers = intel_create_image_with_modifiers, .createImageFromDmaBufs2 = intel_create_image_from_dma_bufs2, .queryDmaBufFormats = intel_query_dma_buf_formats, -- 2.7.4 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>