anv, iris: Make use of devinfo::has_caching_uapi

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19911>

src/gallium/drivers/iris/iris_bufmgr.c

@@ -234,6 +234,7 @@ struct iris_bufmgr {
    bool has_llc:1;
    bool has_local_mem:1;
    bool has_mmap_offset:1;
+   bool has_caching_uapi:1;
    bool has_tiling_uapi:1;
    bool has_userptr_probe:1;
    bool bo_reuse:1;
@@ -1159,7 +1160,7 @@ iris_bo_alloc(struct iris_bufmgr *bufmgr,
     * For discrete, we instead use SMEM and avoid WB maps for coherency.
     */
    if ((flags & BO_ALLOC_COHERENT) &&
-       !bufmgr->has_llc && bufmgr->vram.size == 0) {
+       !bufmgr->has_llc && bufmgr->has_caching_uapi) {
       struct drm_i915_gem_caching arg = {
          .handle = bo->gem_handle,
          .caching = 1,
@@ -2406,6 +2407,7 @@ iris_bufmgr_create(struct intel_device_info *devinfo, int fd, bool bo_reuse)
 
    bufmgr->has_llc = devinfo->has_llc;
    bufmgr->has_local_mem = devinfo->has_local_mem;
+   bufmgr->has_caching_uapi = devinfo->has_caching_uapi;
    bufmgr->has_tiling_uapi = devinfo->has_tiling_uapi;
    bufmgr->bo_reuse = bo_reuse;
    bufmgr->has_mmap_offset = devinfo->has_mmap_offset;

src/intel/vulkan/anv_allocator.c

@@ -1527,7 +1527,7 @@ anv_device_alloc_bo(struct anv_device *device,
        * I915_CACHING_CACHED, which on non-LLC means snooped so there's no
        * need to do this there.
        */
-      if (!device->info->has_llc) {
+      if (device->info->has_caching_uapi && !device->info->has_llc) {
          anv_gem_set_caching(device, new_bo.gem_handle,
                              I915_CACHING_CACHED);
       }