diff options
| author | Alyssa Rosenzweig <alyssa@rosenzweig.io> | 2023-10-25 08:38:10 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-10-30 15:47:13 +0000 |
| commit | b42d824822350bf5b1e7b169bdf2a470c9c5b831 (patch) | |
| tree | 3b378d77d34d7a6f2b8dfe4bf1e8d5139ec58c9f | |
| parent | eb6e3a2a89ac4a209de8583e0ba9752fba960417 (diff) | |
| download | mesa-b42d824822350bf5b1e7b169bdf2a470c9c5b831.tar.gz mesa-b42d824822350bf5b1e7b169bdf2a470c9c5b831.tar.bz2 mesa-b42d824822350bf5b1e7b169bdf2a470c9c5b831.zip | |
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)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/crocus/crocus_bufmgr.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/.pick_status.json b/.pick_status.json index c982fa1d2b8..75c0d2551a8 100644 --- 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 b3f0f7325d0..19ec5c022ac 100644 --- 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 62333703996..e8b4220be3f 100644 --- 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; |