From 98a2492290be3d6d9a73a75935c9105e6b5b3f31 Mon Sep 17 00:00:00 2001 From: Nicolai Hähnle Date: Fri, 12 May 2017 01:24:48 +0200 Subject: ac_surface: use radeon_info from ac_gpu_info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/amd/common/ac_surface.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/amd/common/ac_surface.h') diff --git a/src/amd/common/ac_surface.h b/src/amd/common/ac_surface.h index 73649c76a10..9905be916ba 100644 --- a/src/amd/common/ac_surface.h +++ b/src/amd/common/ac_surface.h @@ -34,6 +34,7 @@ typedef void* ADDR_HANDLE; struct amdgpu_gpu_info; +struct radeon_info; #define RADEON_SURF_MAX_LEVELS 15 @@ -195,16 +196,12 @@ struct ac_surf_config { struct ac_surf_info info; unsigned is_3d : 1; unsigned is_cube : 1; - enum chip_class chip_class : 4; - unsigned num_tile_pipes; - unsigned pipe_interleave_bytes; - const struct amdgpu_gpu_info *amdinfo; }; -ADDR_HANDLE amdgpu_addr_create(enum radeon_family family, - const struct amdgpu_gpu_info *info); +ADDR_HANDLE amdgpu_addr_create(const struct radeon_info *info, + const struct amdgpu_gpu_info *amdinfo); -int ac_compute_surface(ADDR_HANDLE addrlib, +int ac_compute_surface(ADDR_HANDLE addrlib, const struct radeon_info *info, const struct ac_surf_config * config, enum radeon_surf_mode mode, struct radeon_surf *surf); -- cgit v1.2.3