From e3a9ca4563790f54976a969bf70cd5f45cbc4e13 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 25 Apr 2014 12:14:34 -0700 Subject: [PATCH] i965: Replace the region in DRIimage with just a BO pointer and stride. Regions aren't refcounted safely for multithreaded applications, and they're not terribly useful wrappers of a BO, so I'm trying to remove them. Even the stride I added here could probably be reduced to use of an existing field in the __DRIimageRec, but I want this to be as mechanical of a change as possible. Reviewed-by: Kenneth Graunke Reviewed-by: Chad Versace --- src/mesa/drivers/dri/i965/brw_context.c | 11 +- src/mesa/drivers/dri/i965/intel_fbo.c | 12 +- src/mesa/drivers/dri/i965/intel_regions.c | 65 ---------- src/mesa/drivers/dri/i965/intel_regions.h | 16 +-- src/mesa/drivers/dri/i965/intel_screen.c | 137 ++++++++++---------- src/mesa/drivers/dri/i965/intel_tex_image.c | 4 +- 6 files changed, 83 insertions(+), 162 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 567ecfd8202..3ce9ff6f187 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -1330,10 +1330,9 @@ intel_update_image_buffer(struct brw_context *intel, __DRIimage *buffer, enum __DRIimageBufferMask buffer_type) { - struct intel_region *region = buffer->region; struct gl_framebuffer *fb = drawable->driverPrivate; - if (!rb || !region) + if (!rb || !buffer->bo) return; unsigned num_samples = rb->Base.Base.NumSamples; @@ -1347,12 +1346,12 @@ intel_update_image_buffer(struct brw_context *intel, else last_mt = rb->singlesample_mt; - if (last_mt && last_mt->region->bo == region->bo) + if (last_mt && last_mt->region->bo == buffer->bo) return; - intel_update_winsys_renderbuffer_miptree(intel, rb, region->bo, - region->width, region->height, - region->pitch); + intel_update_winsys_renderbuffer_miptree(intel, rb, buffer->bo, + buffer->width, buffer->height, + buffer->pitch); if (brw_is_front_buffer_drawing(fb) && buffer_type == __DRI_IMAGE_BUFFER_FRONT && diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index 408beb98b5f..477e126eebf 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/src/mesa/drivers/dri/i965/intel_fbo.c @@ -384,18 +384,18 @@ intel_image_target_renderbuffer_storage(struct gl_context *ctx, irb = intel_renderbuffer(rb); intel_miptree_release(&irb->mt); irb->mt = intel_miptree_create_for_bo(brw, - image->region->bo, + image->bo, image->format, image->offset, - image->region->width, - image->region->height, - image->region->pitch); + image->width, + image->height, + image->pitch); if (!irb->mt) return; rb->InternalFormat = image->internal_format; - rb->Width = image->region->width; - rb->Height = image->region->height; + rb->Width = image->width; + rb->Height = image->height; rb->Format = image->format; rb->_BaseFormat = _mesa_base_fbo_format(ctx, image->internal_format); rb->NeedsFinishRenderTexture = true; diff --git a/src/mesa/drivers/dri/i965/intel_regions.c b/src/mesa/drivers/dri/i965/intel_regions.c index 311dc2ce900..8e693fdb944 100644 --- a/src/mesa/drivers/dri/i965/intel_regions.c +++ b/src/mesa/drivers/dri/i965/intel_regions.c @@ -158,71 +158,6 @@ intel_region_alloc(struct intel_screen *screen, return region; } -struct intel_region * -intel_region_alloc_for_handle(struct intel_screen *screen, - GLuint cpp, - GLuint width, GLuint height, GLuint pitch, - GLuint handle, const char *name) -{ - struct intel_region *region; - drm_intel_bo *buffer; - int ret; - uint32_t bit_6_swizzle, tiling; - - buffer = intel_bo_gem_create_from_name(screen->bufmgr, name, handle); - if (buffer == NULL) - return NULL; - ret = drm_intel_bo_get_tiling(buffer, &tiling, &bit_6_swizzle); - if (ret != 0) { - fprintf(stderr, "Couldn't get tiling of buffer %d (%s): %s\n", - handle, name, strerror(-ret)); - drm_intel_bo_unreference(buffer); - return NULL; - } - - region = intel_region_alloc_internal(screen, cpp, - width, height, pitch, tiling, buffer); - if (region == NULL) { - drm_intel_bo_unreference(buffer); - return NULL; - } - - return region; -} - -struct intel_region * -intel_region_alloc_for_fd(struct intel_screen *screen, - GLuint cpp, - GLuint width, GLuint height, GLuint pitch, - GLuint size, - int fd, const char *name) -{ - struct intel_region *region; - drm_intel_bo *buffer; - int ret; - uint32_t bit_6_swizzle, tiling; - - buffer = drm_intel_bo_gem_create_from_prime(screen->bufmgr, fd, size); - if (buffer == NULL) - return NULL; - ret = drm_intel_bo_get_tiling(buffer, &tiling, &bit_6_swizzle); - if (ret != 0) { - fprintf(stderr, "Couldn't get tiling of buffer (%s): %s\n", - name, strerror(-ret)); - drm_intel_bo_unreference(buffer); - return NULL; - } - - region = intel_region_alloc_internal(screen, cpp, - width, height, pitch, tiling, buffer); - if (region == NULL) { - drm_intel_bo_unreference(buffer); - return NULL; - } - - return region; -} - void intel_region_reference(struct intel_region **dst, struct intel_region *src) { diff --git a/src/mesa/drivers/dri/i965/intel_regions.h b/src/mesa/drivers/dri/i965/intel_regions.h index 0ad95a79ce5..13ed03ce584 100644 --- a/src/mesa/drivers/dri/i965/intel_regions.h +++ b/src/mesa/drivers/dri/i965/intel_regions.h @@ -80,19 +80,6 @@ struct intel_region *intel_region_alloc(struct intel_screen *screen, GLuint height, bool expect_accelerated_upload); -struct intel_region * -intel_region_alloc_for_handle(struct intel_screen *screen, - GLuint cpp, - GLuint width, GLuint height, GLuint pitch, - unsigned int handle, const char *name); - -struct intel_region * -intel_region_alloc_for_fd(struct intel_screen *screen, - GLuint cpp, - GLuint width, GLuint height, GLuint pitch, - GLuint size, - int fd, const char *name); - void intel_region_reference(struct intel_region **dst, struct intel_region *src); @@ -116,7 +103,8 @@ struct intel_image_format { }; struct __DRIimageRec { - struct intel_region *region; + drm_intel_bo *bo; + uint32_t pitch; /**< in bytes */ GLenum internal_format; uint32_t dri_format; GLuint format; diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 976af029d9f..da96540a736 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -272,6 +272,18 @@ static struct intel_image_format intel_image_formats[] = { { 0, 1, 0, __DRI_IMAGE_FORMAT_ARGB8888, 4 } } } }; +static void +intel_image_warn_if_unaligned(__DRIimage *image, const char *func) +{ + uint32_t tiling, swizzle; + drm_intel_bo_get_tiling(image->bo, &tiling, &swizzle); + + if (tiling != I915_TILING_NONE && (image->offset & 0xfff)) { + _mesa_warning(NULL, "%s: offset 0x%08x not on tile boundary", + func, image->offset); + } +} + static struct intel_image_format * intel_image_format_lookup(int fourcc) { @@ -313,7 +325,7 @@ intel_allocate_image(int dri_format, void *loaderPrivate) } /** - * Sets up a DRIImage structure to point to our shared image in a region + * Sets up a DRIImage structure to point to a slice out of a miptree. */ static void intel_setup_image_from_mipmap_tree(struct brw_context *brw, __DRIimage *image, @@ -326,22 +338,15 @@ intel_setup_image_from_mipmap_tree(struct brw_context *brw, __DRIimage *image, image->width = minify(mt->physical_width0, level - mt->first_level); image->height = minify(mt->physical_height0, level - mt->first_level); + image->pitch = mt->region->pitch; image->offset = intel_miptree_get_tile_offsets(mt, level, zoffset, &image->tile_x, &image->tile_y); - intel_region_reference(&image->region, mt->region); -} - -static void -intel_setup_image_from_dimensions(__DRIimage *image) -{ - image->width = image->region->width; - image->height = image->region->height; - image->tile_x = 0; - image->tile_y = 0; - image->has_depthstencil = false; + drm_intel_bo_unreference(image->bo); + image->bo = mt->region->bo; + drm_intel_bo_reference(mt->region->bo); } static __DRIimage * @@ -361,16 +366,17 @@ intel_create_image_from_name(__DRIscreen *screen, cpp = 1; else cpp = _mesa_get_format_bytes(image->format); - image->region = intel_region_alloc_for_handle(intelScreen, - cpp, width, height, - pitch * cpp, name, "image"); - if (image->region == NULL) { + + image->width = width; + image->height = height; + image->pitch = pitch * cpp; + image->bo = drm_intel_bo_gem_create_from_name(intelScreen->bufmgr, "image", + name); + if (!image->bo) { free(image); return NULL; } - intel_setup_image_from_dimensions(image); - return image; } @@ -400,8 +406,12 @@ intel_create_image_from_renderbuffer(__DRIcontext *context, image->format = rb->Format; image->offset = 0; image->data = loaderPrivate; - intel_region_reference(&image->region, irb->mt->region); - intel_setup_image_from_dimensions(image); + drm_intel_bo_unreference(image->bo); + image->bo = irb->mt->region->bo; + drm_intel_bo_reference(irb->mt->region->bo); + image->width = irb->mt->region->width; + image->height = irb->mt->region->height; + image->pitch = irb->mt->region->pitch; image->dri_format = driGLFormatToImageFormat(image->format); image->has_depthstencil = irb->mt->stencil_mt? true : false; @@ -472,8 +482,8 @@ intel_create_image_from_texture(__DRIcontext *context, int target, static void intel_destroy_image(__DRIimage *image) { - intel_region_release(&image->region); - free(image); + drm_intel_bo_unreference(image->bo); + free(image); } static __DRIimage * @@ -486,6 +496,7 @@ intel_create_image(__DRIscreen *screen, struct intel_screen *intelScreen = screen->driverPrivate; uint32_t tiling; int cpp; + unsigned long pitch; tiling = I915_TILING_X; if (use & __DRI_IMAGE_USE_CURSOR) { @@ -501,15 +512,18 @@ intel_create_image(__DRIscreen *screen, if (image == NULL) return NULL; + cpp = _mesa_get_format_bytes(image->format); - image->region = - intel_region_alloc(intelScreen, tiling, cpp, width, height, true); - if (image->region == NULL) { + image->bo = drm_intel_bo_alloc_tiled(intelScreen->bufmgr, "image", + width, height, cpp, &tiling, + &pitch, 0); + if (image->bo == NULL) { free(image); return NULL; } - - intel_setup_image_from_dimensions(image); + image->width = width; + image->height = height; + image->pitch = pitch; return image; } @@ -519,21 +533,21 @@ intel_query_image(__DRIimage *image, int attrib, int *value) { switch (attrib) { case __DRI_IMAGE_ATTRIB_STRIDE: - *value = image->region->pitch; + *value = image->pitch; return true; case __DRI_IMAGE_ATTRIB_HANDLE: - *value = image->region->bo->handle; + *value = image->bo->handle; return true; case __DRI_IMAGE_ATTRIB_NAME: - return !drm_intel_bo_flink(image->region->bo, (uint32_t *) value); + return !drm_intel_bo_flink(image->bo, (uint32_t *) value); case __DRI_IMAGE_ATTRIB_FORMAT: *value = image->dri_format; return true; case __DRI_IMAGE_ATTRIB_WIDTH: - *value = image->region->width; + *value = image->width; return true; case __DRI_IMAGE_ATTRIB_HEIGHT: - *value = image->region->height; + *value = image->height; return true; case __DRI_IMAGE_ATTRIB_COMPONENTS: if (image->planar_format == NULL) @@ -541,7 +555,7 @@ intel_query_image(__DRIimage *image, int attrib, int *value) *value = image->planar_format->components; return true; case __DRI_IMAGE_ATTRIB_FD: - if (drm_intel_bo_gem_export_to_prime(image->region->bo, value) == 0) + if (drm_intel_bo_gem_export_to_prime(image->bo, value) == 0) return true; return false; default: @@ -558,12 +572,8 @@ intel_dup_image(__DRIimage *orig_image, void *loaderPrivate) if (image == NULL) return NULL; - intel_region_reference(&image->region, orig_image->region); - if (image->region == NULL) { - free(image); - return NULL; - } - + drm_intel_bo_reference(orig_image->bo); + image->bo = orig_image->bo; image->internal_format = orig_image->internal_format; image->planar_format = orig_image->planar_format; image->dri_format = orig_image->dri_format; @@ -571,6 +581,7 @@ intel_dup_image(__DRIimage *orig_image, void *loaderPrivate) image->offset = orig_image->offset; image->width = orig_image->width; image->height = orig_image->height; + image->pitch = orig_image->pitch; image->tile_x = orig_image->tile_x; image->tile_y = orig_image->tile_y; image->has_depthstencil = orig_image->has_depthstencil; @@ -586,7 +597,7 @@ static GLboolean intel_validate_usage(__DRIimage *image, unsigned int use) { if (use & __DRI_IMAGE_USE_CURSOR) { - if (image->region->width != 64 || image->region->height != 64) + if (image->width != 64 || image->height != 64) return GL_FALSE; } @@ -655,13 +666,16 @@ intel_create_image_from_fds(__DRIscreen *screen, if (image == NULL) return NULL; - image->region = intel_region_alloc_for_fd(intelScreen, - f->planes[0].cpp, width, height, strides[0], - height * strides[0], fds[0], "image"); - if (image->region == NULL) { + image->bo = drm_intel_bo_gem_create_from_prime(intelScreen->bufmgr, + fds[0], + height * strides[0]); + if (image->bo == NULL) { free(image); return NULL; } + image->width = width; + image->height = height; + image->pitch = strides[0]; image->planar_format = f; for (i = 0; i < f->nplanes; i++) { @@ -672,13 +686,9 @@ intel_create_image_from_fds(__DRIscreen *screen, if (f->nplanes == 1) { image->offset = image->offsets[0]; - if (image->region->tiling != I915_TILING_NONE && (image->offset & 0xfff)) - _mesa_warning(NULL, - "intel_create_image_from_fds: offset not on tile boundary"); + intel_image_warn_if_unaligned(image, __FUNCTION__); } - intel_setup_image_from_dimensions(image); - return image; } @@ -742,8 +752,8 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate) if (plane >= f->nplanes) return NULL; - width = parent->region->width >> f->planes[plane].width_shift; - height = parent->region->height >> f->planes[plane].height_shift; + width = parent->width >> f->planes[plane].width_shift; + height = parent->height >> f->planes[plane].height_shift; dri_format = f->planes[plane].dri_format; index = f->planes[plane].buffer_index; offset = parent->offsets[index]; @@ -753,32 +763,21 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate) if (image == NULL) return NULL; - if (offset + height * stride > parent->region->bo->size) { + if (offset + height * stride > parent->bo->size) { _mesa_warning(NULL, "intel_create_sub_image: subimage out of bounds"); free(image); return NULL; } - image->region = calloc(sizeof(*image->region), 1); - if (image->region == NULL) { - free(image); - return NULL; - } + image->bo = parent->bo; + drm_intel_bo_reference(parent->bo); - image->region->cpp = _mesa_get_format_bytes(image->format); - image->region->width = width; - image->region->height = height; - image->region->pitch = stride; - image->region->refcount = 1; - image->region->bo = parent->region->bo; - drm_intel_bo_reference(image->region->bo); - image->region->tiling = parent->region->tiling; + image->width = width; + image->height = height; + image->pitch = stride; image->offset = offset; - intel_setup_image_from_dimensions(image); - if (offset & 0xfff) - _mesa_warning(NULL, - "intel_create_sub_image: offset not on tile boundary"); + intel_image_warn_if_unaligned(image, __FUNCTION__); return image; } diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c index b7fab39c3f4..9e8b36ef8f0 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_image.c +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c @@ -403,11 +403,11 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target, return; } - intel_set_texture_image_bo(ctx, texImage, image->region->bo, + intel_set_texture_image_bo(ctx, texImage, image->bo, target, image->internal_format, image->format, image->offset, image->width, image->height, - image->region->pitch, + image->pitch, image->tile_x, image->tile_y); } -- 2.30.2