github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/amdgpu: keep removing sid.h dependency from si_dma.c

Browse Source 
Move and rename DMA_SEM_INCOMPLETE_TIMER_CNTL and DMA_SEM_WAIT_FAIL_TIMER_CNTL
in oss_1_0_d.h

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alexandre Demers 2025-03-21 21:46:58 -04:00 committed by Alex Deucher
parent 14f15aa054
commit d35a412910
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/si_dma.c
View File

@ -149,8 +149,8 @@ static int si_dma_start(struct amdgpu_device *adev)
for (i = 0; i < adev->sdma.num_instances; i++) {
ring = &adev->sdma.instance[i].ring;
WREG32(DMA_SEM_INCOMPLETE_TIMER_CNTL + sdma_offsets[i], 0);
WREG32(DMA_SEM_WAIT_FAIL_TIMER_CNTL + sdma_offsets[i], 0);
WREG32(mmDMA_SEM_INCOMPLETE_TIMER_CNTL + sdma_offsets[i], 0);
WREG32(mmDMA_SEM_WAIT_FAIL_TIMER_CNTL + sdma_offsets[i], 0);
/* Set ring buffer size in dwords */
rb_bufsz = order_base_2(ring->ring_size / 4);
@ -477,7 +477,7 @@ static int si_dma_early_init(struct amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;
adev->sdma.num_instances = 2;
adev->sdma.num_instances = SDMA_MAX_INSTANCE;
si_dma_set_ring_funcs(adev);
si_dma_set_buffer_funcs(adev);

2
drivers/gpu/drm/amd/amdgpu/sid.h
View File

@ -1999,8 +1999,6 @@
#define AMDGPU_PCIE_INDEX 0xc
#define AMDGPU_PCIE_DATA 0xd
#define DMA_SEM_INCOMPLETE_TIMER_CNTL 0x3411
#define DMA_SEM_WAIT_FAIL_TIMER_CNTL 0x3412
#define DMA_MODE 0x342f
#define DMA_BUSY_MASK 0x20
#define SDMA_MAX_INSTANCE 2

2
drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h
View File

@ -246,6 +246,8 @@
#define mmDMA_CNTL 0x340b
#define mmDMA_STATUS_REG 0x340D
#define mmDMA_TILING_CONFIG 0x342E
#define mmDMA_SEM_INCOMPLETE_TIMER_CNTL 0x3411
#define mmDMA_SEM_WAIT_FAIL_TIMER_CNTL 0x3412
#define mmDMA_POWER_CNTL 0x342F
#define mmDMA_CLK_CTRL 0x3430
#define mmDMA_PG 0x3435