fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 00:28:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965: use aligned malloc for context instead of ralloc

Browse source 
Fixes: 3175b63a ("mesa: don't allocate matrices with malloc")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4118
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8805>
(cherry picked from commit b609d4677d)

Conflicts:
	src/mesa/drivers/dri/i965/brw_performance_query.c
This commit is contained in:
Tapani Pälli 2021-02-02 11:33:23 +02:00 • committed by Dylan Baker
parent e2a27c1438
commit 76ba9da691
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4,7 +4,7 @@
"description": "i965: use aligned malloc for context instead of ralloc",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "3175b63a0dfa290430f9f7eb651387788933a02b"
},

11
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -924,7 +924,8 @@ brw_process_driconf_options(struct brw_context *brw)
if (*vendor_str)
ctx->Const.VendorOverride = vendor_str;
ctx->Const.dri_config_options_sha1 = ralloc_array(brw, unsigned char, 20);
ctx->Const.dri_config_options_sha1 =
ralloc_array(brw->mem_ctx, unsigned char, 20);
driComputeOptionsSha1(&brw->screen->optionCache,
ctx->Const.dri_config_options_sha1);
}
@ -968,13 +969,14 @@ brwCreateContext(gl_api api,
((ctx_config->attribute_mask & __DRIVER_CONTEXT_ATTRIB_RESET_STRATEGY) &&
ctx_config->reset_strategy != __DRI_CTX_RESET_NO_NOTIFICATION);
struct brw_context *brw = rzalloc(NULL, struct brw_context);
struct brw_context *brw = align_calloc(sizeof(struct brw_context), 16);
if (!brw) {
fprintf(stderr, "%s: failed to alloc context\n", __func__);
*dri_ctx_error = __DRI_CTX_ERROR_NO_MEMORY;
return false;
}
brw->perf_ctx = gen_perf_new_context(brw);
brw->mem_ctx = ralloc_context(NULL);
brw->perf_ctx = gen_perf_new_context(brw->mem_ctx);
driContextPriv->driverPrivate = brw;
brw->driContext = driContextPriv;
@ -1243,7 +1245,8 @@ intelDestroyContext(__DRIcontext * driContextPriv)
/* free the Mesa context */
_mesa_free_context_data(&brw->ctx, true);
ralloc_free(brw);
ralloc_free(brw->mem_ctx);
align_free(brw);
driContextPriv->driverPrivate = NULL;
}

1
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -1250,6 +1250,7 @@ struct brw_context
__DRIcontext *driContext;
struct intel_screen *screen;
void *mem_ctx;
};
/* brw_clear.c */

2
src/mesa/drivers/dri/i965/brw_performance_query.c
View file

@ -487,7 +487,7 @@ brw_init_perf_query_info(struct gl_context *ctx)
if (!oa_metrics_kernel_support(brw->screen->fd, devinfo))
return 0;
perf_cfg = gen_perf_new(ctx);
perf_cfg = gen_perf_new(brw->mem_ctx);
perf_cfg->vtbl.bo_alloc = brw_oa_bo_alloc;
perf_cfg->vtbl.bo_unreference = (bo_unreference_t)brw_bo_unreference;

4
src/mesa/drivers/dri/i965/intel_fbo.c
View file

@ -1132,8 +1132,8 @@ intel_fbo_init(struct brw_context *brw)
dd->EGLImageTargetRenderbufferStorage =
intel_image_target_renderbuffer_storage;
brw->render_cache = _mesa_hash_table_create(brw, _mesa_hash_pointer,
brw->render_cache = _mesa_hash_table_create(brw->mem_ctx, _mesa_hash_pointer,
_mesa_key_pointer_equal);
brw->depth_cache = _mesa_set_create(brw, _mesa_hash_pointer,
brw->depth_cache = _mesa_set_create(brw->mem_ctx, _mesa_hash_pointer,
_mesa_key_pointer_equal);
}