On Saturday, July 1, 2017 3:14:00 AM PDT Chris Wilson wrote:
> With the conversion to storing the result of drm_mmap to a local and not
> directly to bo->map_gtt itself, we no longer should clear bo->map_gtt.
> In the best the operation is redundant as we know bo->map_gtt to already
> be NULL, but in the worst case we overwrite a concurrent thread that
> successfully mmaped the GTT.
>
> Fixes: 314647c4c206 ("i965: Drop global bufmgr lock from brw_bo_map_*
> functions.")
> Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
> Cc: Kenneth Graunke <kenn...@whitecape.org>
> Cc: Matt Turner <matts...@gmail.com>
> ---
> src/mesa/drivers/dri/i965/brw_bufmgr.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c
> b/src/mesa/drivers/dri/i965/brw_bufmgr.c
> index 8ed6ba5f41..d05885cfaf 100644
> --- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
> +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c
> @@ -747,7 +747,6 @@ brw_bo_map_gtt(struct brw_context *brw, struct brw_bo
> *bo, unsigned flags)
> map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
> MAP_SHARED, bufmgr->fd, mmap_arg.offset);
> if (map == MAP_FAILED) {
> - bo->map_gtt = NULL;
> DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
> __FILE__, __LINE__, bo->gem_handle, bo->name, strerror(errno));
> return NULL;
> Thanks, sorry for botching this. I tested this and pushed the patch. --Ken
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
