From f94ff2cc0387430a25e56e8b91fc6129a29ec0fa Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Mon, 1 Feb 2021 13:23:10 -0800 Subject: [PATCH] iris: Not all gfx12+ have aux_map_ctx This code matches other similar cases in iris. Signed-off-by: Jordan Justen Reviewed-by: Kenneth Graunke Part-of: --- src/gallium/drivers/iris/iris_resource.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index a93d3db..8b90378 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -560,10 +560,11 @@ static void map_aux_addresses(struct iris_screen *screen, struct iris_resource *res, enum isl_format format, unsigned plane) { - const struct intel_device_info *devinfo = &screen->devinfo; - if (devinfo->ver >= 12 && isl_aux_usage_has_ccs(res->aux.usage)) { - void *aux_map_ctx = iris_bufmgr_get_aux_map_context(screen->bufmgr); - assert(aux_map_ctx); + void *aux_map_ctx = iris_bufmgr_get_aux_map_context(screen->bufmgr); + if (!aux_map_ctx) + return; + + if (isl_aux_usage_has_ccs(res->aux.usage)) { const unsigned aux_offset = res->aux.extra_aux.surf.size_B > 0 ? res->aux.extra_aux.offset : res->aux.offset; const uint64_t format_bits = -- 2.7.4