Mesa (staging/20.1): ac/surface: add a wrapper structure to hold ADDR_HANDLE
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jun 17 21:17:57 UTC 2020
Module: Mesa
Branch: staging/20.1
Commit: 6ce008566675714fe68228909f428e021dccf0dc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ce008566675714fe68228909f428e021dccf0dc
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Jun 9 03:19:04 2020 -0400
ac/surface: add a wrapper structure to hold ADDR_HANDLE
and more things in the future.
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
(cherry picked from commit 4cf674c8f730bfa7c8dfe8b4ebe86f1f4e5f1bb9)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5422>
---
.pick_status.json | 2 +-
src/amd/common/ac_surface.c | 64 +++++++++++++++--------
src/amd/common/ac_surface.h | 11 ++--
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 4 +-
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h | 3 +-
src/amd/vulkan/winsys/null/radv_null_winsys.h | 1 -
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 4 +-
src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 3 +-
8 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index d1fbe4e463a..6fb81bde627 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2389,7 +2389,7 @@
"description": "ac/surface: add a wrapper structure to hold ADDR_HANDLE",
"nominated": false,
"nomination_type": null,
- "resolution": 4,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 992444dd70d..3931a4a716b 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -50,6 +50,10 @@
#define CIASICIDGFXENGINE_ARCTICISLAND 0x0000000D
#endif
+struct ac_addrlib {
+ ADDR_HANDLE handle;
+};
+
static void *ADDR_API allocSysMem(const ADDR_ALLOCSYSMEM_INPUT * pInput)
{
return malloc(pInput->sizeInBytes);
@@ -61,9 +65,9 @@ static ADDR_E_RETURNCODE ADDR_API freeSysMem(const ADDR_FREESYSMEM_INPUT * pInpu
return ADDR_OK;
}
-ADDR_HANDLE amdgpu_addr_create(const struct radeon_info *info,
- const struct amdgpu_gpu_info *amdinfo,
- uint64_t *max_alignment)
+struct ac_addrlib *ac_addrlib_create(const struct radeon_info *info,
+ const struct amdgpu_gpu_info *amdinfo,
+ uint64_t *max_alignment)
{
ADDR_CREATE_INPUT addrCreateInput = {0};
ADDR_CREATE_OUTPUT addrCreateOutput = {0};
@@ -123,7 +127,21 @@ ADDR_HANDLE amdgpu_addr_create(const struct radeon_info *info,
*max_alignment = addrGetMaxAlignmentsOutput.baseAlign;
}
}
- return addrCreateOutput.hLib;
+
+ struct ac_addrlib *addrlib = calloc(1, sizeof(struct ac_addrlib));
+ if (!addrlib) {
+ AddrDestroy(addrCreateOutput.hLib);
+ return NULL;
+ }
+
+ addrlib->handle = addrCreateOutput.hLib;
+ return addrlib;
+}
+
+void ac_addrlib_destroy(struct ac_addrlib *addrlib)
+{
+ AddrDestroy(addrlib->handle);
+ free(addrlib);
}
static int surf_config_sanity(const struct ac_surf_config *config,
@@ -1107,7 +1125,7 @@ static bool is_dcc_supported_by_DCN(const struct radeon_info *info,
}
}
-static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
+static int gfx9_compute_miptree(struct ac_addrlib *addrlib,
const struct radeon_info *info,
const struct ac_surf_config *config,
struct radeon_surf *surf, bool compressed,
@@ -1120,7 +1138,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
out.size = sizeof(ADDR2_COMPUTE_SURFACE_INFO_OUTPUT);
out.pMipInfo = mip_info;
- ret = Addr2ComputeSurfaceInfo(addrlib, in, &out);
+ ret = Addr2ComputeSurfaceInfo(addrlib->handle, in, &out);
if (ret != ADDR_OK)
return ret;
@@ -1189,7 +1207,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
hin.numMipLevels = in->numMipLevels;
hin.firstMipIdInTail = out.firstMipIdInTail;
- ret = Addr2ComputeHtileInfo(addrlib, &hin, &hout);
+ ret = Addr2ComputeHtileInfo(addrlib->handle, &hin, &hout);
if (ret != ADDR_OK)
return ret;
@@ -1224,7 +1242,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
xin.numSamples = in->numSamples;
xin.numFrags = in->numFrags;
- ret = Addr2ComputePipeBankXor(addrlib, &xin, &xout);
+ ret = Addr2ComputePipeBankXor(addrlib->handle, &xin, &xout);
if (ret != ADDR_OK)
return ret;
@@ -1264,7 +1282,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
din.dataSurfaceSize = out.surfSize;
din.firstMipIdInTail = out.firstMipIdInTail;
- ret = Addr2ComputeDccInfo(addrlib, &din, &dout);
+ ret = Addr2ComputeDccInfo(addrlib->handle, &din, &dout);
if (ret != ADDR_OK)
return ret;
@@ -1325,7 +1343,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
assert(surf->u.gfx9.dcc.pipe_aligned ||
surf->u.gfx9.dcc.rb_aligned);
- ret = Addr2ComputeDccInfo(addrlib, &din, &dout);
+ ret = Addr2ComputeDccInfo(addrlib->handle, &din, &dout);
if (ret != ADDR_OK)
return ret;
@@ -1385,7 +1403,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
addrin.dccKeyFlags.rbAligned = surf->u.gfx9.dcc.rb_aligned;
addrout.addr = 0;
- ret = Addr2ComputeDccAddrFromCoord(addrlib, &addrin, &addrout);
+ ret = Addr2ComputeDccAddrFromCoord(addrlib->handle, &addrin, &addrout);
if (ret != ADDR_OK)
return ret;
@@ -1396,7 +1414,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
addrin.dccKeyFlags.rbAligned = 0;
addrout.addr = 0;
- ret = Addr2ComputeDccAddrFromCoord(addrlib, &addrin, &addrout);
+ ret = Addr2ComputeDccAddrFromCoord(addrlib->handle, &addrin, &addrout);
if (ret != ADDR_OK)
return ret;
@@ -1422,7 +1440,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
fin.size = sizeof(ADDR2_COMPUTE_FMASK_INFO_INPUT);
fout.size = sizeof(ADDR2_COMPUTE_FMASK_INFO_OUTPUT);
- ret = gfx9_get_preferred_swizzle_mode(addrlib, surf, in,
+ ret = gfx9_get_preferred_swizzle_mode(addrlib->handle, surf, in,
true, &fin.swizzleMode);
if (ret != ADDR_OK)
return ret;
@@ -1433,7 +1451,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
fin.numSamples = in->numSamples;
fin.numFrags = in->numFrags;
- ret = Addr2ComputeFmaskInfo(addrlib, &fin, &fout);
+ ret = Addr2ComputeFmaskInfo(addrlib->handle, &fin, &fout);
if (ret != ADDR_OK)
return ret;
@@ -1461,7 +1479,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
xin.numSamples = in->numSamples;
xin.numFrags = in->numFrags;
- ret = Addr2ComputePipeBankXor(addrlib, &xin, &xout);
+ ret = Addr2ComputePipeBankXor(addrlib->handle, &xin, &xout);
if (ret != ADDR_OK)
return ret;
@@ -1501,7 +1519,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
else
cin.swizzleMode = in->swizzleMode;
- ret = Addr2ComputeCmaskInfo(addrlib, &cin, &cout);
+ ret = Addr2ComputeCmaskInfo(addrlib->handle, &cin, &cout);
if (ret != ADDR_OK)
return ret;
@@ -1515,7 +1533,7 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
return 0;
}
-static int gfx9_compute_surface(ADDR_HANDLE addrlib,
+static int gfx9_compute_surface(struct ac_addrlib *addrlib,
const struct radeon_info *info,
const struct ac_surf_config *config,
enum radeon_surf_mode mode,
@@ -1672,7 +1690,7 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib,
break;
}
- r = gfx9_get_preferred_swizzle_mode(addrlib, surf, &AddrSurfInfoIn,
+ r = gfx9_get_preferred_swizzle_mode(addrlib->handle, surf, &AddrSurfInfoIn,
false, &AddrSurfInfoIn.swizzleMode);
if (r)
return r;
@@ -1711,7 +1729,7 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib,
AddrSurfInfoIn.format = ADDR_FMT_8;
if (!AddrSurfInfoIn.flags.depth) {
- r = gfx9_get_preferred_swizzle_mode(addrlib, surf, &AddrSurfInfoIn,
+ r = gfx9_get_preferred_swizzle_mode(addrlib->handle, surf, &AddrSurfInfoIn,
false, &AddrSurfInfoIn.swizzleMode);
if (r)
goto error;
@@ -1730,8 +1748,8 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib,
/* This is only useful for surfaces that are allocated without SCANOUT. */
bool displayable = false;
if (!config->is_3d && !config->is_cube) {
- r = Addr2IsValidDisplaySwizzleMode(addrlib, surf->u.gfx9.surf.swizzle_mode,
- surf->bpe * 8, &displayable);
+ r = Addr2IsValidDisplaySwizzleMode(addrlib->handle, surf->u.gfx9.surf.swizzle_mode,
+ surf->bpe * 8, &displayable);
if (r)
goto error;
@@ -1843,7 +1861,7 @@ error:
return r;
}
-int ac_compute_surface(ADDR_HANDLE addrlib, const struct radeon_info *info,
+int ac_compute_surface(struct ac_addrlib *addrlib, const struct radeon_info *info,
const struct ac_surf_config *config,
enum radeon_surf_mode mode,
struct radeon_surf *surf)
@@ -1857,7 +1875,7 @@ int ac_compute_surface(ADDR_HANDLE addrlib, const struct radeon_info *info,
if (info->chip_class >= GFX9)
r = gfx9_compute_surface(addrlib, info, config, mode, surf);
else
- r = gfx6_compute_surface(addrlib, info, config, mode, surf);
+ r = gfx6_compute_surface(addrlib->handle, info, config, mode, surf);
if (r)
return r;
diff --git a/src/amd/common/ac_surface.h b/src/amd/common/ac_surface.h
index 0dc43816593..ed3694ac63d 100644
--- a/src/amd/common/ac_surface.h
+++ b/src/amd/common/ac_surface.h
@@ -36,7 +36,7 @@ extern "C" {
#endif
/* Forward declarations. */
-typedef void* ADDR_HANDLE;
+struct ac_addrlib;
struct amdgpu_gpu_info;
struct radeon_info;
@@ -279,11 +279,12 @@ struct ac_surf_config {
unsigned is_cube : 1;
};
-ADDR_HANDLE amdgpu_addr_create(const struct radeon_info *info,
- const struct amdgpu_gpu_info *amdinfo,
- uint64_t *max_alignment);
+struct ac_addrlib *ac_addrlib_create(const struct radeon_info *info,
+ const struct amdgpu_gpu_info *amdinfo,
+ uint64_t *max_alignment);
+void ac_addrlib_destroy(struct ac_addrlib *addrlib);
-int ac_compute_surface(ADDR_HANDLE addrlib, const struct radeon_info *info,
+int ac_compute_surface(struct ac_addrlib *addrlib, const struct radeon_info *info,
const struct ac_surf_config * config,
enum radeon_surf_mode mode,
struct radeon_surf *surf);
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
index acb003e1533..0f7f5bcf3bf 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
@@ -55,7 +55,7 @@ do_winsys_init(struct radv_amdgpu_winsys *ws, int fd)
ws->info.use_display_dcc_unaligned = false;
ws->info.use_display_dcc_with_retile_blit = false;
- ws->addrlib = amdgpu_addr_create(&ws->info, &ws->amdinfo, &ws->info.max_alignment);
+ ws->addrlib = ac_addrlib_create(&ws->info, &ws->amdinfo, &ws->info.max_alignment);
if (!ws->addrlib) {
fprintf(stderr, "amdgpu: Cannot create addrlib.\n");
return false;
@@ -156,7 +156,7 @@ static void radv_amdgpu_winsys_destroy(struct radeon_winsys *rws)
{
struct radv_amdgpu_winsys *ws = (struct radv_amdgpu_winsys*)rws;
- AddrDestroy(ws->addrlib);
+ ac_addrlib_destroy(ws->addrlib);
amdgpu_device_deinitialize(ws->dev);
FREE(rws);
}
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
index 8cbac290043..166b2dfe1ca 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -30,7 +30,6 @@
#include "radv_radeon_winsys.h"
#include "ac_gpu_info.h"
-#include "addrlib/inc/addrinterface.h"
#include <amdgpu.h>
#include "util/list.h"
#include <pthread.h>
@@ -41,7 +40,7 @@ struct radv_amdgpu_winsys {
struct radeon_info info;
struct amdgpu_gpu_info amdinfo;
- ADDR_HANDLE addrlib;
+ struct ac_addrlib *addrlib;
bool debug_all_bos;
bool use_ib_bos;
diff --git a/src/amd/vulkan/winsys/null/radv_null_winsys.h b/src/amd/vulkan/winsys/null/radv_null_winsys.h
index 7953ab4792d..5bb31a7ffba 100644
--- a/src/amd/vulkan/winsys/null/radv_null_winsys.h
+++ b/src/amd/vulkan/winsys/null/radv_null_winsys.h
@@ -30,7 +30,6 @@
#include "radv_radeon_winsys.h"
#include "ac_gpu_info.h"
-#include "addrlib/inc/addrinterface.h"
#include "util/list.h"
#include <pthread.h>
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index a195dc8a136..7ac2a61bdfd 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -102,7 +102,7 @@ static bool do_winsys_init(struct amdgpu_winsys *ws,
handle_env_var_force_family(ws);
- ws->addrlib = amdgpu_addr_create(&ws->info, &ws->amdinfo, &ws->info.max_alignment);
+ ws->addrlib = ac_addrlib_create(&ws->info, &ws->amdinfo, &ws->info.max_alignment);
if (!ws->addrlib) {
fprintf(stderr, "amdgpu: Cannot create addrlib.\n");
goto fail;
@@ -144,7 +144,7 @@ static void do_winsys_deinit(struct amdgpu_winsys *ws)
simple_mtx_destroy(&ws->global_bo_list_lock);
simple_mtx_destroy(&ws->bo_export_table_lock);
- AddrDestroy(ws->addrlib);
+ ac_addrlib_destroy(ws->addrlib);
amdgpu_device_deinitialize(ws->dev);
FREE(ws);
}
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
index 7e677b517ff..42bc8846db5 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
@@ -31,7 +31,6 @@
#include "pipebuffer/pb_cache.h"
#include "pipebuffer/pb_slab.h"
#include "gallium/drivers/radeon/radeon_winsys.h"
-#include "addrlib/inc/addrinterface.h"
#include "util/simple_mtx.h"
#include "util/u_queue.h"
#include <amdgpu.h>
@@ -79,7 +78,7 @@ struct amdgpu_winsys {
struct util_queue cs_queue;
struct amdgpu_gpu_info amdinfo;
- ADDR_HANDLE addrlib;
+ struct ac_addrlib *addrlib;
bool check_vm;
bool debug_all_bos;
More information about the mesa-commit
mailing list