tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

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>

authored by

Alexandre Demers and committed by
Alex Deucher d35a4129 14f15aa0

+5 -5
+3 -3
drivers/gpu/drm/amd/amdgpu/si_dma.c
··· 149 149 for (i = 0; i < adev->sdma.num_instances; i++) { 150 150 ring = &adev->sdma.instance[i].ring; 151 151 152 - WREG32(DMA_SEM_INCOMPLETE_TIMER_CNTL + sdma_offsets[i], 0); 153 - WREG32(DMA_SEM_WAIT_FAIL_TIMER_CNTL + sdma_offsets[i], 0); 152 + WREG32(mmDMA_SEM_INCOMPLETE_TIMER_CNTL + sdma_offsets[i], 0); 153 + WREG32(mmDMA_SEM_WAIT_FAIL_TIMER_CNTL + sdma_offsets[i], 0); 154 154 155 155 /* Set ring buffer size in dwords */ 156 156 rb_bufsz = order_base_2(ring->ring_size / 4); ··· 477 477 { 478 478 struct amdgpu_device *adev = ip_block->adev; 479 479 480 - adev->sdma.num_instances = 2; 480 + adev->sdma.num_instances = SDMA_MAX_INSTANCE; 481 481 482 482 si_dma_set_ring_funcs(adev); 483 483 si_dma_set_buffer_funcs(adev);
-2
drivers/gpu/drm/amd/amdgpu/sid.h
··· 1999 1999 #define AMDGPU_PCIE_INDEX 0xc 2000 2000 #define AMDGPU_PCIE_DATA 0xd 2001 2001 2002 - #define DMA_SEM_INCOMPLETE_TIMER_CNTL 0x3411 2003 - #define DMA_SEM_WAIT_FAIL_TIMER_CNTL 0x3412 2004 2002 #define DMA_MODE 0x342f 2005 2003 #define DMA_BUSY_MASK 0x20 2006 2004 #define SDMA_MAX_INSTANCE 2
+2
drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h
··· 246 246 #define mmDMA_CNTL 0x340b 247 247 #define mmDMA_STATUS_REG 0x340D 248 248 #define mmDMA_TILING_CONFIG 0x342E 249 + #define mmDMA_SEM_INCOMPLETE_TIMER_CNTL 0x3411 250 + #define mmDMA_SEM_WAIT_FAIL_TIMER_CNTL 0x3412 249 251 #define mmDMA_POWER_CNTL 0x342F 250 252 #define mmDMA_CLK_CTRL 0x3430 251 253 #define mmDMA_PG 0x3435