radv: refactor depth/stencil state setup
[mesa.git] / src / amd / vulkan / radv_device.c
index 1484003639e49e497c9dc428efbc2c86404b004b..35489f0c9c69d251d4d2500453f5937f35c692c9 100644 (file)
@@ -208,6 +208,32 @@ is_extension_enabled(const VkExtensionProperties *extensions,
        return false;
 }
 
+static const char *
+get_chip_name(enum radeon_family family)
+{
+       switch (family) {
+       case CHIP_TAHITI: return "AMD RADV TAHITI";
+       case CHIP_PITCAIRN: return "AMD RADV PITCAIRN";
+       case CHIP_VERDE: return "AMD RADV CAPE VERDE";
+       case CHIP_OLAND: return "AMD RADV OLAND";
+       case CHIP_HAINAN: return "AMD RADV HAINAN";
+       case CHIP_BONAIRE: return "AMD RADV BONAIRE";
+       case CHIP_KAVERI: return "AMD RADV KAVERI";
+       case CHIP_KABINI: return "AMD RADV KABINI";
+       case CHIP_HAWAII: return "AMD RADV HAWAII";
+       case CHIP_MULLINS: return "AMD RADV MULLINS";
+       case CHIP_TONGA: return "AMD RADV TONGA";
+       case CHIP_ICELAND: return "AMD RADV ICELAND";
+       case CHIP_CARRIZO: return "AMD RADV CARRIZO";
+       case CHIP_FIJI: return "AMD RADV FIJI";
+       case CHIP_POLARIS10: return "AMD RADV POLARIS10";
+       case CHIP_POLARIS11: return "AMD RADV POLARIS11";
+       case CHIP_POLARIS12: return "AMD RADV POLARIS12";
+       case CHIP_STONEY: return "AMD RADV STONEY";
+       default: return "AMD RADV unknown";
+       }
+}
+
 static VkResult
 radv_physical_device_init(struct radv_physical_device *device,
                          struct radv_instance *instance,
@@ -271,7 +297,7 @@ radv_physical_device_init(struct radv_physical_device *device,
                goto fail;
 
        fprintf(stderr, "WARNING: radv is not a conformant vulkan implementation, testing use only.\n");
-       device->name = device->rad_info.name;
+       device->name = get_chip_name(device->rad_info.family);
 
        radv_get_device_uuid(drm_device, device->device_uuid);
 
@@ -743,7 +769,7 @@ static void radv_get_physical_device_queue_family_properties(
 {
        int num_queue_families = 1;
        int idx;
-       if (pdevice->rad_info.compute_rings > 0 &&
+       if (pdevice->rad_info.num_compute_rings > 0 &&
            pdevice->rad_info.chip_class >= CIK &&
            !(pdevice->instance->debug_flags & RADV_DEBUG_NO_COMPUTE_QUEUE))
                num_queue_families++;
@@ -770,7 +796,7 @@ static void radv_get_physical_device_queue_family_properties(
                idx++;
        }
 
-       if (pdevice->rad_info.compute_rings > 0 &&
+       if (pdevice->rad_info.num_compute_rings > 0 &&
            pdevice->rad_info.chip_class >= CIK &&
            !(pdevice->instance->debug_flags & RADV_DEBUG_NO_COMPUTE_QUEUE)) {
                if (*pCount > idx) {
@@ -778,7 +804,7 @@ static void radv_get_physical_device_queue_family_properties(
                                .queueFlags = VK_QUEUE_COMPUTE_BIT |
                                              VK_QUEUE_TRANSFER_BIT |
                                              VK_QUEUE_SPARSE_BINDING_BIT,
-                               .queueCount = pdevice->rad_info.compute_rings,
+                               .queueCount = pdevice->rad_info.num_compute_rings,
                                .timestampValidBits = 64,
                                .minImageTransferGranularity = (VkExtent3D) { 1, 1, 1 },
                        };
@@ -862,11 +888,11 @@ void radv_GetPhysicalDeviceMemoryProperties(
        pMemoryProperties->memoryHeapCount = RADV_MEM_HEAP_COUNT;
        pMemoryProperties->memoryHeaps[RADV_MEM_HEAP_VRAM] = (VkMemoryHeap) {
                .size = physical_device->rad_info.vram_size -
-                               physical_device->rad_info.visible_vram_size,
+                               physical_device->rad_info.vram_vis_size,
                .flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT,
        };
        pMemoryProperties->memoryHeaps[RADV_MEM_HEAP_VRAM_CPU_ACCESS] = (VkMemoryHeap) {
-               .size = physical_device->rad_info.visible_vram_size,
+               .size = physical_device->rad_info.vram_vis_size,
                .flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT,
        };
        pMemoryProperties->memoryHeaps[RADV_MEM_HEAP_GTT] = (VkMemoryHeap) {
@@ -2803,9 +2829,8 @@ radv_initialise_ds_surface(struct radv_device *device,
                           struct radv_image_view *iview)
 {
        unsigned level = iview->base_mip;
-       unsigned format;
+       unsigned format, stencil_format;
        uint64_t va, s_offs, z_offs;
-       const struct legacy_surf_level *level_info = &iview->image->surface.u.legacy.level[level];
        bool stencil_only = false;
        memset(ds, 0, sizeof(*ds));
        switch (iview->vk_format) {
@@ -2827,83 +2852,89 @@ radv_initialise_ds_surface(struct radv_device *device,
                break;
        case VK_FORMAT_S8_UINT:
                stencil_only = true;
-               level_info = &iview->image->surface.u.legacy.stencil_level[level];
                break;
        default:
                break;
        }
 
        format = radv_translate_dbformat(iview->vk_format);
-
-       va = device->ws->buffer_get_va(iview->bo) + iview->image->offset;
-       s_offs = z_offs = va;
-       z_offs += iview->image->surface.u.legacy.level[level].offset;
-       s_offs += iview->image->surface.u.legacy.stencil_level[level].offset;
+       stencil_format = iview->image->surface.flags & RADEON_SURF_SBUFFER ?
+               V_028044_STENCIL_8 : V_028044_STENCIL_INVALID;
 
        uint32_t max_slice = radv_surface_layer_count(iview);
        ds->db_depth_view = S_028008_SLICE_START(iview->base_layer) |
                S_028008_SLICE_MAX(iview->base_layer + max_slice - 1);
-       ds->db_depth_info = S_02803C_ADDR5_SWIZZLE_MASK(1);
-       ds->db_z_info = S_028040_FORMAT(format) | S_028040_ZRANGE_PRECISION(1);
 
-       if (iview->image->info.samples > 1)
-               ds->db_z_info |= S_028040_NUM_SAMPLES(util_logbase2(iview->image->info.samples));
+       ds->db_htile_data_base = 0;
+       ds->db_htile_surface = 0;
 
-       if (iview->image->surface.flags & RADEON_SURF_SBUFFER)
-               ds->db_stencil_info = S_028044_FORMAT(V_028044_STENCIL_8);
-       else
-               ds->db_stencil_info = S_028044_FORMAT(V_028044_STENCIL_INVALID);
+       va = device->ws->buffer_get_va(iview->bo) + iview->image->offset;
+       s_offs = z_offs = va;
 
-       if (device->physical_device->rad_info.chip_class >= CIK) {
-               struct radeon_info *info = &device->physical_device->rad_info;
-               unsigned tiling_index = iview->image->surface.u.legacy.tiling_index[level];
-               unsigned stencil_index = iview->image->surface.u.legacy.stencil_tiling_index[level];
-               unsigned macro_index = iview->image->surface.u.legacy.macro_tile_index;
-               unsigned tile_mode = info->si_tile_mode_array[tiling_index];
-               unsigned stencil_tile_mode = info->si_tile_mode_array[stencil_index];
-               unsigned macro_mode = info->cik_macrotile_mode_array[macro_index];
+       {
+               const struct legacy_surf_level *level_info = &iview->image->surface.u.legacy.level[level];
 
                if (stencil_only)
-                       tile_mode = stencil_tile_mode;
-
-               ds->db_depth_info |=
-                       S_02803C_ARRAY_MODE(G_009910_ARRAY_MODE(tile_mode)) |
-                       S_02803C_PIPE_CONFIG(G_009910_PIPE_CONFIG(tile_mode)) |
-                       S_02803C_BANK_WIDTH(G_009990_BANK_WIDTH(macro_mode)) |
-                       S_02803C_BANK_HEIGHT(G_009990_BANK_HEIGHT(macro_mode)) |
-                       S_02803C_MACRO_TILE_ASPECT(G_009990_MACRO_TILE_ASPECT(macro_mode)) |
-                       S_02803C_NUM_BANKS(G_009990_NUM_BANKS(macro_mode));
-               ds->db_z_info |= S_028040_TILE_SPLIT(G_009910_TILE_SPLIT(tile_mode));
-               ds->db_stencil_info |= S_028044_TILE_SPLIT(G_009910_TILE_SPLIT(stencil_tile_mode));
-       } else {
-               unsigned tile_mode_index = si_tile_mode_index(iview->image, level, false);
-               ds->db_z_info |= S_028040_TILE_MODE_INDEX(tile_mode_index);
-               tile_mode_index = si_tile_mode_index(iview->image, level, true);
-               ds->db_stencil_info |= S_028044_TILE_MODE_INDEX(tile_mode_index);
-       }
+                       level_info = &iview->image->surface.u.legacy.stencil_level[level];
+
+               z_offs += iview->image->surface.u.legacy.level[level].offset;
+               s_offs += iview->image->surface.u.legacy.stencil_level[level].offset;
+
+               ds->db_depth_info = S_02803C_ADDR5_SWIZZLE_MASK(1);
+               ds->db_z_info = S_028040_FORMAT(format) | S_028040_ZRANGE_PRECISION(1);
+               ds->db_stencil_info = S_028044_FORMAT(stencil_format);
+
+               if (iview->image->info.samples > 1)
+                       ds->db_z_info |= S_028040_NUM_SAMPLES(util_logbase2(iview->image->info.samples));
+
+               if (device->physical_device->rad_info.chip_class >= CIK) {
+                       struct radeon_info *info = &device->physical_device->rad_info;
+                       unsigned tiling_index = iview->image->surface.u.legacy.tiling_index[level];
+                       unsigned stencil_index = iview->image->surface.u.legacy.stencil_tiling_index[level];
+                       unsigned macro_index = iview->image->surface.u.legacy.macro_tile_index;
+                       unsigned tile_mode = info->si_tile_mode_array[tiling_index];
+                       unsigned stencil_tile_mode = info->si_tile_mode_array[stencil_index];
+                       unsigned macro_mode = info->cik_macrotile_mode_array[macro_index];
+
+                       if (stencil_only)
+                               tile_mode = stencil_tile_mode;
+
+                       ds->db_depth_info |=
+                               S_02803C_ARRAY_MODE(G_009910_ARRAY_MODE(tile_mode)) |
+                               S_02803C_PIPE_CONFIG(G_009910_PIPE_CONFIG(tile_mode)) |
+                               S_02803C_BANK_WIDTH(G_009990_BANK_WIDTH(macro_mode)) |
+                               S_02803C_BANK_HEIGHT(G_009990_BANK_HEIGHT(macro_mode)) |
+                               S_02803C_MACRO_TILE_ASPECT(G_009990_MACRO_TILE_ASPECT(macro_mode)) |
+                               S_02803C_NUM_BANKS(G_009990_NUM_BANKS(macro_mode));
+                       ds->db_z_info |= S_028040_TILE_SPLIT(G_009910_TILE_SPLIT(tile_mode));
+                       ds->db_stencil_info |= S_028044_TILE_SPLIT(G_009910_TILE_SPLIT(stencil_tile_mode));
+               } else {
+                       unsigned tile_mode_index = si_tile_mode_index(iview->image, level, false);
+                       ds->db_z_info |= S_028040_TILE_MODE_INDEX(tile_mode_index);
+                       tile_mode_index = si_tile_mode_index(iview->image, level, true);
+                       ds->db_stencil_info |= S_028044_TILE_MODE_INDEX(tile_mode_index);
+               }
 
-       if (iview->image->surface.htile_size && !level) {
-               ds->db_z_info |= S_028040_TILE_SURFACE_ENABLE(1);
+               ds->db_depth_size = S_028058_PITCH_TILE_MAX((level_info->nblk_x / 8) - 1) |
+                       S_028058_HEIGHT_TILE_MAX((level_info->nblk_y / 8) - 1);
+               ds->db_depth_slice = S_02805C_SLICE_TILE_MAX((level_info->nblk_x * level_info->nblk_y) / 64 - 1);
 
-               if (!(iview->image->surface.flags & RADEON_SURF_SBUFFER))
-                       /* Use all of the htile_buffer for depth if there's no stencil. */
-                       ds->db_stencil_info |= S_028044_TILE_STENCIL_DISABLE(1);
+               if (iview->image->surface.htile_size && !level) {
+                       ds->db_z_info |= S_028040_TILE_SURFACE_ENABLE(1);
 
-               va = device->ws->buffer_get_va(iview->bo) + iview->image->offset +
-                    iview->image->htile_offset;
-               ds->db_htile_data_base = va >> 8;
-               ds->db_htile_surface = S_028ABC_FULL_CACHE(1);
-       } else {
-               ds->db_htile_data_base = 0;
-               ds->db_htile_surface = 0;
+                       if (!(iview->image->surface.flags & RADEON_SURF_SBUFFER))
+                               /* Use all of the htile_buffer for depth if there's no stencil. */
+                               ds->db_stencil_info |= S_028044_TILE_STENCIL_DISABLE(1);
+
+                       va = device->ws->buffer_get_va(iview->bo) + iview->image->offset +
+                               iview->image->htile_offset;
+                       ds->db_htile_data_base = va >> 8;
+                       ds->db_htile_surface = S_028ABC_FULL_CACHE(1);
+               }
        }
 
        ds->db_z_read_base = ds->db_z_write_base = z_offs >> 8;
        ds->db_stencil_read_base = ds->db_stencil_write_base = s_offs >> 8;
-
-       ds->db_depth_size = S_028058_PITCH_TILE_MAX((level_info->nblk_x / 8) - 1) |
-               S_028058_HEIGHT_TILE_MAX((level_info->nblk_y / 8) - 1);
-       ds->db_depth_slice = S_02805C_SLICE_TILE_MAX((level_info->nblk_x * level_info->nblk_y) / 64 - 1);
 }
 
 VkResult radv_CreateFramebuffer(