mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
drm/amd/amdgpu: Port UVD 7.0 over to new SOC15 macros
Signed-off-by: Tom St Denis <tom.stdenis@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
deca8322f1
commit
4ad5751a6c
1 changed files with 87 additions and 87 deletions
|
@ -58,7 +58,7 @@ static uint64_t uvd_v7_0_ring_get_rptr(struct amdgpu_ring *ring)
|
||||||
{
|
{
|
||||||
struct amdgpu_device *adev = ring->adev;
|
struct amdgpu_device *adev = ring->adev;
|
||||||
|
|
||||||
return RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_RPTR));
|
return RREG32_SOC15(UVD, 0, mmUVD_RBC_RB_RPTR);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -73,9 +73,9 @@ static uint64_t uvd_v7_0_enc_ring_get_rptr(struct amdgpu_ring *ring)
|
||||||
struct amdgpu_device *adev = ring->adev;
|
struct amdgpu_device *adev = ring->adev;
|
||||||
|
|
||||||
if (ring == &adev->uvd.ring_enc[0])
|
if (ring == &adev->uvd.ring_enc[0])
|
||||||
return RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_RPTR));
|
return RREG32_SOC15(UVD, 0, mmUVD_RB_RPTR);
|
||||||
else
|
else
|
||||||
return RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_RPTR2));
|
return RREG32_SOC15(UVD, 0, mmUVD_RB_RPTR2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -89,7 +89,7 @@ static uint64_t uvd_v7_0_ring_get_wptr(struct amdgpu_ring *ring)
|
||||||
{
|
{
|
||||||
struct amdgpu_device *adev = ring->adev;
|
struct amdgpu_device *adev = ring->adev;
|
||||||
|
|
||||||
return RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_WPTR));
|
return RREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -107,9 +107,9 @@ static uint64_t uvd_v7_0_enc_ring_get_wptr(struct amdgpu_ring *ring)
|
||||||
return adev->wb.wb[ring->wptr_offs];
|
return adev->wb.wb[ring->wptr_offs];
|
||||||
|
|
||||||
if (ring == &adev->uvd.ring_enc[0])
|
if (ring == &adev->uvd.ring_enc[0])
|
||||||
return RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_WPTR));
|
return RREG32_SOC15(UVD, 0, mmUVD_RB_WPTR);
|
||||||
else
|
else
|
||||||
return RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_WPTR2));
|
return RREG32_SOC15(UVD, 0, mmUVD_RB_WPTR2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -123,7 +123,7 @@ static void uvd_v7_0_ring_set_wptr(struct amdgpu_ring *ring)
|
||||||
{
|
{
|
||||||
struct amdgpu_device *adev = ring->adev;
|
struct amdgpu_device *adev = ring->adev;
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_WPTR), lower_32_bits(ring->wptr));
|
WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, lower_32_bits(ring->wptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -145,10 +145,10 @@ static void uvd_v7_0_enc_ring_set_wptr(struct amdgpu_ring *ring)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ring == &adev->uvd.ring_enc[0])
|
if (ring == &adev->uvd.ring_enc[0])
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_WPTR),
|
WREG32_SOC15(UVD, 0, mmUVD_RB_WPTR,
|
||||||
lower_32_bits(ring->wptr));
|
lower_32_bits(ring->wptr));
|
||||||
else
|
else
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_WPTR2),
|
WREG32_SOC15(UVD, 0, mmUVD_RB_WPTR2,
|
||||||
lower_32_bits(ring->wptr));
|
lower_32_bits(ring->wptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -617,46 +617,46 @@ static void uvd_v7_0_mc_resume(struct amdgpu_device *adev)
|
||||||
uint32_t offset;
|
uint32_t offset;
|
||||||
|
|
||||||
if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
|
if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW,
|
||||||
lower_32_bits(adev->firmware.ucode[AMDGPU_UCODE_ID_UVD].mc_addr));
|
lower_32_bits(adev->firmware.ucode[AMDGPU_UCODE_ID_UVD].mc_addr));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH,
|
||||||
upper_32_bits(adev->firmware.ucode[AMDGPU_UCODE_ID_UVD].mc_addr));
|
upper_32_bits(adev->firmware.ucode[AMDGPU_UCODE_ID_UVD].mc_addr));
|
||||||
offset = 0;
|
offset = 0;
|
||||||
} else {
|
} else {
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW,
|
||||||
lower_32_bits(adev->uvd.gpu_addr));
|
lower_32_bits(adev->uvd.gpu_addr));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH,
|
||||||
upper_32_bits(adev->uvd.gpu_addr));
|
upper_32_bits(adev->uvd.gpu_addr));
|
||||||
offset = size;
|
offset = size;
|
||||||
}
|
}
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_OFFSET0),
|
WREG32_SOC15(UVD, 0, mmUVD_VCPU_CACHE_OFFSET0,
|
||||||
AMDGPU_UVD_FIRMWARE_OFFSET >> 3);
|
AMDGPU_UVD_FIRMWARE_OFFSET >> 3);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_SIZE0), size);
|
WREG32_SOC15(UVD, 0, mmUVD_VCPU_CACHE_SIZE0, size);
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_LOW,
|
||||||
lower_32_bits(adev->uvd.gpu_addr + offset));
|
lower_32_bits(adev->uvd.gpu_addr + offset));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE1_64BIT_BAR_HIGH,
|
||||||
upper_32_bits(adev->uvd.gpu_addr + offset));
|
upper_32_bits(adev->uvd.gpu_addr + offset));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_OFFSET1), (1 << 21));
|
WREG32_SOC15(UVD, 0, mmUVD_VCPU_CACHE_OFFSET1, (1 << 21));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_SIZE1), AMDGPU_UVD_HEAP_SIZE);
|
WREG32_SOC15(UVD, 0, mmUVD_VCPU_CACHE_SIZE1, AMDGPU_UVD_HEAP_SIZE);
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_LOW,
|
||||||
lower_32_bits(adev->uvd.gpu_addr + offset + AMDGPU_UVD_HEAP_SIZE));
|
lower_32_bits(adev->uvd.gpu_addr + offset + AMDGPU_UVD_HEAP_SIZE));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_VCPU_CACHE2_64BIT_BAR_HIGH,
|
||||||
upper_32_bits(adev->uvd.gpu_addr + offset + AMDGPU_UVD_HEAP_SIZE));
|
upper_32_bits(adev->uvd.gpu_addr + offset + AMDGPU_UVD_HEAP_SIZE));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_OFFSET2), (2 << 21));
|
WREG32_SOC15(UVD, 0, mmUVD_VCPU_CACHE_OFFSET2, (2 << 21));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CACHE_SIZE2),
|
WREG32_SOC15(UVD, 0, mmUVD_VCPU_CACHE_SIZE2,
|
||||||
AMDGPU_UVD_STACK_SIZE + (AMDGPU_UVD_SESSION_SIZE * 40));
|
AMDGPU_UVD_STACK_SIZE + (AMDGPU_UVD_SESSION_SIZE * 40));
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_UDEC_ADDR_CONFIG),
|
WREG32_SOC15(UVD, 0, mmUVD_UDEC_ADDR_CONFIG,
|
||||||
adev->gfx.config.gb_addr_config);
|
adev->gfx.config.gb_addr_config);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_UDEC_DB_ADDR_CONFIG),
|
WREG32_SOC15(UVD, 0, mmUVD_UDEC_DB_ADDR_CONFIG,
|
||||||
adev->gfx.config.gb_addr_config);
|
adev->gfx.config.gb_addr_config);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_UDEC_DBW_ADDR_CONFIG),
|
WREG32_SOC15(UVD, 0, mmUVD_UDEC_DBW_ADDR_CONFIG,
|
||||||
adev->gfx.config.gb_addr_config);
|
adev->gfx.config.gb_addr_config);
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_GP_SCRATCH4), adev->uvd.max_handles);
|
WREG32_SOC15(UVD, 0, mmUVD_GP_SCRATCH4, adev->uvd.max_handles);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int uvd_v7_0_mmsch_start(struct amdgpu_device *adev,
|
static int uvd_v7_0_mmsch_start(struct amdgpu_device *adev,
|
||||||
|
@ -670,29 +670,29 @@ static int uvd_v7_0_mmsch_start(struct amdgpu_device *adev,
|
||||||
size = header->header_size + header->vce_table_size + header->uvd_table_size;
|
size = header->header_size + header->vce_table_size + header->uvd_table_size;
|
||||||
|
|
||||||
/* 1, write to vce_mmsch_vf_ctx_addr_lo/hi register with GPU mc addr of memory descriptor location */
|
/* 1, write to vce_mmsch_vf_ctx_addr_lo/hi register with GPU mc addr of memory descriptor location */
|
||||||
WREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_MMSCH_VF_CTX_ADDR_LO), lower_32_bits(addr));
|
WREG32_SOC15(VCE, 0, mmVCE_MMSCH_VF_CTX_ADDR_LO, lower_32_bits(addr));
|
||||||
WREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_MMSCH_VF_CTX_ADDR_HI), upper_32_bits(addr));
|
WREG32_SOC15(VCE, 0, mmVCE_MMSCH_VF_CTX_ADDR_HI, upper_32_bits(addr));
|
||||||
|
|
||||||
/* 2, update vmid of descriptor */
|
/* 2, update vmid of descriptor */
|
||||||
data = RREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_MMSCH_VF_VMID));
|
data = RREG32_SOC15(VCE, 0, mmVCE_MMSCH_VF_VMID);
|
||||||
data &= ~VCE_MMSCH_VF_VMID__VF_CTX_VMID_MASK;
|
data &= ~VCE_MMSCH_VF_VMID__VF_CTX_VMID_MASK;
|
||||||
data |= (0 << VCE_MMSCH_VF_VMID__VF_CTX_VMID__SHIFT); /* use domain0 for MM scheduler */
|
data |= (0 << VCE_MMSCH_VF_VMID__VF_CTX_VMID__SHIFT); /* use domain0 for MM scheduler */
|
||||||
WREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_MMSCH_VF_VMID), data);
|
WREG32_SOC15(VCE, 0, mmVCE_MMSCH_VF_VMID, data);
|
||||||
|
|
||||||
/* 3, notify mmsch about the size of this descriptor */
|
/* 3, notify mmsch about the size of this descriptor */
|
||||||
WREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_MMSCH_VF_CTX_SIZE), size);
|
WREG32_SOC15(VCE, 0, mmVCE_MMSCH_VF_CTX_SIZE, size);
|
||||||
|
|
||||||
/* 4, set resp to zero */
|
/* 4, set resp to zero */
|
||||||
WREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_MMSCH_VF_MAILBOX_RESP), 0);
|
WREG32_SOC15(VCE, 0, mmVCE_MMSCH_VF_MAILBOX_RESP, 0);
|
||||||
|
|
||||||
/* 5, kick off the initialization and wait until VCE_MMSCH_VF_MAILBOX_RESP becomes non-zero */
|
/* 5, kick off the initialization and wait until VCE_MMSCH_VF_MAILBOX_RESP becomes non-zero */
|
||||||
WREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_MMSCH_VF_MAILBOX_HOST), 0x10000001);
|
WREG32_SOC15(VCE, 0, mmVCE_MMSCH_VF_MAILBOX_HOST, 0x10000001);
|
||||||
|
|
||||||
data = RREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_MMSCH_VF_MAILBOX_RESP));
|
data = RREG32_SOC15(VCE, 0, mmVCE_MMSCH_VF_MAILBOX_RESP);
|
||||||
loop = 1000;
|
loop = 1000;
|
||||||
while ((data & 0x10000002) != 0x10000002) {
|
while ((data & 0x10000002) != 0x10000002) {
|
||||||
udelay(10);
|
udelay(10);
|
||||||
data = RREG32(SOC15_REG_OFFSET(VCE, 0, mmVCE_MMSCH_VF_MAILBOX_RESP));
|
data = RREG32_SOC15(VCE, 0, mmVCE_MMSCH_VF_MAILBOX_RESP);
|
||||||
loop--;
|
loop--;
|
||||||
if (!loop)
|
if (!loop)
|
||||||
break;
|
break;
|
||||||
|
@ -935,7 +935,7 @@ static int uvd_v7_0_start(struct amdgpu_device *adev)
|
||||||
mdelay(1);
|
mdelay(1);
|
||||||
|
|
||||||
/* put LMI, VCPU, RBC etc... into reset */
|
/* put LMI, VCPU, RBC etc... into reset */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SOFT_RESET),
|
WREG32_SOC15(UVD, 0, mmUVD_SOFT_RESET,
|
||||||
UVD_SOFT_RESET__LMI_SOFT_RESET_MASK |
|
UVD_SOFT_RESET__LMI_SOFT_RESET_MASK |
|
||||||
UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK |
|
UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK |
|
||||||
UVD_SOFT_RESET__LBSI_SOFT_RESET_MASK |
|
UVD_SOFT_RESET__LBSI_SOFT_RESET_MASK |
|
||||||
|
@ -947,7 +947,7 @@ static int uvd_v7_0_start(struct amdgpu_device *adev)
|
||||||
mdelay(5);
|
mdelay(5);
|
||||||
|
|
||||||
/* initialize UVD memory controller */
|
/* initialize UVD memory controller */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_CTRL),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_CTRL,
|
||||||
(0x40 << UVD_LMI_CTRL__WRITE_CLEAN_TIMER__SHIFT) |
|
(0x40 << UVD_LMI_CTRL__WRITE_CLEAN_TIMER__SHIFT) |
|
||||||
UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK |
|
UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK |
|
||||||
UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK |
|
UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK |
|
||||||
|
@ -960,23 +960,23 @@ static int uvd_v7_0_start(struct amdgpu_device *adev)
|
||||||
lmi_swap_cntl = 0xa;
|
lmi_swap_cntl = 0xa;
|
||||||
mp_swap_cntl = 0;
|
mp_swap_cntl = 0;
|
||||||
#endif
|
#endif
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_SWAP_CNTL), lmi_swap_cntl);
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_SWAP_CNTL, lmi_swap_cntl);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_MP_SWAP_CNTL), mp_swap_cntl);
|
WREG32_SOC15(UVD, 0, mmUVD_MP_SWAP_CNTL, mp_swap_cntl);
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_MPC_SET_MUXA0), 0x40c2040);
|
WREG32_SOC15(UVD, 0, mmUVD_MPC_SET_MUXA0, 0x40c2040);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_MPC_SET_MUXA1), 0x0);
|
WREG32_SOC15(UVD, 0, mmUVD_MPC_SET_MUXA1, 0x0);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_MPC_SET_MUXB0), 0x40c2040);
|
WREG32_SOC15(UVD, 0, mmUVD_MPC_SET_MUXB0, 0x40c2040);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_MPC_SET_MUXB1), 0x0);
|
WREG32_SOC15(UVD, 0, mmUVD_MPC_SET_MUXB1, 0x0);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_MPC_SET_ALU), 0);
|
WREG32_SOC15(UVD, 0, mmUVD_MPC_SET_ALU, 0);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_MPC_SET_MUX), 0x88);
|
WREG32_SOC15(UVD, 0, mmUVD_MPC_SET_MUX, 0x88);
|
||||||
|
|
||||||
/* take all subblocks out of reset, except VCPU */
|
/* take all subblocks out of reset, except VCPU */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SOFT_RESET),
|
WREG32_SOC15(UVD, 0, mmUVD_SOFT_RESET,
|
||||||
UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK);
|
UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK);
|
||||||
mdelay(5);
|
mdelay(5);
|
||||||
|
|
||||||
/* enable VCPU clock */
|
/* enable VCPU clock */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CNTL),
|
WREG32_SOC15(UVD, 0, mmUVD_VCPU_CNTL,
|
||||||
UVD_VCPU_CNTL__CLK_EN_MASK);
|
UVD_VCPU_CNTL__CLK_EN_MASK);
|
||||||
|
|
||||||
/* enable UMC */
|
/* enable UMC */
|
||||||
|
@ -984,14 +984,14 @@ static int uvd_v7_0_start(struct amdgpu_device *adev)
|
||||||
~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK);
|
~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK);
|
||||||
|
|
||||||
/* boot up the VCPU */
|
/* boot up the VCPU */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SOFT_RESET), 0);
|
WREG32_SOC15(UVD, 0, mmUVD_SOFT_RESET, 0);
|
||||||
mdelay(10);
|
mdelay(10);
|
||||||
|
|
||||||
for (i = 0; i < 10; ++i) {
|
for (i = 0; i < 10; ++i) {
|
||||||
uint32_t status;
|
uint32_t status;
|
||||||
|
|
||||||
for (j = 0; j < 100; ++j) {
|
for (j = 0; j < 100; ++j) {
|
||||||
status = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_STATUS));
|
status = RREG32_SOC15(UVD, 0, mmUVD_STATUS);
|
||||||
if (status & 2)
|
if (status & 2)
|
||||||
break;
|
break;
|
||||||
mdelay(10);
|
mdelay(10);
|
||||||
|
@ -1032,44 +1032,44 @@ static int uvd_v7_0_start(struct amdgpu_device *adev)
|
||||||
tmp = REG_SET_FIELD(tmp, UVD_RBC_RB_CNTL, RB_WPTR_POLL_EN, 0);
|
tmp = REG_SET_FIELD(tmp, UVD_RBC_RB_CNTL, RB_WPTR_POLL_EN, 0);
|
||||||
tmp = REG_SET_FIELD(tmp, UVD_RBC_RB_CNTL, RB_NO_UPDATE, 1);
|
tmp = REG_SET_FIELD(tmp, UVD_RBC_RB_CNTL, RB_NO_UPDATE, 1);
|
||||||
tmp = REG_SET_FIELD(tmp, UVD_RBC_RB_CNTL, RB_RPTR_WR_EN, 1);
|
tmp = REG_SET_FIELD(tmp, UVD_RBC_RB_CNTL, RB_RPTR_WR_EN, 1);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_CNTL), tmp);
|
WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_CNTL, tmp);
|
||||||
|
|
||||||
/* set the write pointer delay */
|
/* set the write pointer delay */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_WPTR_CNTL), 0);
|
WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR_CNTL, 0);
|
||||||
|
|
||||||
/* set the wb address */
|
/* set the wb address */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_RPTR_ADDR),
|
WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_RPTR_ADDR,
|
||||||
(upper_32_bits(ring->gpu_addr) >> 2));
|
(upper_32_bits(ring->gpu_addr) >> 2));
|
||||||
|
|
||||||
/* programm the RB_BASE for ring buffer */
|
/* programm the RB_BASE for ring buffer */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_RBC_RB_64BIT_BAR_LOW),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_RBC_RB_64BIT_BAR_LOW,
|
||||||
lower_32_bits(ring->gpu_addr));
|
lower_32_bits(ring->gpu_addr));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH),
|
WREG32_SOC15(UVD, 0, mmUVD_LMI_RBC_RB_64BIT_BAR_HIGH,
|
||||||
upper_32_bits(ring->gpu_addr));
|
upper_32_bits(ring->gpu_addr));
|
||||||
|
|
||||||
/* Initialize the ring buffer's read and write pointers */
|
/* Initialize the ring buffer's read and write pointers */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_RPTR), 0);
|
WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_RPTR, 0);
|
||||||
|
|
||||||
ring->wptr = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_RPTR));
|
ring->wptr = RREG32_SOC15(UVD, 0, mmUVD_RBC_RB_RPTR);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_WPTR),
|
WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR,
|
||||||
lower_32_bits(ring->wptr));
|
lower_32_bits(ring->wptr));
|
||||||
|
|
||||||
WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_CNTL), 0,
|
WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_CNTL), 0,
|
||||||
~UVD_RBC_RB_CNTL__RB_NO_FETCH_MASK);
|
~UVD_RBC_RB_CNTL__RB_NO_FETCH_MASK);
|
||||||
|
|
||||||
ring = &adev->uvd.ring_enc[0];
|
ring = &adev->uvd.ring_enc[0];
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_RPTR), lower_32_bits(ring->wptr));
|
WREG32_SOC15(UVD, 0, mmUVD_RB_RPTR, lower_32_bits(ring->wptr));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_WPTR), lower_32_bits(ring->wptr));
|
WREG32_SOC15(UVD, 0, mmUVD_RB_WPTR, lower_32_bits(ring->wptr));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_BASE_LO), ring->gpu_addr);
|
WREG32_SOC15(UVD, 0, mmUVD_RB_BASE_LO, ring->gpu_addr);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_BASE_HI), upper_32_bits(ring->gpu_addr));
|
WREG32_SOC15(UVD, 0, mmUVD_RB_BASE_HI, upper_32_bits(ring->gpu_addr));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_SIZE), ring->ring_size / 4);
|
WREG32_SOC15(UVD, 0, mmUVD_RB_SIZE, ring->ring_size / 4);
|
||||||
|
|
||||||
ring = &adev->uvd.ring_enc[1];
|
ring = &adev->uvd.ring_enc[1];
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_RPTR2), lower_32_bits(ring->wptr));
|
WREG32_SOC15(UVD, 0, mmUVD_RB_RPTR2, lower_32_bits(ring->wptr));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_WPTR2), lower_32_bits(ring->wptr));
|
WREG32_SOC15(UVD, 0, mmUVD_RB_WPTR2, lower_32_bits(ring->wptr));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_BASE_LO2), ring->gpu_addr);
|
WREG32_SOC15(UVD, 0, mmUVD_RB_BASE_LO2, ring->gpu_addr);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_BASE_HI2), upper_32_bits(ring->gpu_addr));
|
WREG32_SOC15(UVD, 0, mmUVD_RB_BASE_HI2, upper_32_bits(ring->gpu_addr));
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RB_SIZE2), ring->ring_size / 4);
|
WREG32_SOC15(UVD, 0, mmUVD_RB_SIZE2, ring->ring_size / 4);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1084,7 +1084,7 @@ static int uvd_v7_0_start(struct amdgpu_device *adev)
|
||||||
static void uvd_v7_0_stop(struct amdgpu_device *adev)
|
static void uvd_v7_0_stop(struct amdgpu_device *adev)
|
||||||
{
|
{
|
||||||
/* force RBC into idle state */
|
/* force RBC into idle state */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_CNTL), 0x11010101);
|
WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_CNTL, 0x11010101);
|
||||||
|
|
||||||
/* Stall UMC and register bus before resetting VCPU */
|
/* Stall UMC and register bus before resetting VCPU */
|
||||||
WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_CTRL2),
|
WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_CTRL2),
|
||||||
|
@ -1093,12 +1093,12 @@ static void uvd_v7_0_stop(struct amdgpu_device *adev)
|
||||||
mdelay(1);
|
mdelay(1);
|
||||||
|
|
||||||
/* put VCPU into reset */
|
/* put VCPU into reset */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SOFT_RESET),
|
WREG32_SOC15(UVD, 0, mmUVD_SOFT_RESET,
|
||||||
UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK);
|
UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK);
|
||||||
mdelay(5);
|
mdelay(5);
|
||||||
|
|
||||||
/* disable VCPU clock */
|
/* disable VCPU clock */
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_VCPU_CNTL), 0x0);
|
WREG32_SOC15(UVD, 0, mmUVD_VCPU_CNTL, 0x0);
|
||||||
|
|
||||||
/* Unstall UMC and register bus */
|
/* Unstall UMC and register bus */
|
||||||
WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_CTRL2), 0,
|
WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_CTRL2), 0,
|
||||||
|
@ -1203,7 +1203,7 @@ static int uvd_v7_0_ring_test_ring(struct amdgpu_ring *ring)
|
||||||
unsigned i;
|
unsigned i;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_CONTEXT_ID), 0xCAFEDEAD);
|
WREG32_SOC15(UVD, 0, mmUVD_CONTEXT_ID, 0xCAFEDEAD);
|
||||||
r = amdgpu_ring_alloc(ring, 3);
|
r = amdgpu_ring_alloc(ring, 3);
|
||||||
if (r) {
|
if (r) {
|
||||||
DRM_ERROR("amdgpu: cp failed to lock ring %d (%d).\n",
|
DRM_ERROR("amdgpu: cp failed to lock ring %d (%d).\n",
|
||||||
|
@ -1215,7 +1215,7 @@ static int uvd_v7_0_ring_test_ring(struct amdgpu_ring *ring)
|
||||||
amdgpu_ring_write(ring, 0xDEADBEEF);
|
amdgpu_ring_write(ring, 0xDEADBEEF);
|
||||||
amdgpu_ring_commit(ring);
|
amdgpu_ring_commit(ring);
|
||||||
for (i = 0; i < adev->usec_timeout; i++) {
|
for (i = 0; i < adev->usec_timeout; i++) {
|
||||||
tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_CONTEXT_ID));
|
tmp = RREG32_SOC15(UVD, 0, mmUVD_CONTEXT_ID);
|
||||||
if (tmp == 0xDEADBEEF)
|
if (tmp == 0xDEADBEEF)
|
||||||
break;
|
break;
|
||||||
DRM_UDELAY(1);
|
DRM_UDELAY(1);
|
||||||
|
@ -1413,8 +1413,8 @@ static bool uvd_v7_0_check_soft_reset(void *handle)
|
||||||
|
|
||||||
if (REG_GET_FIELD(tmp, SRBM_STATUS, UVD_RQ_PENDING) ||
|
if (REG_GET_FIELD(tmp, SRBM_STATUS, UVD_RQ_PENDING) ||
|
||||||
REG_GET_FIELD(tmp, SRBM_STATUS, UVD_BUSY) ||
|
REG_GET_FIELD(tmp, SRBM_STATUS, UVD_BUSY) ||
|
||||||
(RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_STATUS) &
|
(RREG32_SOC15(UVD, 0, mmUVD_STATUS) &
|
||||||
AMDGPU_UVD_STATUS_BUSY_MASK)))
|
AMDGPU_UVD_STATUS_BUSY_MASK))
|
||||||
srbm_soft_reset = REG_SET_FIELD(srbm_soft_reset,
|
srbm_soft_reset = REG_SET_FIELD(srbm_soft_reset,
|
||||||
SRBM_SOFT_RESET, SOFT_RESET_UVD, 1);
|
SRBM_SOFT_RESET, SOFT_RESET_UVD, 1);
|
||||||
|
|
||||||
|
@ -1521,9 +1521,9 @@ static void uvd_v7_0_set_sw_clock_gating(struct amdgpu_device *adev)
|
||||||
{
|
{
|
||||||
uint32_t data, data1, data2, suvd_flags;
|
uint32_t data, data1, data2, suvd_flags;
|
||||||
|
|
||||||
data = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_CGC_CTRL));
|
data = RREG32_SOC15(UVD, 0, mmUVD_CGC_CTRL);
|
||||||
data1 = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SUVD_CGC_GATE));
|
data1 = RREG32_SOC15(UVD, 0, mmUVD_SUVD_CGC_GATE);
|
||||||
data2 = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SUVD_CGC_CTRL));
|
data2 = RREG32_SOC15(UVD, 0, mmUVD_SUVD_CGC_CTRL);
|
||||||
|
|
||||||
data &= ~(UVD_CGC_CTRL__CLK_OFF_DELAY_MASK |
|
data &= ~(UVD_CGC_CTRL__CLK_OFF_DELAY_MASK |
|
||||||
UVD_CGC_CTRL__CLK_GATE_DLY_TIMER_MASK);
|
UVD_CGC_CTRL__CLK_GATE_DLY_TIMER_MASK);
|
||||||
|
@ -1567,18 +1567,18 @@ static void uvd_v7_0_set_sw_clock_gating(struct amdgpu_device *adev)
|
||||||
UVD_SUVD_CGC_CTRL__SDB_MODE_MASK);
|
UVD_SUVD_CGC_CTRL__SDB_MODE_MASK);
|
||||||
data1 |= suvd_flags;
|
data1 |= suvd_flags;
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_CGC_CTRL), data);
|
WREG32_SOC15(UVD, 0, mmUVD_CGC_CTRL, data);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_CGC_GATE), 0);
|
WREG32_SOC15(UVD, 0, mmUVD_CGC_GATE, 0);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SUVD_CGC_GATE), data1);
|
WREG32_SOC15(UVD, 0, mmUVD_SUVD_CGC_GATE, data1);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SUVD_CGC_CTRL), data2);
|
WREG32_SOC15(UVD, 0, mmUVD_SUVD_CGC_CTRL, data2);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void uvd_v7_0_set_hw_clock_gating(struct amdgpu_device *adev)
|
static void uvd_v7_0_set_hw_clock_gating(struct amdgpu_device *adev)
|
||||||
{
|
{
|
||||||
uint32_t data, data1, cgc_flags, suvd_flags;
|
uint32_t data, data1, cgc_flags, suvd_flags;
|
||||||
|
|
||||||
data = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_CGC_GATE));
|
data = RREG32_SOC15(UVD, 0, mmUVD_CGC_GATE);
|
||||||
data1 = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SUVD_CGC_GATE));
|
data1 = RREG32_SOC15(UVD, 0, mmUVD_SUVD_CGC_GATE);
|
||||||
|
|
||||||
cgc_flags = UVD_CGC_GATE__SYS_MASK |
|
cgc_flags = UVD_CGC_GATE__SYS_MASK |
|
||||||
UVD_CGC_GATE__UDEC_MASK |
|
UVD_CGC_GATE__UDEC_MASK |
|
||||||
|
@ -1610,8 +1610,8 @@ static void uvd_v7_0_set_hw_clock_gating(struct amdgpu_device *adev)
|
||||||
data |= cgc_flags;
|
data |= cgc_flags;
|
||||||
data1 |= suvd_flags;
|
data1 |= suvd_flags;
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_CGC_GATE), data);
|
WREG32_SOC15(UVD, 0, mmUVD_CGC_GATE, data);
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SUVD_CGC_GATE), data1);
|
WREG32_SOC15(UVD, 0, mmUVD_SUVD_CGC_GATE, data1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void uvd_v7_0_set_bypass_mode(struct amdgpu_device *adev, bool enable)
|
static void uvd_v7_0_set_bypass_mode(struct amdgpu_device *adev, bool enable)
|
||||||
|
@ -1670,7 +1670,7 @@ static int uvd_v7_0_set_powergating_state(void *handle,
|
||||||
if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
|
if (!(adev->pg_flags & AMD_PG_SUPPORT_UVD))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_POWER_STATUS), UVD_POWER_STATUS__UVD_PG_EN_MASK);
|
WREG32_SOC15(UVD, 0, mmUVD_POWER_STATUS, UVD_POWER_STATUS__UVD_PG_EN_MASK);
|
||||||
|
|
||||||
if (state == AMD_PG_STATE_GATE) {
|
if (state == AMD_PG_STATE_GATE) {
|
||||||
uvd_v7_0_stop(adev);
|
uvd_v7_0_stop(adev);
|
||||||
|
|
Loading…
Reference in a new issue