drm/amdgpu: move GFX6 defines into gfx_v6_0.c

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Send a few GFX6 defines where it's used in GFX6.

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Alexandre Demers and committed by

Alex Deucher 1 year ago 8e46cabf 9aadb02f

+3 -2

2 changed files

expand all

drivers

gpu

drm

amd

amdgpu

gfx_v6_0.c

si_enums.h

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c

··· 53 53 #define VERDE_GB_ADDR_CONFIG_GOLDEN 0x12010002 54 54 #define HAINAN_GB_ADDR_CONFIG_GOLDEN 0x02010001 55 55 56 + #define GFX6_NUM_GFX_RINGS 1 57 + #define GFX6_NUM_COMPUTE_RINGS 2 58 + 56 59 static void gfx_v6_0_set_ring_funcs(struct amdgpu_device *adev); 57 60 static void gfx_v6_0_set_irq_funcs(struct amdgpu_device *adev); 58 61 static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev);

-2

drivers/gpu/drm/amd/amdgpu/si_enums.h

··· 148 148 #define WAIT_REG_MEM_FUNCTION(x) ((x) << 0) 149 149 #define WAIT_REG_MEM_ENGINE(x) ((x) << 8) 150 150 151 - #define GFX6_NUM_GFX_RINGS 1 152 - #define GFX6_NUM_COMPUTE_RINGS 2 153 151 #define RLC_SAVE_AND_RESTORE_STARTING_OFFSET 0x90 154 152 #define RLC_CLEAR_STATE_DESCRIPTOR_OFFSET 0x3D 155 153