fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Use new scanout gfx9 metadata flag.

Browse source 
This updates for the new metadata ABI in radeonsi.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3244>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3244>
This commit is contained in:
Bas Nieuwenhuizen 2019-12-31 21:19:20 +01:00
parent f06be79457
commit bfd9e7ff24
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/amd/vulkan/radv_image.c
View file

@ -129,17 +129,14 @@ radv_use_tc_compat_htile_for_image(struct radv_device *device,
static bool static bool
radv_surface_has_scanout(struct radv_device *device, const struct radv_image_create_info *info) radv_surface_has_scanout(struct radv_device *device, const struct radv_image_create_info *info)
{ {
if (info->scanout) if (info->bo_metadata) {
return true; if (device->physical_device->rad_info.chip_class >= GFX9)
return info->bo_metadata->u.gfx9.scanout;
if (!info->bo_metadata) else
return false; return info->bo_metadata->u.legacy.scanout;
if (device->physical_device->rad_info.chip_class >= GFX9) {
return info->bo_metadata->u.gfx9.swizzle_mode == 0 || info->bo_metadata->u.gfx9.swizzle_mode % 4 == 2;
} else {
return info->bo_metadata->u.legacy.scanout;
} }
return info->scanout;
} }
static bool static bool
@ -1152,6 +1149,7 @@ radv_init_metadata(struct radv_device *device,
if (device->physical_device->rad_info.chip_class >= GFX9) { if (device->physical_device->rad_info.chip_class >= GFX9) {
metadata->u.gfx9.swizzle_mode = surface->u.gfx9.surf.swizzle_mode; metadata->u.gfx9.swizzle_mode = surface->u.gfx9.surf.swizzle_mode;
metadata->u.gfx9.scanout = (surface->flags & RADEON_SURF_SCANOUT) != 0;
} else { } else {
metadata->u.legacy.microtile = surface->u.legacy.level[0].mode >= RADEON_SURF_MODE_1D ? metadata->u.legacy.microtile = surface->u.legacy.level[0].mode >= RADEON_SURF_MODE_1D ?
RADEON_LAYOUT_TILED : RADEON_LAYOUT_LINEAR; RADEON_LAYOUT_TILED : RADEON_LAYOUT_LINEAR;

1
src/amd/vulkan/radv_radeon_winsys.h
View file

@ -144,6 +144,7 @@ struct radeon_bo_metadata {
struct { struct {
/* surface flags */ /* surface flags */
unsigned swizzle_mode:5; unsigned swizzle_mode:5;
bool scanout;
} gfx9; } gfx9;
} u; } u;

5
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c
View file

@ -38,6 +38,9 @@
#include "util/u_atomic.h" #include "util/u_atomic.h"
#define AMDGPU_TILING_SCANOUT_SHIFT 63
#define AMDGPU_TILING_SCANOUT_MASK 1
static void radv_amdgpu_winsys_bo_destroy(struct radeon_winsys_bo *_bo); static void radv_amdgpu_winsys_bo_destroy(struct radeon_winsys_bo *_bo);
static int static int
@ -667,6 +670,7 @@ radv_amdgpu_winsys_bo_set_metadata(struct radeon_winsys_bo *_bo,
if (bo->ws->info.chip_class >= GFX9) { if (bo->ws->info.chip_class >= GFX9) {
tiling_flags |= AMDGPU_TILING_SET(SWIZZLE_MODE, md->u.gfx9.swizzle_mode); tiling_flags |= AMDGPU_TILING_SET(SWIZZLE_MODE, md->u.gfx9.swizzle_mode);
tiling_flags |= AMDGPU_TILING_SET(SCANOUT, md->u.gfx9.scanout);
} else { } else {
if (md->u.legacy.macrotile == RADEON_LAYOUT_TILED) if (md->u.legacy.macrotile == RADEON_LAYOUT_TILED)
tiling_flags |= AMDGPU_TILING_SET(ARRAY_MODE, 4); /* 2D_TILED_THIN1 */ tiling_flags |= AMDGPU_TILING_SET(ARRAY_MODE, 4); /* 2D_TILED_THIN1 */
@ -711,6 +715,7 @@ radv_amdgpu_winsys_bo_get_metadata(struct radeon_winsys_bo *_bo,
if (bo->ws->info.chip_class >= GFX9) { if (bo->ws->info.chip_class >= GFX9) {
md->u.gfx9.swizzle_mode = AMDGPU_TILING_GET(tiling_flags, SWIZZLE_MODE); md->u.gfx9.swizzle_mode = AMDGPU_TILING_GET(tiling_flags, SWIZZLE_MODE);
md->u.gfx9.scanout = AMDGPU_TILING_GET(tiling_flags, SCANOUT);
} else { } else {
md->u.legacy.microtile = RADEON_LAYOUT_LINEAR; md->u.legacy.microtile = RADEON_LAYOUT_LINEAR;
md->u.legacy.macrotile = RADEON_LAYOUT_LINEAR; md->u.legacy.macrotile = RADEON_LAYOUT_LINEAR;