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@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5398>
This commit is contained in:
Marek Olšák
2020-06-09 03:19:04 -04:00
committed by Marge Bot
parent e6996d6fbd
commit 4cf674c8f7
7 changed files with 53 additions and 37 deletions
@@ -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);
}
@@ -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;
@@ -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>