nil: Only choose a PTE kind for tiled images
authorFaith Ekstrand <faith.ekstrand@collabora.com>
Tue, 31 Jan 2023 02:12:06 +0000 (20:12 -0600)
committerMarge Bot <emma+marge@anholt.net>
Fri, 4 Aug 2023 21:32:03 +0000 (21:32 +0000)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>

src/nouveau/nil/nil_image.c

index 2b03853..b674760 100644 (file)
@@ -436,8 +436,10 @@ nil_image_init(struct nv_device_info *dev,
    image->tile_mode = (uint16_t)image->levels[0].tiling.y_log2 << 4 |
                       (uint16_t)image->levels[0].tiling.z_log2 << 8;
 
-   image->pte_kind = nil_choose_pte_kind(dev, info->format, info->samples,
-                                         true /* TODO: compressed */);
+   if (!(info->usage & NIL_IMAGE_USAGE_LINEAR_BIT)) {
+      image->pte_kind = nil_choose_pte_kind(dev, info->format, info->samples,
+                                            true /* TODO: compressed */);
+   }
 
    image->align_B = MAX2(image->align_B, 4096);
    if (image->pte_kind >= 0xb && image->pte_kind <= 0xe)