iris: Not all gfx12+ have aux_map_ctx
authorJordan Justen <jordan.l.justen@intel.com>
Mon, 1 Feb 2021 21:23:10 +0000 (13:23 -0800)
committerJordan Justen <jordan.l.justen@intel.com>
Mon, 13 Dec 2021 21:30:48 +0000 (13:30 -0800)
This code matches other similar cases in iris.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14152>

src/gallium/drivers/iris/iris_resource.c

index a93d3db..8b90378 100644 (file)
@@ -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 =