crocus: Support building on non-Intel

Ditto.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Cc: mesa-stable
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25882>
(cherry picked from commit 2552ac360d25e6e5f52c0877228540aeb012c858)

diff --git a/.pick_status.json b/.pick_status.json
index c982fa1..75c0d25 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1194,7 +1194,7 @@
         "description": "crocus: Support building on non-Intel",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null

diff --git a/meson.build b/meson.build
index b3f0f73..19ec5c0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1468,10 +1468,6 @@ if get_option('intel-xe-kmd').enabled()
 endif
 
 
-if with_gallium_crocus and host_machine.cpu_family().startswith('x86') == false
-  error('Intel "crocus" Gallium driver requires x86 or x86_64 CPU family')
-endif
-
 if with_gallium_i915 and host_machine.cpu_family().startswith('x86') == false
   error('Intel "i915" Gallium driver requires x86 or x86_64 CPU family')
 endif

diff --git a/src/gallium/drivers/crocus/crocus_bufmgr.c b/src/gallium/drivers/crocus/crocus_bufmgr.c
index 6233370..e8b4220 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_bufmgr.c
+++ b/src/gallium/drivers/crocus/crocus_bufmgr.c
@@ -895,7 +895,9 @@ crocus_bo_map_cpu(struct util_debug_callback *dbg,
        * LLC entirely requiring us to keep dirty pixels for the scanout
        * out of any cache.)
        */
+#ifdef SUPPORT_INTEL_INTEGRATED_GPUS
       intel_invalidate_range(bo->map_cpu, bo->size);
+#endif
    }
 
    return bo->map_cpu;