fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 08:40:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nvk/copy: Set the gob_kind for tiled copies on Blackwell+
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
This is needed on blackwell to deal with kind/bpp interactions.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35807>
This commit is contained in:
Faith Ekstrand 2025-06-27 17:23:52 -04:00 • committed by Marge Bot
parent a428835681
commit f6bdb8cd06
1 changed files with 47 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/nouveau/vulkan/nvk_cmd_copy.c
View file

@ -19,6 +19,7 @@
#include "nv_push_cl902d.h"
#include "nv_push_cl90b5.h"
#include "nv_push_clc1b5.h"
#include "nv_push_clc9b5.h"
static inline uint16_t
nvk_cmd_buffer_copy_cls(struct nvk_cmd_buffer *cmd)
@ -169,6 +170,19 @@ to_90b5_remap_num_comps(uint8_t num_comps)
return num_comps_90b5;
}
static uint32_t
nil_to_nvc9b5_gob_type(enum nil_gob_type gob_type)
{
switch (gob_type) {
case NIL_GOB_TYPE_TURING_COLOR2_D: return 0;
case NIL_GOB_TYPE_BLACKWELL8_BIT: return 1;
case NIL_GOB_TYPE_BLACKWELL16_BIT: return 2;
case NIL_GOB_TYPE_BLACKWELL_Z24: return 3;
default:
unreachable("Invalid GOB type on Blackwell+");
}
}
static void
nouveau_copy_rect(struct nvk_cmd_buffer *cmd, struct nouveau_copy *copy)
{
@ -242,12 +256,23 @@ nouveau_copy_rect(struct nvk_cmd_buffer *cmd, struct nouveau_copy *copy)
if (copy->src.tiling.gob_type != NIL_GOB_TYPE_LINEAR) {
P_MTHD(p, NV90B5, SET_SRC_BLOCK_SIZE);
assert(nil_gob_type_height(copy->src.tiling.gob_type) == 8);
P_NV90B5_SET_SRC_BLOCK_SIZE(p, {
.width = 0, /* Tiles are always 1 GOB wide */
.height = copy->src.tiling.y_log2,
.depth = copy->src.tiling.z_log2,
.gob_height = GOB_HEIGHT_GOB_HEIGHT_FERMI_8,
});
if (nvk_cmd_buffer_copy_cls(cmd) >= BLACKWELL_DMA_COPY_A) {
P_NVC9B5_SET_SRC_BLOCK_SIZE(p, {
.width = 0, /* Tiles are always 1 GOB wide */
.height = copy->src.tiling.y_log2,
.depth = copy->src.tiling.z_log2,
.gob_height = GOB_HEIGHT_GOB_HEIGHT_FERMI_8,
.gob_kind = nil_to_nvc9b5_gob_type(copy->src.tiling.gob_type),
});
} else {
P_NV90B5_SET_SRC_BLOCK_SIZE(p, {
.width = 0, /* Tiles are always 1 GOB wide */
.height = copy->src.tiling.y_log2,
.depth = copy->src.tiling.z_log2,
.gob_height = GOB_HEIGHT_GOB_HEIGHT_FERMI_8,
});
}
/* We use the stride for copies because the copy hardware has no
* concept of a tile width. Instead, we just set the width to the
* stride divided by bpp.
@ -282,12 +307,22 @@ nouveau_copy_rect(struct nvk_cmd_buffer *cmd, struct nouveau_copy *copy)
if (copy->dst.tiling.gob_type != NIL_GOB_TYPE_LINEAR) {
P_MTHD(p, NV90B5, SET_DST_BLOCK_SIZE);
assert(nil_gob_type_height(copy->dst.tiling.gob_type) == 8);
P_NV90B5_SET_DST_BLOCK_SIZE(p, {
.width = 0, /* Tiles are always 1 GOB wide */
.height = copy->dst.tiling.y_log2,
.depth = copy->dst.tiling.z_log2,
.gob_height = GOB_HEIGHT_GOB_HEIGHT_FERMI_8,
});
if (nvk_cmd_buffer_copy_cls(cmd) >= BLACKWELL_DMA_COPY_A) {
P_NVC9B5_SET_DST_BLOCK_SIZE(p, {
.width = 0, /* Tiles are always 1 GOB wide */
.height = copy->dst.tiling.y_log2,
.depth = copy->dst.tiling.z_log2,
.gob_height = GOB_HEIGHT_GOB_HEIGHT_FERMI_8,
.gob_kind = nil_to_nvc9b5_gob_type(copy->dst.tiling.gob_type),
});
} else {
P_NV90B5_SET_DST_BLOCK_SIZE(p, {
.width = 0, /* Tiles are always 1 GOB wide */
.height = copy->dst.tiling.y_log2,
.depth = copy->dst.tiling.z_log2,
.gob_height = GOB_HEIGHT_GOB_HEIGHT_FERMI_8,
});
}
/* We use the stride for copies because the copy hardware has no
* concept of a tile width. Instead, we just set the width to the
* stride divided by bpp.