From e1d7861dd69651eba41aa5875c3781a51527a3bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
Date: Mon, 19 Jun 2023 11:20:38 +0300
Subject: [PATCH] isl: handle DRM_FORMAT_MOD_INVALID in
 isl_drm_modifier_has_aux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes crashes with piglit.spec.ext_external_objects.* tests on TGL
that started to trigger with commit 8bc7bcfa0c19.

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/23718>
---
 src/intel/isl/isl.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index a2eb0c6880f..3a754874f29 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -42,6 +42,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "drm-uapi/drm_fourcc.h"
 #include "util/compiler.h"
 #include "util/macros.h"
 #include "util/format/u_format.h"
@@ -2246,6 +2247,9 @@ isl_drm_modifier_get_info(uint64_t modifier);
 static inline bool
 isl_drm_modifier_has_aux(uint64_t modifier)
 {
+   if (modifier == DRM_FORMAT_MOD_INVALID)
+      return false;
+
    return isl_drm_modifier_get_info(modifier)->aux_usage != ISL_AUX_USAGE_NONE;
 }