drm amdgpu: SI UVD PACKET_TYPE0
Subsystems (2)
PATCH 1/7 drm amdgpu: SI UVD PACKET_TYPE0
--- drivers/gpu/drm/amd/amdgpu/sid.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/sid.h +4 -3
@@ -1646,9 +1646,10 @@/* * PM4 */ -#define PACKET0 (reg, n) ((RADEON_PACKET_TYPE0 << 30) | \ - (((reg) >> 2) & 0xFFFF) | \ - ((n) & 0x3FFF) << 16) +#define PACKET_TYPE0 0 +#define PACKET0 (reg, n) ((PACKET_TYPE0 << 30) | \ + ((reg) & 0xFFFF) | \ + ((n) & 0x3FFF) << 16)#define CP_PACKET2 0x80000000#define PACKET2_PAD_SHIFT 0#define PACKET2_PAD_MASK (0x3fffffff << 0)
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/7 drm amdgpu: SI UVD registers
--- .../drm/amd/include/asic_reg/uvd/uvd_3_1_d.h | 98 +++ .../include/asic_reg/uvd/uvd_3_1_sh_mask.h | 804 ++++++++++++++++++ 2 files changed, 902 insertions(+) create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_d.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_sh_mask.h
drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_d.h new file +98 -0
@@ -0,0 +1,98 @@ +/* +* UVD_3_1 Register documentation +* +* Copyright (C) 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included +* in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +#ifndef UVD_3_1_D_H +#define UVD_3_1_D_H + +#define mmUVD_SEMA_ADDR_LOW 0x3bc0 +#define mmUVD_SEMA_ADDR_HIGH 0x3bc1 +#define mmUVD_SEMA_CMD 0x3bc2 +#define mmUVD_GPCOM_VCPU_CMD 0x3bc3 +#define mmUVD_GPCOM_VCPU_DATA0 0x3bc4 +#define mmUVD_GPCOM_VCPU_DATA1 0x3bc5 +#define mmUVD_ENGINE_CNTL 0x3bc6 +#define mmUVD_UDEC_ADDR_CONFIG 0x3bd3 +#define mmUVD_UDEC_DB_ADDR_CONFIG 0x3bd4 +#define mmUVD_UDEC_DBW_ADDR_CONFIG 0x3bd5 +#define mmUVD_NO_OP 0x3bff +#define mmUVD_SEMA_CNTL 0x3d00 +#define mmUVD_LMI_EXT40_ADDR 0x3d26 +#define mmUVD_CTX_INDEX 0x3d28 +#define mmUVD_CTX_DATA 0x3d29 +#define mmUVD_CGC_GATE 0x3d2a +#define mmUVD_CGC_STATUS 0x3d2b +#define mmUVD_CGC_CTRL 0x3d2c +#define mmUVD_CGC_UDEC_STATUS 0x3d2d +#define mmUVD_LMI_CTRL2 0x3d3d +#define mmUVD_MASTINT_EN 0x3d40 +#define mmUVD_FW_START 0x3d47 +#define mmUVD_FW_STATUS 0x3d57 +#define mmUVD_LMI_ADDR_EXT 0x3d65 +#define mmUVD_LMI_CTRL 0x3d66 +#define mmUVD_LMI_STATUS 0x3d67 +#define mmUVD_LMI_SWAP_CNTL 0x3d6d +#define mmUVD_MP_SWAP_CNTL 0x3d6f +#define mmUVD_MPC_CNTL 0x3d77 +#define mmUVD_MPC_SET_MUXA0 0x3d79 +#define mmUVD_MPC_SET_MUXA1 0x3d7a +#define mmUVD_MPC_SET_MUXB0 0x3d7b +#define mmUVD_MPC_SET_MUXB1 0x3d7c +#define mmUVD_MPC_SET_MUX 0x3d7d +#define mmUVD_MPC_SET_ALU 0x3d7e +#define mmUVD_VCPU_CACHE_OFFSET0 0x3d82 +#define mmUVD_VCPU_CACHE_SIZE0 0x3d83 +#define mmUVD_VCPU_CACHE_OFFSET1 0x3d84 +#define mmUVD_VCPU_CACHE_SIZE1 0x3d85 +#define mmUVD_VCPU_CACHE_OFFSET2 0x3d86 +#define mmUVD_VCPU_CACHE_SIZE2 0x3d87 +#define mmUVD_VCPU_CNTL 0x3d98 +#define mmUVD_SOFT_RESET 0x3da0 +#define mmUVD_RBC_IB_BASE 0x3da1 +#define mmUVD_RBC_IB_SIZE 0x3da2 +#define mmUVD_RBC_RB_BASE 0x3da3 +#define mmUVD_RBC_RB_RPTR 0x3da4 +#define mmUVD_RBC_RB_WPTR 0x3da5 +#define mmUVD_RBC_RB_WPTR_CNTL 0x3da6 +#define mmUVD_RBC_RB_CNTL 0x3da9 +#define mmUVD_RBC_RB_RPTR_ADDR 0x3daa +#define mmUVD_STATUS 0x3daf +#define mmUVD_SEMA_TIMEOUT_STATUS 0x3db0 +#define mmUVD_SEMA_WAIT_INCOMPLETE_TIMEOUT_CNTL 0x3db1 +#define mmUVD_SEMA_WAIT_FAULT_TIMEOUT_CNTL 0x3db2 +#define mmUVD_SEMA_SIGNAL_INCOMPLETE_TIMEOUT_CNTL 0x3db3 +#define mmUVD_CONTEXT_ID 0x3dbd +#define mmUVD_RBC_IB_SIZE_UPDATE 0x3df1 +#define ixUVD_LMI_CACHE_CTRL 0x9b +#define ixUVD_LMI_SWAP_CNTL2 0xaa +#define ixUVD_LMI_ADDR_EXT2 0xab +#define ixUVD_CGC_MEM_CTRL 0xc0 +#define ixUVD_CGC_CTRL2 0xc1 +#define mmUVD_PGFSM_CONFIG 0x38f8 +#define mmUVD_PGFSM_READ_TILE1 0x38fa +#define mmUVD_PGFSM_READ_TILE2 0x38fb +#define mmUVD_POWER_STATUS 0x38fc +#define ixUVD_MIF_CURR_ADDR_CONFIG 0x48 +#define ixUVD_MIF_REF_ADDR_CONFIG 0x4c +#define ixUVD_MIF_RECON1_ADDR_CONFIG 0x114 + +#endif /* UVD_3_1_D_H */
drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_3_1_sh_mask.h new file +804 -0
804 lines not on this page · raw message
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/7 drm amdgpu: SI UVD v3_1
In reply to Sonny Jiang--- drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 792 ++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/uvd_v3_1.h | 29 + 2 files changed, 821 insertions(+) create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v3_1.h
drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c new file +792 -0
@@ -0,0 +1,792 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: Sonny Jiang <[email protected]> +*/ + +#include <linux/firmware.h> + +#include "amdgpu.h" +#include "amdgpu_uvd.h" +#include "sid.h" + +#include "uvd/uvd_3_1_d.h" +#include "uvd/uvd_3_1_sh_mask.h" + +#include "oss/oss_1_0_d.h" +#include "oss/oss_1_0_sh_mask.h" + +/** +* uvd_v3_1_ring_get_rptr - get read pointer +* +* @ring: amdgpu_ring pointer +* +* Returns the current hardware read pointer +*/ +static uint64_t uvd_v3_1_ring_get_rptr (struct amdgpu_ring *ring) +{ +struct amdgpu_device *adev = ring->adev; + +return RREG32 (mmUVD_RBC_RB_RPTR); +} + +/** +* uvd_v3_1_ring_get_wptr - get write pointer +* +* @ring: amdgpu_ring pointer +* +* Returns the current hardware write pointer +*/ +static uint64_t uvd_v3_1_ring_get_wptr (struct amdgpu_ring *ring) +{ +struct amdgpu_device *adev = ring->adev; + +return RREG32 (mmUVD_RBC_RB_WPTR); +} + +/** +* uvd_v3_1_ring_set_wptr - set write pointer +* +* @ring: amdgpu_ring pointer +* +* Commits the write pointer to the hardware +*/ +static void uvd_v3_1_ring_set_wptr (struct amdgpu_ring *ring) +{ +struct amdgpu_device *adev = ring->adev; + +WREG32 (mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr)); +} + +/** +* uvd_v3_1_ring_emit_ib - execute indirect buffer +* +* @ring: amdgpu_ring pointer +* @ib: indirect buffer to execute +* +* Write ring commands to execute the indirect buffer +*/ +static void uvd_v3_1_ring_emit_ib (struct amdgpu_ring *ring, +struct amdgpu_job *job, +struct amdgpu_ib *ib, +uint32_t flags) +{ +amdgpu_ring_write (ring,PACKET0 (mmUVD_RBC_IB_BASE,0 )); +amdgpu_ring_write (ring, ib->gpu_addr); +amdgpu_ring_write (ring,PACKET0 (mmUVD_RBC_IB_SIZE,0 )); +amdgpu_ring_write (ring, ib->length_dw); +} + +/** +* uvd_v3_1_ring_emit_fence - emit an fence & trap command +* +* @ring: amdgpu_ring pointer +* @fence: fence to emit +* +* Write a fence and a trap command to the ring. +*/ +static void uvd_v3_1_ring_emit_fence (struct amdgpu_ring *ring,u64 addr,u64 seq, +unsigned flags) +{ +WARN_ON (flags &AMDGPU_FENCE_FLAG_64BIT ); + +amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 )); +amdgpu_ring_write (ring, seq); +amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 )); +amdgpu_ring_write (ring, addr &0xffffffff ); +amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA1,0 )); +amdgpu_ring_write (ring,upper_32_bits (addr) &0xff ); +amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD,0 )); +amdgpu_ring_write (ring,0 ); + +amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA0,0 )); +amdgpu_ring_write (ring,0 ); +amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_DATA1,0 )); +amdgpu_ring_write (ring,0 ); +amdgpu_ring_write (ring,PACKET0 (mmUVD_GPCOM_VCPU_CMD,0 )); +amdgpu_ring_write (ring,2 ); +} + +/** +* uvd_v3_1_ring_test_ring - register write test +* +* @ring: amdgpu_ring pointer +* +* Test if we can successfully write to the context register +*/ +static int uvd_v3_1_ring_test_ring (struct amdgpu_ring *ring) +{ +struct amdgpu_device *adev = ring->adev; +uint32_t tmp =0 ; +unsigned i; +int r; + +WREG32 (mmUVD_CONTEXT_ID,0xCAFEDEAD ); + r =amdgpu_ring_alloc (ring,3 ); +if (r) +return r; + +amdgpu_ring_write (ring,PACKET0 (mmUVD_CONTEXT_ID,0 )); +amdgpu_ring_write (ring,0xDEADBEEF ); +amdgpu_ring_commit (ring); +for (i =0 ; i < adev->usec_timeout; i++) { + tmp =RREG32 (mmUVD_CONTEXT_ID); +if (tmp ==0xDEADBEEF ) +break ; +udelay (1 ); + } + +if (i >= adev->usec_timeout) + r = -ETIMEDOUT ; + +return r; +} + +static void uvd_v3_1_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count) +{ +int i; + +WARN_ON (ring->wptr %2 || count %2 ); + +for (i =0 ; i < count /2 ; i++) { +amdgpu_ring_write (ring,PACKET0 (mmUVD_NO_OP,0 )); +amdgpu_ring_write (ring,0 ); + } +} + +static const struct amdgpu_ring_funcs uvd_v3_1_ring_funcs = { + .type =AMDGPU_RING_TYPE_UVD , + .align_mask =0xf , + .support_64bit_ptrs = false, + .no_user_fence = true, + .get_rptr = uvd_v3_1_ring_get_rptr, + .get_wptr = uvd_v3_1_ring_get_wptr, + .set_wptr = uvd_v3_1_ring_set_wptr, + .parse_cs = amdgpu_uvd_ring_parse_cs, + .emit_frame_size = +14 ,/* uvd_v3_1_ring_emit_fence x1 no user fence */ + .emit_ib_size =4 ,/* uvd_v3_1_ring_emit_ib */ + .emit_ib = uvd_v3_1_ring_emit_ib, + .emit_fence = uvd_v3_1_ring_emit_fence, + .test_ring = uvd_v3_1_ring_test_ring, + .test_ib = amdgpu_uvd_ring_test_ib, + .insert_nop = uvd_v3_1_ring_insert_nop, + .pad_ib = amdgpu_ring_generic_pad_ib, + .begin_use = amdgpu_uvd_ring_begin_use, + .end_use = amdgpu_uvd_ring_end_use, +}; + +static void uvd_v3_1_set_ring_funcs (struct amdgpu_device *adev) +{ + adev->uvd.inst->ring.funcs = &uvd_v3_1_ring_funcs; +} + +static void uvd_v3_1_set_dcm (struct amdgpu_device *adev, +bool sw_mode) +{ +u32 tmp, tmp2; + +WREG32_FIELD (UVD_CGC_GATE ,REGS ,0 ); + + tmp =RREG32 (mmUVD_CGC_CTRL); + tmp &= ~(UVD_CGC_CTRL__CLK_OFF_DELAY_MASK |UVD_CGC_CTRL__CLK_GATE_DLY_TIMER_MASK ); + tmp |=UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK | + (1 <<UVD_CGC_CTRL__CLK_GATE_DLY_TIMER__SHIFT ) | + (4 <<UVD_CGC_CTRL__CLK_OFF_DELAY__SHIFT ); + +if (sw_mode) { + tmp &= ~0x7ffff800 ; + tmp2 =UVD_CGC_CTRL2__DYN_OCLK_RAMP_EN_MASK | +UVD_CGC_CTRL2__DYN_RCLK_RAMP_EN_MASK | + (7 <<UVD_CGC_CTRL2__GATER_DIV_ID__SHIFT ); + }else { + tmp |=0x7ffff800 ; + tmp2 =0 ; + } + +WREG32 (mmUVD_CGC_CTRL, tmp); +WREG32_UVD_CTX (ixUVD_CGC_CTRL2, tmp2); +} + +/** +* uvd_v3_1_mc_resume - memory controller programming +* +* @adev: amdgpu_device pointer +* +* Let the UVD memory controller know it's offsets +*/ +static void uvd_v3_1_mc_resume (struct amdgpu_device *adev) +{ +uint64_t addr; +uint32_t size; + +/* programm the VCPU memory controller bits 0-27 */ + addr = (adev->uvd.inst->gpu_addr +AMDGPU_UVD_FIRMWARE_OFFSET ) >>3 ; + size =AMDGPU_UVD_FIRMWARE_SIZE (adev) >>3 ; +WREG32 (mmUVD_VCPU_CACHE_OFFSET0, addr); +WREG32 (mmUVD_VCPU_CACHE_SIZE0, size); + + addr += size; + size =AMDGPU_UVD_HEAP_SIZE >>3 ; +WREG32 (mmUVD_VCPU_CACHE_OFFSET1, addr); +WREG32 (mmUVD_VCPU_CACHE_SIZE1, size); + + addr += size; + size = (AMDGPU_UVD_STACK_SIZE + + (AMDGPU_UVD_SESSION_SIZE * adev->uvd.max_handles)) >>3 ; +WREG32 (mmUVD_VCPU_CACHE_OFFSET2, addr); +WREG32 (mmUVD_VCPU_CACHE_SIZE2, size); + +/* bits 28-31 */ + addr = (adev->uvd.inst->gpu_addr >>28 ) &0xF ; +WREG32 (mmUVD_LMI_ADDR_EXT, (addr <<12 ) | (addr <<0 )); + +/* bits 32-39 */ + addr = (adev->uvd.inst->gpu_addr >>32 ) &0xFF ; +WREG32 (mmUVD_LMI_EXT40_ADDR, addr | (0x9 <<16 ) | (0x1 <<31 )); + +WREG32 (mmUVD_UDEC_ADDR_CONFIG, adev->gfx.config.gb_addr_config); +WREG32 (mmUVD_UDEC_DB_ADDR_CONFIG, adev->gfx.config.gb_addr_config); +WREG32 (mmUVD_UDEC_DBW_ADDR_CONFIG, adev->gfx.config.gb_addr_config); +} + +/** +* uvd_v3_1_fw_validate - FW validation operation +* +* @adev: amdgpu_device pointer +* +* Initialate and check UVD validation. +*/ +static int uvd_v3_1_fw_validate (struct amdgpu_device *adev) +{ +void *ptr; +uint32_t ucode_len, i; +uint32_t keysel; + + ptr = adev->uvd.inst[0 ].cpu_addr; + ptr +=192 +16 ; +memcpy (&ucode_len, ptr,4 ); + ptr += ucode_len; +memcpy (&keysel, ptr,4 ); + +WREG32 (mmUVD_FW_START, keysel); + +for (i =0 ; i <10 ; ++i) { +mdelay (10 ); +if (RREG32 (mmUVD_FW_STATUS) &UVD_FW_STATUS__DONE_MASK ) +break ; + } + +if (i ==10 ) +return -ETIMEDOUT ; + +if (!(RREG32 (mmUVD_FW_STATUS) &UVD_FW_STATUS__PASS_MASK )) +return -EINVAL ; + +for (i =0 ; i <10 ; ++i) { +mdelay (10 ); +if (!(RREG32 (mmUVD_FW_STATUS) &UVD_FW_STATUS__BUSY_MASK )) +break ; + } + +if (i ==10 ) +return -ETIMEDOUT ; + +return 0 ; +} + +/** +* uvd_v3_1_start - start UVD block +* +* @adev: amdgpu_device pointer +* +* Setup and start the UVD block +*/ +static int uvd_v3_1_start (struct amdgpu_device *adev) +{ +struct amdgpu_ring *ring = &adev->uvd.inst->ring; +uint32_t rb_bufsz; +int i, j, r; +u32 tmp; +/* disable byte swapping */ +u32 lmi_swap_cntl =0 ; +u32 mp_swap_cntl =0 ; + +/* set uvd busy */ +WREG32_P (mmUVD_STATUS,1 <<2 , ~(1 <<2 )); + +uvd_v3_1_set_dcm (adev, true); +WREG32 (mmUVD_CGC_GATE,0 ); + +/* take UVD block out of reset */ +WREG32_P (mmSRBM_SOFT_RESET,0 , ~SRBM_SOFT_RESET__SOFT_RESET_UVD_MASK ); +mdelay (5 ); + +/* enable VCPU clock */ +WREG32 (mmUVD_VCPU_CNTL,1 <<9 ); + +/* disable interupt */ +WREG32_P (mmUVD_MASTINT_EN,0 , ~(1 <<1 )); + +#ifdef __BIG_ENDIAN +/* swap (8 in 32) RB and IB */ + lmi_swap_cntl =0xa ; + mp_swap_cntl =0 ; +#endif +WREG32 (mmUVD_LMI_SWAP_CNTL, lmi_swap_cntl); +WREG32 (mmUVD_MP_SWAP_CNTL, mp_swap_cntl); + +/* initialize UVD memory controller */ +WREG32 (mmUVD_LMI_CTRL,0x40 | (1 <<8 ) | (1 <<13 ) | + (1 <<21 ) | (1 <<9 ) | (1 <<20 )); + + tmp =RREG32 (mmUVD_MPC_CNTL); +WREG32 (mmUVD_MPC_CNTL, tmp |0x10 ); + +WREG32 (mmUVD_MPC_SET_MUXA0,0x40c2040 ); +WREG32 (mmUVD_MPC_SET_MUXA1,0x0 ); +WREG32 (mmUVD_MPC_SET_MUXB0,0x40c2040 ); +WREG32 (mmUVD_MPC_SET_MUXB1,0x0 ); +WREG32 (mmUVD_MPC_SET_ALU,0 ); +WREG32 (mmUVD_MPC_SET_MUX,0x88 ); + + tmp =RREG32_UVD_CTX (ixUVD_LMI_CACHE_CTRL); +WREG32_UVD_CTX (ixUVD_LMI_CACHE_CTRL, tmp & (~0x10 )); + +/* enable UMC */ +WREG32_P (mmUVD_LMI_CTRL2,0 , ~(1 <<8 )); + +WREG32_P (mmUVD_SOFT_RESET,0 , ~UVD_SOFT_RESET__LMI_SOFT_RESET_MASK ); + +WREG32_P (mmUVD_SOFT_RESET,0 , ~UVD_SOFT_RESET__LMI_UMC_SOFT_RESET_MASK ); + +WREG32_P (mmUVD_SOFT_RESET,0 , ~UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK ); + +mdelay (10 ); + +for (i =0 ; i <10 ; ++i) { +uint32_t status; +for (j =0 ; j <100 ; ++j) { + status =RREG32 (mmUVD_STATUS); +if (status &2 ) +break ; +mdelay (10 ); + } + r =0 ; +if (status &2 ) +break ; + +DRM_ERROR ("UVD not responding, trying to reset the VCPU!!!\n" ); +WREG32_P (mmUVD_SOFT_RESET,UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK , + ~UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK ); +mdelay (10 ); +WREG32_P (mmUVD_SOFT_RESET,0 , ~UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK ); +mdelay (10 ); + r =-1 ; + } + +if (r) { +DRM_ERROR ("UVD not responding, giving up!!!\n" ); +return r; + } + +/* enable interupt */ +WREG32_P (mmUVD_MASTINT_EN,3 <<1 , ~(3 <<1 )); + +WREG32_P (mmUVD_STATUS,0 , ~(1 <<2 )); + +/* force RBC into idle state */ +WREG32 (mmUVD_RBC_RB_CNTL,0x11010101 ); + +/* Set the write pointer delay */ +WREG32 (mmUVD_RBC_RB_WPTR_CNTL,0 ); + +/* programm the 4GB memory segment for rptr and ring buffer */ +WREG32 (mmUVD_LMI_EXT40_ADDR,upper_32_bits (ring->gpu_addr) | + (0x7 <<16 ) | (0x1 <<31 )); + +/* Initialize the ring buffer's read and write pointers */ +WREG32 (mmUVD_RBC_RB_RPTR,0x0 ); + + ring->wptr =RREG32 (mmUVD_RBC_RB_RPTR); +WREG32 (mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr)); + +/* set the ring address */ +WREG32 (mmUVD_RBC_RB_BASE, ring->gpu_addr); + +/* Set ring buffer size */ + rb_bufsz =order_base_2 (ring->ring_size); + rb_bufsz = (0x1 <<8 ) | rb_bufsz; +WREG32_P (mmUVD_RBC_RB_CNTL, rb_bufsz, ~0x11f1f ); + +return 0 ; +} + +/** +* uvd_v3_1_stop - stop UVD block +* +* @adev: amdgpu_device pointer +* +* stop the UVD block +*/ +static void uvd_v3_1_stop (struct amdgpu_device *adev) +{ +uint32_t i, j; +uint32_t status; + +WREG32 (mmUVD_RBC_RB_CNTL,0x11010101 ); + +for (i =0 ; i <10 ; ++i) { +for (j =0 ; j <100 ; ++j) { + status =RREG32 (mmUVD_STATUS); +if (status &2 ) +break ; +mdelay (1 ); + } +if (status &2 ) +break ; + } + +for (i =0 ; i <10 ; ++i) { +for (j =0 ; j <100 ; ++j) { + status =RREG32 (mmUVD_LMI_STATUS); +if (status &0xf ) +break ; +mdelay (1 ); + } +if (status &0xf ) +break ; + } + +/* Stall UMC and register bus before resetting VCPU */ +WREG32_P (mmUVD_LMI_CTRL2,1 <<8 , ~(1 <<8 )); + +for (i =0 ; i <10 ; ++i) { +for (j =0 ; j <100 ; ++j) { + status =RREG32 (mmUVD_LMI_STATUS); +if (status &0x240 ) +break ; +mdelay (1 ); + } +if (status &0x240 ) +break ; + } + +WREG32_P (0x3D49 ,0 , ~(1 <<2 )); + +WREG32_P (mmUVD_VCPU_CNTL,0 , ~(1 <<9 )); + +/* put LMI, VCPU, RBC etc... into reset */ +WREG32 (mmUVD_SOFT_RESET,UVD_SOFT_RESET__LMI_SOFT_RESET_MASK | +UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK | +UVD_SOFT_RESET__LMI_UMC_SOFT_RESET_MASK ); + +WREG32 (mmUVD_STATUS,0 ); + +uvd_v3_1_set_dcm (adev, false); +} + +static int uvd_v3_1_set_interrupt_state (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +unsigned type, +enum amdgpu_interrupt_state state) +{ +return 0 ; +} + +static int uvd_v3_1_process_interrupt (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +struct amdgpu_iv_entry *entry) +{ +DRM_DEBUG ("IH: UVD TRAP\n" ); +amdgpu_fence_process (&adev->uvd.inst->ring); +return 0 ; +} + + +static const struct amdgpu_irq_src_funcs uvd_v3_1_irq_funcs = { + .set = uvd_v3_1_set_interrupt_state, + .process = uvd_v3_1_process_interrupt, +}; + +static void uvd_v3_1_set_irq_funcs (struct amdgpu_device *adev) +{ + adev->uvd.inst->irq.num_types =1 ; + adev->uvd.inst->irq.funcs = &uvd_v3_1_irq_funcs; +} + + +static int uvd_v3_1_early_init (void *handle) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->uvd.num_uvd_inst =1 ; + +uvd_v3_1_set_ring_funcs (adev); +uvd_v3_1_set_irq_funcs (adev); + +return 0 ; +} + +static int uvd_v3_1_sw_init (void *handle) +{ +struct amdgpu_ring *ring; +struct amdgpu_device *adev = (struct amdgpu_device *)handle; +int r; + +/* UVD TRAP */ + r =amdgpu_irq_add_id (adev,AMDGPU_IRQ_CLIENTID_LEGACY ,124 , &adev->uvd.inst->irq); +if (r) +return r; + + r =amdgpu_uvd_sw_init (adev); +if (r) +return r; + + ring = &adev->uvd.inst->ring; +sprintf (ring->name,"uvd" ); + r =amdgpu_ring_init (adev, ring,512 , &adev->uvd.inst->irq,0 , +AMDGPU_RING_PRIO_DEFAULT ); +if (r) +return r; + + r =amdgpu_uvd_resume (adev); +if (r) +return r; + + r =amdgpu_uvd_entity_init (adev); + +return r; +} + +static int uvd_v3_1_sw_fini (void *handle) +{ +int r; +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + r =amdgpu_uvd_suspend (adev); +if (r) +return r; + +return amdgpu_uvd_sw_fini (adev); +} + +static void uvd_v3_1_enable_mgcg (struct amdgpu_device *adev, +bool enable) +{ +u32 orig, data; + +if (enable && (adev->cg_flags &AMD_CG_SUPPORT_UVD_MGCG )) { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data |=0x3fff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data |=UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + }else { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data &= ~0x3fff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data &= ~UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + } +} + +/** +* uvd_v3_1_hw_init - start and test UVD block +* +* @adev: amdgpu_device pointer +* +* Initialize the hardware, boot up the VCPU and do some testing +*/ +static int uvd_v3_1_hw_init (void *handle) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)handle; +struct amdgpu_ring *ring = &adev->uvd.inst->ring; +uint32_t tmp; +int r; + +uvd_v3_1_mc_resume (adev); + + r =uvd_v3_1_fw_validate (adev); +if (r) { +DRM_ERROR ("amdgpu: UVD Firmware validate fail (%d).\n" , r); +return r; + } + +uvd_v3_1_enable_mgcg (adev, true); +amdgpu_asic_set_uvd_clocks (adev,53300 ,40000 ); + +uvd_v3_1_start (adev); + + r =amdgpu_ring_test_helper (ring); +if (r) +DRM_ERROR ("amdgpu: UVD ring test fail (%d).\n" , r); + goto done; + + r =amdgpu_ring_alloc (ring,10 ); +if (r) { +DRM_ERROR ("amdgpu: ring failed to lock UVD ring (%d).\n" , r); + goto done; + } + + tmp =PACKET0 (mmUVD_SEMA_WAIT_FAULT_TIMEOUT_CNTL,0 ); +amdgpu_ring_write (ring, tmp); +amdgpu_ring_write (ring,0xFFFFF ); + + tmp =PACKET0 (mmUVD_SEMA_WAIT_INCOMPLETE_TIMEOUT_CNTL,0 ); +amdgpu_ring_write (ring, tmp); +amdgpu_ring_write (ring,0xFFFFF ); + + tmp =PACKET0 (mmUVD_SEMA_SIGNAL_INCOMPLETE_TIMEOUT_CNTL,0 ); +amdgpu_ring_write (ring, tmp); +amdgpu_ring_write (ring,0xFFFFF ); + +/* Clear timeout status bits */ +amdgpu_ring_write (ring,PACKET0 (mmUVD_SEMA_TIMEOUT_STATUS,0 )); +amdgpu_ring_write (ring,0x8 ); + +amdgpu_ring_write (ring,PACKET0 (mmUVD_SEMA_CNTL,0 )); +amdgpu_ring_write (ring,3 ); + +amdgpu_ring_commit (ring); + +done: +if (!r) +DRM_INFO ("UVD initialized successfully.\n" ); + +return r; +} + +/** +* uvd_v3_1_hw_fini - stop the hardware block +* +* @adev: amdgpu_device pointer +* +* Stop the UVD block, mark ring as not ready any more +*/ +static int uvd_v3_1_hw_fini (void *handle) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +if (RREG32 (mmUVD_STATUS) !=0 ) +uvd_v3_1_stop (adev); + +return 0 ; +} + +static int uvd_v3_1_suspend (void *handle) +{ +int r; +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + r =uvd_v3_1_hw_fini (adev); +if (r) +return r; + +return amdgpu_uvd_suspend (adev); +} + +static int uvd_v3_1_resume (void *handle) +{ +int r; +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + r =amdgpu_uvd_resume (adev); +if (r) +return r; + +return uvd_v3_1_hw_init (adev); +} + +static bool uvd_v3_1_is_idle (void *handle) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +return !(RREG32 (mmSRBM_STATUS) &SRBM_STATUS__UVD_BUSY_MASK ); +} + +static int uvd_v3_1_wait_for_idle (void *handle) +{ +unsigned i; +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +for (i =0 ; i < adev->usec_timeout; i++) { +if (!(RREG32 (mmSRBM_STATUS) &SRBM_STATUS__UVD_BUSY_MASK )) +return 0 ; + } +return -ETIMEDOUT ; +} + +static int uvd_v3_1_soft_reset (void *handle) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +uvd_v3_1_stop (adev); + +WREG32_P (mmSRBM_SOFT_RESET,SRBM_SOFT_RESET__SOFT_RESET_UVD_MASK , + ~SRBM_SOFT_RESET__SOFT_RESET_UVD_MASK ); +mdelay (5 ); + +return uvd_v3_1_start (adev); +} + +static int uvd_v3_1_set_clockgating_state (void *handle, +enum amd_clockgating_state state) +{ +return 0 ; +} + +static int uvd_v3_1_set_powergating_state (void *handle, +enum amd_powergating_state state) +{ +return 0 ; +} + +static const struct amd_ip_funcs uvd_v3_1_ip_funcs = { + .name ="uvd_v3_1" , + .early_init = uvd_v3_1_early_init, + .late_init =NULL , + .sw_init = uvd_v3_1_sw_init, + .sw_fini = uvd_v3_1_sw_fini, + .hw_init = uvd_v3_1_hw_init, + .hw_fini = uvd_v3_1_hw_fini, + .suspend = uvd_v3_1_suspend, + .resume = uvd_v3_1_resume, + .is_idle = uvd_v3_1_is_idle, + .wait_for_idle = uvd_v3_1_wait_for_idle, + .soft_reset = uvd_v3_1_soft_reset, + .set_clockgating_state = uvd_v3_1_set_clockgating_state, + .set_powergating_state = uvd_v3_1_set_powergating_state, +}; + +const struct amdgpu_ip_block_version uvd_v3_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =3 , + .minor =1 , + .rev =0 , + .funcs = &uvd_v3_1_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/uvd_v3_1.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +#ifndef __UVD_V3_1_H__ +#define __UVD_V3_1_H__ + +extern const struct amdgpu_ip_block_version uvd_v3_1_ip_block; + +#endif
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/7 drm amdgpu: SI UVD context rreg/wreg
In reply to Sonny Jiang--- drivers/gpu/drm/amd/amdgpu/si.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +24 -2
@@ -973,6 +973,28 @@ static void si_smc_wreg(struct amdgpu_device *adev, u32 reg, u32 v)spin_unlock_irqrestore (&adev->smc_idx_lock, flags); } +static u32 si_uvd_ctx_rreg (struct amdgpu_device *adev,u32 reg) +{ +unsigned long flags; +u32 r; + +spin_lock_irqsave (&adev->uvd_ctx_idx_lock, flags); +WREG32 (mmUVD_CTX_INDEX, ((reg) &0x1ff )); + r =RREG32 (mmUVD_CTX_DATA); +spin_unlock_irqrestore (&adev->uvd_ctx_idx_lock, flags); +return r; +} + +static void si_uvd_ctx_wreg (struct amdgpu_device *adev,u32 reg,u32 v) +{ +unsigned long flags; + +spin_lock_irqsave (&adev->uvd_ctx_idx_lock, flags); +WREG32 (mmUVD_CTX_INDEX, ((reg) &0x1ff )); +WREG32 (mmUVD_CTX_DATA, (v)); +spin_unlock_irqrestore (&adev->uvd_ctx_idx_lock, flags); +} +static struct amdgpu_allowed_register_entry si_allowed_read_registers[] = { {GRBM_STATUS }, {mmGRBM_STATUS2},
@@ -1443,8 +1465,8 @@ static int si_common_early_init(void *handle) adev->pcie_wreg = &si_pcie_wreg; adev->pciep_rreg = &si_pciep_rreg; adev->pciep_wreg = &si_pciep_wreg; - adev->uvd_ctx_rreg =NULL ; - adev->uvd_ctx_wreg =NULL ; + adev->uvd_ctx_rreg = si_uvd_ctx_rreg; + adev->uvd_ctx_wreg = si_uvd_ctx_wreg; adev->didt_rreg =NULL ; adev->didt_wreg =NULL ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/7 drm amdgpu: SI UVD add uvd_v3_1 to makefile
In reply to Sonny Jiang--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
@@ -63,7 +63,8 @@ amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \ dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o -amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o si_dpm.o si_smc.o +amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o si_dpm.o si_smc.o \ + uvd_v3_1.o amdgpu-y += \ vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/7 drm amdgpu: SI UVD enable for Oland
In reply to Sonny Jiang--- drivers/gpu/drm/amd/amdgpu/si.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +2 -2
@@ -41,6 +41,7 @@#include "si_dma.h" #include "dce_v6_0.h" #include "si.h" +#include "uvd_v3_1.h" #include "dce_virtual.h" #include "gca/gfx_6_0_d.h" #include "oss/oss_1_0_d.h"
@@ -2209,8 +2210,7 @@ int si_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); else amdgpu_device_ip_block_add(adev, &dce_v6_4_ip_block); - -/* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */ +amdgpu_device_ip_block_add (adev, &uvd_v3_1_ip_block);/* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */ break ;case CHIP_HAINAN :
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/7 drm amdgpu: SI UVD enabled on Verde, Tahiti, Pitcairn
In reply to Sonny Jiang--- drivers/gpu/drm/amd/amdgpu/si.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/si.c +1 -1
@@ -2196,7 +2196,7 @@ int si_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); else amdgpu_device_ip_block_add(adev, &dce_v6_0_ip_block); -/* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */ +amdgpu_device_ip_block_add (adev, &uvd_v3_1_ip_block);/* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */ break ;case CHIP_OLAND :
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 1 line · Sonny Jiang
For the entire series, please add a patch description and your signed-off-by. With that fixed, the series is:
Quoted 25 lines
--- drivers/gpu/drm/amd/amdgpu/sid.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/sid.h +4
-4@@ -1646,9 +1646,10 @@/* * PM4 */ -#define PACKET0 (reg, n) ((RADEON_PACKET_TYPE0 << 30) | \ - (((reg) >> 2) & 0xFFFF) | \ - ((n) & 0x3FFF) << 16) +#define PACKET_TYPE0 0 +#define PACKET0 (reg, n) ((PACKET_TYPE0 << 30) | \ + ((reg) & 0xFFFF) | \ + ((n) & 0x3FFF) << 16)#define CP_PACKET2 0x80000000#define PACKET2_PAD_SHIFT 0#define PACKET2_PAD_MASK (0x3fffffff << 0) --2.25.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Your Signed-of-by line is missing and a one liner commit message would be nice to have. Something like "Cleaning up radeon leftovers."
With that fixed the patch is Reviewed-by: Christian König <[email protected]>.
Am 18.06.20 um 00:00 schrieb Sonny Jiang:
Quoted 12 lines
--- drivers/gpu/drm/amd/amdgpu/sid.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/sid.h +0
-0@@ -1646,9 +1646,10 @@/* * PM4 */
drivers/gpu/drm/amd/amdgpu/sid.h line 1655
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/sid.h +4
-3-#define PACKET0 (reg, n) ((RADEON_PACKET_TYPE0 << 30) | \ - (((reg) >> 2) & 0xFFFF) | \ - ((n) & 0x3FFF) << 16) +#define PACKET_TYPE0 0 +#define PACKET0 (reg, n) ((PACKET_TYPE0 << 30) | \ + ((reg) & 0xFFFF) | \ + ((n) & 0x3FFF) << 16)#define CP_PACKET2 0x80000000#define PACKET2_PAD_SHIFT 0#define PACKET2_PAD_MASK (0x3fffffff << 0)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx