Prep patches for new asics
Subsystems (3)
v2 cover Prep patches for new asics
This set of patches updates various infrastructure in the driver to support new asics.
v2: integrate comments and reviews.
Alex Deucher (3):
drm/amdgpu: switch ih handling to two levels (v2) drm/amdgpu/ih: store the full context id drm/amdgpu: add asic callback to get memsize register
Alex Xie (2):
drm/amdgpu: set GART PTE asic specific flags drm/amdgpu: add a callback to set vm mapping flags
Chunming Zhou (1):
drm/amdgpu: expand pte flags to uint64_t
Huang Rui (3):
drm/amdgpu: add a ucode size member into firmware info drm/amdgpu: add DRM MGCG header
drm/amdgpu: add DF MGCG flag
Junwei Zhang (1):
drm/amdgpu: init aperture definitions (v2)
Ken Wang (3):
drm/amdgpu: change wptr to 64 bits (v2)
drm/amdgpu: add 64bit wb functions
drm/amdgpu: add 64bit doorbell functions (v2)
Leo Liu (9):
drm/amdgpu: add a ring func for end command drm/amdgpu: move amdgpu_uvd structure to uvd header drm/amdgpu: move amdgpu_vce structure to vce header drm/amdgpu: add uvd enc rings
drm/amdgpu: add uvd enc run queue drm/amdgpu: add uvd enc ring type and functions uapi/drm: add AMDGPU_HW_IP_UVD_ENC drm/amdgpu: add AMDGPU_HW_IP_UVD_ENC to info query drm/amdgpu: get cs support of AMDGPU_HW_IP_UVD_ENC
Rex Zhu (1):
drm/amdgpu: check function points valid before use. (v2)
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 91 ++++++++--------------- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 24 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 9 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 105 +++++++++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 111 ++++++++++++++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 55 ++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 19 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 29 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 25 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 ++--- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/cik.c | 6 ++ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 23 +++--- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 17 ++--- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 50 +++++++++---- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 50 ++++++++----- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 25 +++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 33 +++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 37 ++++++++-- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 22 +++--- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 26 ++++--- drivers/gpu/drm/amd/amdgpu/si.c | 7 ++ drivers/gpu/drm/amd/amdgpu/si_dma.c | 18 ++--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 11 +-- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 11 +-- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 12 ++-- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 25 +++---- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 32 +++++---- drivers/gpu/drm/amd/amdgpu/vi.c | 6 ++ drivers/gpu/drm/amd/include/amd_shared.h | 2 + drivers/gpu/drm/amd/include/cgs_linux.h | 19 ++--- include/uapi/drm/amdgpu_drm.h | 3 +- 54 files changed, 730 insertions(+), 358 deletions(-)
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1489073143-23428-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH v2 1/23 drm/amdgpu: init aperture definitions (v2)
From: Junwei Zhang <[email protected]>
v2: agd: move apertures to mc structure
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 24 +++++++++++++++++++++--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 17 +++++++++++++---- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 8 ++++++++ 5 files changed, 55 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +5 -0
@@ -570,6 +570,11 @@ struct amdgpu_mc {uint32_t srbm_soft_reset;struct amdgpu_mode_mc_save save;bool prt_warning; +/* apertures */ +u64 shared_aperture_start; +u64 shared_aperture_end; +u64 private_aperture_start; +u64 private_aperture_end; };/*
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +21 -3
@@ -1889,7 +1889,8 @@ static void gfx_v7_0_config_init(struct amdgpu_device *adev)*/ static void gfx_v7_0_gpu_init (struct amdgpu_device *adev) { -u32 tmp, sh_mem_cfg; +u32 sh_mem_cfg, sh_static_mem_cfg, sh_mem_base; +u32 tmp;int i;WREG32 (mmGRBM_CNTL, (0xff <<GRBM_CNTL__READ_TIMEOUT__SHIFT ));
@@ -1920,15 +1921,32 @@ static void gfx_v7_0_gpu_init(struct amdgpu_device *adev)/* where to put LDS, scratch, GPUVM in FSA64 space */ sh_mem_cfg =REG_SET_FIELD (0 ,SH_MEM_CONFIG ,ALIGNMENT_MODE ,SH_MEM_ALIGNMENT_MODE_UNALIGNED ); + sh_mem_cfg =REG_SET_FIELD (sh_mem_cfg,SH_MEM_CONFIG ,DEFAULT_MTYPE , +MTYPE_NC ); + sh_mem_cfg =REG_SET_FIELD (sh_mem_cfg,SH_MEM_CONFIG ,APE1_MTYPE , +MTYPE_UC ); + sh_mem_cfg =REG_SET_FIELD (sh_mem_cfg,SH_MEM_CONFIG ,PRIVATE_ATC ,0 ); + + sh_static_mem_cfg =REG_SET_FIELD (0 ,SH_STATIC_MEM_CONFIG , +SWIZZLE_ENABLE ,1 ); + sh_static_mem_cfg =REG_SET_FIELD (sh_static_mem_cfg,SH_STATIC_MEM_CONFIG , +ELEMENT_SIZE ,1 ); + sh_static_mem_cfg =REG_SET_FIELD (sh_static_mem_cfg,SH_STATIC_MEM_CONFIG , +INDEX_STRIDE ,3 );mutex_lock (&adev->srbm_mutex); -for (i =0 ; i <16 ; i++) { +for (i =0 ; i < adev->vm_manager.num_ids; i++) { +if (i ==0 ) + sh_mem_base =0 ; +else + sh_mem_base = adev->mc.shared_aperture_start >>48 ;cik_srbm_select (adev,0 ,0 ,0 , i);/* CP and shaders */ WREG32 (mmSH_MEM_CONFIG, sh_mem_cfg);WREG32 (mmSH_MEM_APE1_BASE,1 );WREG32 (mmSH_MEM_APE1_LIMIT,0 ); -WREG32 (mmSH_MEM_BASES,0 ); +WREG32 (mmSH_MEM_BASES, sh_mem_base); +WREG32 (mmSH_STATIC_MEM_CONFIG, sh_static_mem_cfg); }cik_srbm_select (adev,0 ,0 ,0 ,0 );mutex_unlock (&adev->srbm_mutex);
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +13 -4
@@ -3859,7 +3859,7 @@ static void gfx_v8_0_config_init(struct amdgpu_device *adev)static void gfx_v8_0_gpu_init (struct amdgpu_device *adev) { -u32 tmp; +u32 tmp, sh_static_mem_cfg;int i;WREG32_FIELD (GRBM_CNTL ,READ_TIMEOUT ,0xFF );
@@ -3874,8 +3874,14 @@ static void gfx_v8_0_gpu_init(struct amdgpu_device *adev)/* XXX SH_MEM regs */ /* where to put LDS, scratch, GPUVM in FSA64 space */ + sh_static_mem_cfg =REG_SET_FIELD (0 ,SH_STATIC_MEM_CONFIG , +SWIZZLE_ENABLE ,1 ); + sh_static_mem_cfg =REG_SET_FIELD (sh_static_mem_cfg,SH_STATIC_MEM_CONFIG , +ELEMENT_SIZE ,1 ); + sh_static_mem_cfg =REG_SET_FIELD (sh_static_mem_cfg,SH_STATIC_MEM_CONFIG , +INDEX_STRIDE ,3 );mutex_lock (&adev->srbm_mutex); -for (i =0 ; i <16 ; i++) { +for (i =0 ; i < adev->vm_manager.num_ids; i++) {vi_srbm_select (adev,0 ,0 ,0 , i);/* CP and shaders */ if (i ==0 ) {
@@ -3884,17 +3890,20 @@ static void gfx_v8_0_gpu_init(struct amdgpu_device *adev) tmp =REG_SET_FIELD (tmp,SH_MEM_CONFIG ,ALIGNMENT_MODE ,SH_MEM_ALIGNMENT_MODE_UNALIGNED );WREG32 (mmSH_MEM_CONFIG, tmp); +WREG32 (mmSH_MEM_BASES,0 ); }else { tmp =REG_SET_FIELD (0 ,SH_MEM_CONFIG ,DEFAULT_MTYPE ,MTYPE_NC ); - tmp =REG_SET_FIELD (tmp,SH_MEM_CONFIG ,APE1_MTYPE ,MTYPE_NC ); + tmp =REG_SET_FIELD (tmp,SH_MEM_CONFIG ,APE1_MTYPE ,MTYPE_UC ); tmp =REG_SET_FIELD (tmp,SH_MEM_CONFIG ,ALIGNMENT_MODE ,SH_MEM_ALIGNMENT_MODE_UNALIGNED );WREG32 (mmSH_MEM_CONFIG, tmp); + tmp = adev->mc.shared_aperture_start >>48 ; +WREG32 (mmSH_MEM_BASES, tmp); }WREG32 (mmSH_MEM_APE1_BASE,1 );WREG32 (mmSH_MEM_APE1_LIMIT,0 ); -WREG32 (mmSH_MEM_BASES,0 ); +WREG32 (mmSH_STATIC_MEM_CONFIG, sh_static_mem_cfg); }vi_srbm_select (adev,0 ,0 ,0 ,0 );mutex_unlock (&adev->srbm_mutex);
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +8 -0
@@ -934,6 +934,14 @@ static int gmc_v7_0_early_init(void *handle)gmc_v7_0_set_gart_funcs (adev);gmc_v7_0_set_irq_funcs (adev); + adev->mc.shared_aperture_start =0x2000000000000000ULL ; + adev->mc.shared_aperture_end = + adev->mc.shared_aperture_start + (4ULL <<30 ) -1 ; + adev->mc.private_aperture_start = + adev->mc.shared_aperture_end +1 ; + adev->mc.private_aperture_end = + adev->mc.private_aperture_start + (4ULL <<30 ) -1 ; +return 0 ; }
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +8 -0
@@ -939,6 +939,14 @@ static int gmc_v8_0_early_init(void *handle)gmc_v8_0_set_gart_funcs (adev);gmc_v8_0_set_irq_funcs (adev); + adev->mc.shared_aperture_start =0x2000000000000000ULL ; + adev->mc.shared_aperture_end = + adev->mc.shared_aperture_start + (4ULL <<30 ) -1 ; + adev->mc.private_aperture_start = + adev->mc.shared_aperture_end +1 ; + adev->mc.private_aperture_end = + adev->mc.private_aperture_start + (4ULL <<30 ) -1 ; +return 0 ; }
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 2/23 drm/amdgpu: change wptr to 64 bits (v2)
In reply to a message not in the archiveFrom: Ken Wang <[email protected]>
Newer asics need 64 bit wptrs. If the wptr is now smaller than the rptr that doesn't indicate a wrap-around anymore.
v2: integrate Christian's comments.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 5 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 12 +++++++----- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 12 +++++++----- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 11 ++++++----- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 18 ++++++++++-------- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 23 +++++++++++++---------- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 ++++++----- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 15 ++++++++------- drivers/gpu/drm/amd/amdgpu/si_dma.c | 12 +++++++----- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 10 ++++++---- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 17 +++++++++-------- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 24 +++++++++++++----------- 15 files changed, 107 insertions(+), 83 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -1601,7 +1601,7 @@ static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v) {if (ring->count_dw <=0 )DRM_ERROR ("amdgpu: writing more dwords to the ring than expected!\n" ); - ring->ring[ring->wptr++] = v; + ring->ring[ring->wptr++ & ring->buf_mask] = v; ring->wptr &= ring->ptr_mask; ring->count_dw--; }
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +4 -1
@@ -232,7 +232,10 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, }amdgpu_ring_clear_ring (ring); } - ring->ptr_mask = (ring->ring_size /4 ) -1 ; + ring->buf_mask = (ring->ring_size /4 ) -1 ; + ring->ptr_mask = ring->funcs->support_64bit_ptrs ? +0xffffffffffffffff : ring->buf_mask; + ring->max_dw = max_dw;if (amdgpu_debugfs_ring_init (adev, ring)) {
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +7 -5
@@ -96,10 +96,11 @@ struct amdgpu_ring_funcs {enum amdgpu_ring_type type;uint32_t align_mask;u32 nop; +bool support_64bit_ptrs;/* ring read/write ptr handling */ -u32 (*get_rptr)(struct amdgpu_ring *ring); -u32 (*get_wptr)(struct amdgpu_ring *ring); +u64 (*get_rptr)(struct amdgpu_ring *ring); +u64 (*get_wptr)(struct amdgpu_ring *ring);void (*set_wptr)(struct amdgpu_ring *ring);/* validating and patching of IBs */ int (*parse_cs)(struct amdgpu_cs_parser *p,uint32_t ib_idx);
@@ -148,13 +149,14 @@ struct amdgpu_ring {struct amdgpu_bo *ring_obj;volatile uint32_t *ring;unsigned rptr_offs; -unsigned wptr; -unsigned wptr_old; +u64 wptr; +u64 wptr_old;unsigned ring_size;unsigned max_dw;int count_dw;uint64_t gpu_addr; -uint32_t ptr_mask; +uint64_t ptr_mask; +uint32_t buf_mask;bool ready;u32 idx;u32 me;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +7 -5
@@ -158,7 +158,7 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)* * Get the current rptr from the hardware (CIK+). */ -static uint32_t cik_sdma_ring_get_rptr (struct amdgpu_ring *ring) +static uint64_t cik_sdma_ring_get_rptr (struct amdgpu_ring *ring) {u32 rptr;
@@ -174,7 +174,7 @@ static uint32_t cik_sdma_ring_get_rptr(struct amdgpu_ring *ring)* * Get the current wptr from the hardware (CIK+). */ -static uint32_t cik_sdma_ring_get_wptr (struct amdgpu_ring *ring) +static uint64_t cik_sdma_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;u32 me = (ring == &adev->sdma.instance[0 ].ring) ?0 :1 ;
@@ -194,7 +194,8 @@ static void cik_sdma_ring_set_wptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;u32 me = (ring == &adev->sdma.instance[0 ].ring) ?0 :1 ; -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[me], (ring->wptr <<2 ) &0x3fffc ); +WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[me], + (lower_32_bits (ring->wptr) <<2 ) &0x3fffc ); }static void cik_sdma_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count)
@@ -225,7 +226,7 @@ static void cik_sdma_ring_emit_ib(struct amdgpu_ring *ring,u32 extra_bits = vm_id &0xf ;/* IB packet must end on a 8 DW boundary */ -cik_sdma_ring_insert_nop (ring, (12 - (ring->wptr &7 )) %8 ); +cik_sdma_ring_insert_nop (ring, (12 - (lower_32_bits (ring->wptr) &7 )) %8 );amdgpu_ring_write (ring,SDMA_PACKET (SDMA_OPCODE_INDIRECT_BUFFER ,0 , extra_bits));amdgpu_ring_write (ring, ib->gpu_addr &0xffffffe0 );/* base must be 32 byte aligned */
@@ -432,7 +433,7 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev)WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i], ring->gpu_addr >>40 ); ring->wptr =0 ; -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i], ring->wptr <<2 ); +WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i],lower_32_bits (ring->wptr) <<2 );/* enable DMA RB */ WREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i],
@@ -1209,6 +1210,7 @@ static const struct amdgpu_ring_funcs cik_sdma_ring_funcs = { .type = AMDGPU_RING_TYPE_SDMA, .align_mask = 0xf, .nop = SDMA_PACKET(SDMA_OPCODE_NOP, 0, 0), + .support_64bit_ptrs = false, .get_rptr = cik_sdma_ring_get_rptr, .get_wptr = cik_sdma_ring_get_wptr, .set_wptr = cik_sdma_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +6 -5
@@ -2192,12 +2192,12 @@ static int gfx_v6_0_cp_gfx_resume(struct amdgpu_device *adev)return 0 ; } -static u32 gfx_v6_0_ring_get_rptr (struct amdgpu_ring *ring) +static u64 gfx_v6_0_ring_get_rptr (struct amdgpu_ring *ring) {return ring->adev->wb.wb[ring->rptr_offs]; } -static u32 gfx_v6_0_ring_get_wptr (struct amdgpu_ring *ring) +static u64 gfx_v6_0_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -2215,7 +2215,7 @@ static void gfx_v6_0_ring_set_wptr_gfx(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -WREG32 (mmCP_RB0_WPTR, ring->wptr); +WREG32 (mmCP_RB0_WPTR,lower_32_bits (ring->wptr)); (void )RREG32 (mmCP_RB0_WPTR); }
@@ -2224,10 +2224,10 @@ static void gfx_v6_0_ring_set_wptr_compute(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->gfx.compute_ring[0 ]) { -WREG32 (mmCP_RB1_WPTR, ring->wptr); +WREG32 (mmCP_RB1_WPTR,lower_32_bits (ring->wptr)); (void )RREG32 (mmCP_RB1_WPTR); }else if (ring == &adev->gfx.compute_ring[1 ]) { -WREG32 (mmCP_RB2_WPTR, ring->wptr); +WREG32 (mmCP_RB2_WPTR,lower_32_bits (ring->wptr)); (void )RREG32 (mmCP_RB2_WPTR); }else {BUG ();
@@ -3631,6 +3631,7 @@ static const struct amdgpu_ring_funcs gfx_v6_0_ring_funcs_gfx = { .type = AMDGPU_RING_TYPE_GFX, .align_mask = 0xff, .nop = 0x80000000, + .support_64bit_ptrs = false, .get_rptr = gfx_v6_0_ring_get_rptr, .get_wptr = gfx_v6_0_ring_get_wptr, .set_wptr = gfx_v6_0_ring_set_wptr_gfx,
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +10 -8
@@ -2629,7 +2629,7 @@ static int gfx_v7_0_cp_gfx_resume(struct amdgpu_device *adev)/* Initialize the ring buffer's read and write pointers */ WREG32 (mmCP_RB0_CNTL, tmp |CP_RB0_CNTL__RB_RPTR_WR_ENA_MASK ); ring->wptr =0 ; -WREG32 (mmCP_RB0_WPTR, ring->wptr); +WREG32 (mmCP_RB0_WPTR,lower_32_bits (ring->wptr));/* set the wb address wether it's enabled or not */ rptr_addr = adev->wb.gpu_addr + (ring->rptr_offs *4 );
@@ -2658,12 +2658,12 @@ static int gfx_v7_0_cp_gfx_resume(struct amdgpu_device *adev)return 0 ; } -static u32 gfx_v7_0_ring_get_rptr (struct amdgpu_ring *ring) +static u64 gfx_v7_0_ring_get_rptr (struct amdgpu_ring *ring) {return ring->adev->wb.wb[ring->rptr_offs]; } -static u32 gfx_v7_0_ring_get_wptr_gfx (struct amdgpu_ring *ring) +static u64 gfx_v7_0_ring_get_wptr_gfx (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -2674,11 +2674,11 @@ static void gfx_v7_0_ring_set_wptr_gfx(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -WREG32 (mmCP_RB0_WPTR, ring->wptr); +WREG32 (mmCP_RB0_WPTR,lower_32_bits (ring->wptr)); (void )RREG32 (mmCP_RB0_WPTR); } -static u32 gfx_v7_0_ring_get_wptr_compute (struct amdgpu_ring *ring) +static u64 gfx_v7_0_ring_get_wptr_compute (struct amdgpu_ring *ring) {/* XXX check if swapping is necessary on BE */ return ring->adev->wb.wb[ring->wptr_offs];
@@ -2689,8 +2689,8 @@ static void gfx_v7_0_ring_set_wptr_compute(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;/* XXX check if swapping is necessary on BE */ - adev->wb.wb[ring->wptr_offs] = ring->wptr; -WDOORBELL32 (ring->doorbell_index, ring->wptr); + adev->wb.wb[ring->wptr_offs] =lower_32_bits (ring->wptr); +WDOORBELL32 (ring->doorbell_index,lower_32_bits (ring->wptr)); }/**
@@ -3160,7 +3160,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev)/* read and write pointers, similar to CP_RB0_WPTR/_RPTR */ ring->wptr =0 ; - mqd->queue_state.cp_hqd_pq_wptr = ring->wptr; + mqd->queue_state.cp_hqd_pq_wptr =lower_32_bits (ring->wptr);WREG32 (mmCP_HQD_PQ_WPTR, mqd->queue_state.cp_hqd_pq_wptr); mqd->queue_state.cp_hqd_pq_rptr =RREG32 (mmCP_HQD_PQ_RPTR);
@@ -5206,6 +5206,7 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_gfx = { .type = AMDGPU_RING_TYPE_GFX, .align_mask = 0xff, .nop = PACKET3(PACKET3_NOP, 0x3FFF), + .support_64bit_ptrs = false, .get_rptr = gfx_v7_0_ring_get_rptr, .get_wptr = gfx_v7_0_ring_get_wptr_gfx, .set_wptr = gfx_v7_0_ring_set_wptr_gfx,
@@ -5236,6 +5237,7 @@ static const struct amdgpu_ring_funcs gfx_v7_0_ring_funcs_compute = { .type = AMDGPU_RING_TYPE_COMPUTE, .align_mask = 0xff, .nop = PACKET3(PACKET3_NOP, 0x3FFF), + .support_64bit_ptrs = false, .get_rptr = gfx_v7_0_ring_get_rptr, .get_wptr = gfx_v7_0_ring_get_wptr_compute, .set_wptr = gfx_v7_0_ring_set_wptr_compute,
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +13 -10
@@ -4490,7 +4490,7 @@ static int gfx_v8_0_cp_gfx_resume(struct amdgpu_device *adev)/* Initialize the ring buffer's read and write pointers */ WREG32 (mmCP_RB0_CNTL, tmp |CP_RB0_CNTL__RB_RPTR_WR_ENA_MASK ); ring->wptr =0 ; -WREG32 (mmCP_RB0_WPTR, ring->wptr); +WREG32 (mmCP_RB0_WPTR,lower_32_bits (ring->wptr));/* set the wb address wether it's enabled or not */ rptr_addr = adev->wb.gpu_addr + (ring->rptr_offs *4 );
@@ -5204,7 +5204,7 @@ static int gfx_v8_0_cp_compute_resume(struct amdgpu_device *adev)/* reset read and write pointers, similar to CP_RB0_WPTR/_RPTR */ ring->wptr =0 ; - mqd->cp_hqd_pq_wptr = ring->wptr; + mqd->cp_hqd_pq_wptr =lower_32_bits (ring->wptr);WREG32 (mmCP_HQD_PQ_WPTR, mqd->cp_hqd_pq_wptr); mqd->cp_hqd_pq_rptr =RREG32 (mmCP_HQD_PQ_RPTR);
@@ -6458,12 +6458,12 @@ static int gfx_v8_0_set_clockgating_state(void *handle,return 0 ; } -static u32 gfx_v8_0_ring_get_rptr (struct amdgpu_ring *ring) +static u64 gfx_v8_0_ring_get_rptr (struct amdgpu_ring *ring) {return ring->adev->wb.wb[ring->rptr_offs]; } -static u32 gfx_v8_0_ring_get_wptr_gfx (struct amdgpu_ring *ring) +static u64 gfx_v8_0_ring_get_wptr_gfx (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -6480,10 +6480,10 @@ static void gfx_v8_0_ring_set_wptr_gfx(struct amdgpu_ring *ring)if (ring->use_doorbell) {/* XXX check if swapping is necessary on BE */ - adev->wb.wb[ring->wptr_offs] = ring->wptr; -WDOORBELL32 (ring->doorbell_index, ring->wptr); + adev->wb.wb[ring->wptr_offs] =lower_32_bits (ring->wptr); +WDOORBELL32 (ring->doorbell_index,lower_32_bits (ring->wptr)); }else { -WREG32 (mmCP_RB0_WPTR, ring->wptr); +WREG32 (mmCP_RB0_WPTR,lower_32_bits (ring->wptr)); (void )RREG32 (mmCP_RB0_WPTR); } }
@@ -6671,7 +6671,7 @@ static void gfx_v8_0_ring_emit_vm_flush(struct amdgpu_ring *ring, } } -static u32 gfx_v8_0_ring_get_wptr_compute (struct amdgpu_ring *ring) +static u64 gfx_v8_0_ring_get_wptr_compute (struct amdgpu_ring *ring) {return ring->adev->wb.wb[ring->wptr_offs]; }
@@ -6681,8 +6681,8 @@ static void gfx_v8_0_ring_set_wptr_compute(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;/* XXX check if swapping is necessary on BE */ - adev->wb.wb[ring->wptr_offs] = ring->wptr; -WDOORBELL32 (ring->doorbell_index, ring->wptr); + adev->wb.wb[ring->wptr_offs] =lower_32_bits (ring->wptr); +WDOORBELL32 (ring->doorbell_index,lower_32_bits (ring->wptr)); } static void gfx_v8_0_ring_emit_fence_compute(struct amdgpu_ring *ring,
@@ -7037,6 +7037,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = { .type = AMDGPU_RING_TYPE_GFX, .align_mask = 0xff, .nop = PACKET3(PACKET3_NOP, 0x3FFF), + .support_64bit_ptrs = false, .get_rptr = gfx_v8_0_ring_get_rptr, .get_wptr = gfx_v8_0_ring_get_wptr_gfx, .set_wptr = gfx_v8_0_ring_set_wptr_gfx,
@@ -7069,6 +7070,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_compute = { .type = AMDGPU_RING_TYPE_COMPUTE, .align_mask = 0xff, .nop = PACKET3(PACKET3_NOP, 0x3FFF), + .support_64bit_ptrs = false, .get_rptr = gfx_v8_0_ring_get_rptr, .get_wptr = gfx_v8_0_ring_get_wptr_compute, .set_wptr = gfx_v8_0_ring_set_wptr_compute,
@@ -7097,6 +7099,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_kiq = { .type = AMDGPU_RING_TYPE_KIQ, .align_mask = 0xff, .nop = PACKET3(PACKET3_NOP, 0x3FFF), + .support_64bit_ptrs = false, .get_rptr = gfx_v8_0_ring_get_rptr, .get_wptr = gfx_v8_0_ring_get_wptr_compute, .set_wptr = gfx_v8_0_ring_set_wptr_compute,
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +6 -5
@@ -186,7 +186,7 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)* * Get the current rptr from the hardware (VI+). */ -static uint32_t sdma_v2_4_ring_get_rptr (struct amdgpu_ring *ring) +static uint64_t sdma_v2_4_ring_get_rptr (struct amdgpu_ring *ring) {/* XXX check if swapping is necessary on BE */ return ring->adev->wb.wb[ring->rptr_offs] >>2 ;
@@ -199,7 +199,7 @@ static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)* * Get the current wptr from the hardware (VI+). */ -static uint32_t sdma_v2_4_ring_get_wptr (struct amdgpu_ring *ring) +static uint64_t sdma_v2_4_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;int me = (ring == &ring->adev->sdma.instance[0 ].ring) ?0 :1 ;
@@ -220,7 +220,7 @@ static void sdma_v2_4_ring_set_wptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;int me = (ring == &ring->adev->sdma.instance[0 ].ring) ?0 :1 ; -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[me], ring->wptr <<2 ); +WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[me],lower_32_bits (ring->wptr) <<2 ); }static void sdma_v2_4_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count)
@@ -251,7 +251,7 @@ static void sdma_v2_4_ring_emit_ib(struct amdgpu_ring *ring,u32 vmid = vm_id &0xf ;/* IB packet must end on a 8 DW boundary */ -sdma_v2_4_ring_insert_nop (ring, (10 - (ring->wptr &7 )) %8 ); +sdma_v2_4_ring_insert_nop (ring, (10 - (lower_32_bits (ring->wptr) &7 )) %8 );amdgpu_ring_write (ring,SDMA_PKT_HEADER_OP (SDMA_OP_INDIRECT ) |SDMA_PKT_INDIRECT_HEADER_VMID (vmid));
@@ -466,7 +466,7 @@ static int sdma_v2_4_gfx_resume(struct amdgpu_device *adev)WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i], ring->gpu_addr >>40 ); ring->wptr =0 ; -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i], ring->wptr <<2 ); +WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i],lower_32_bits (ring->wptr) <<2 );/* enable DMA RB */ rb_cntl =REG_SET_FIELD (rb_cntl,SDMA0_GFX_RB_CNTL ,RB_ENABLE ,1 );
@@ -1206,6 +1206,7 @@ static const struct amdgpu_ring_funcs sdma_v2_4_ring_funcs = { .type = AMDGPU_RING_TYPE_SDMA, .align_mask = 0xf, .nop = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP), + .support_64bit_ptrs = false, .get_rptr = sdma_v2_4_ring_get_rptr, .get_wptr = sdma_v2_4_ring_get_wptr, .set_wptr = sdma_v2_4_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +8 -7
@@ -337,7 +337,7 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)* * Get the current rptr from the hardware (VI+). */ -static uint32_t sdma_v3_0_ring_get_rptr (struct amdgpu_ring *ring) +static uint64_t sdma_v3_0_ring_get_rptr (struct amdgpu_ring *ring) {/* XXX check if swapping is necessary on BE */ return ring->adev->wb.wb[ring->rptr_offs] >>2 ;
@@ -350,7 +350,7 @@ static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)* * Get the current wptr from the hardware (VI+). */ -static uint32_t sdma_v3_0_ring_get_wptr (struct amdgpu_ring *ring) +static uint64_t sdma_v3_0_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;u32 wptr;
@@ -380,12 +380,12 @@ static void sdma_v3_0_ring_set_wptr(struct amdgpu_ring *ring)if (ring->use_doorbell) {/* XXX check if swapping is necessary on BE */ - adev->wb.wb[ring->wptr_offs] = ring->wptr <<2 ; -WDOORBELL32 (ring->doorbell_index, ring->wptr <<2 ); + adev->wb.wb[ring->wptr_offs] =lower_32_bits (ring->wptr) <<2 ; +WDOORBELL32 (ring->doorbell_index,lower_32_bits (ring->wptr) <<2 ); }else {int me = (ring == &ring->adev->sdma.instance[0 ].ring) ?0 :1 ; -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[me], ring->wptr <<2 ); +WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[me],lower_32_bits (ring->wptr) <<2 ); } }
@@ -417,7 +417,7 @@ static void sdma_v3_0_ring_emit_ib(struct amdgpu_ring *ring,u32 vmid = vm_id &0xf ;/* IB packet must end on a 8 DW boundary */ -sdma_v3_0_ring_insert_nop (ring, (10 - (ring->wptr &7 )) %8 ); +sdma_v3_0_ring_insert_nop (ring, (10 - (lower_32_bits (ring->wptr) &7 )) %8 );amdgpu_ring_write (ring,SDMA_PKT_HEADER_OP (SDMA_OP_INDIRECT ) |SDMA_PKT_INDIRECT_HEADER_VMID (vmid));
@@ -660,7 +660,7 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)WREG32 (mmSDMA0_GFX_RB_BASE_HI + sdma_offsets[i], ring->gpu_addr >>40 ); ring->wptr =0 ; -WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i], ring->wptr <<2 ); +WREG32 (mmSDMA0_GFX_RB_WPTR + sdma_offsets[i],lower_32_bits (ring->wptr) <<2 ); doorbell =RREG32 (mmSDMA0_GFX_DOORBELL + sdma_offsets[i]);
@@ -1579,6 +1579,7 @@ static const struct amdgpu_ring_funcs sdma_v3_0_ring_funcs = { .type = AMDGPU_RING_TYPE_SDMA, .align_mask = 0xf, .nop = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP), + .support_64bit_ptrs = false, .get_rptr = sdma_v3_0_ring_get_rptr, .get_wptr = sdma_v3_0_ring_get_wptr, .set_wptr = sdma_v3_0_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/si_dma.c +7 -5
@@ -37,12 +37,12 @@ static void si_dma_set_buffer_funcs(struct amdgpu_device *adev);static void si_dma_set_vm_pte_funcs (struct amdgpu_device *adev);static void si_dma_set_irq_funcs (struct amdgpu_device *adev); -static uint32_t si_dma_ring_get_rptr (struct amdgpu_ring *ring) +static uint64_t si_dma_ring_get_rptr (struct amdgpu_ring *ring) {return ring->adev->wb.wb[ring->rptr_offs>>2 ]; } -static uint32_t si_dma_ring_get_wptr (struct amdgpu_ring *ring) +static uint64_t si_dma_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;u32 me = (ring == &adev->sdma.instance[0 ].ring) ?0 :1 ;
@@ -55,7 +55,8 @@ static void si_dma_ring_set_wptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;u32 me = (ring == &adev->sdma.instance[0 ].ring) ?0 :1 ; -WREG32 (DMA_RB_WPTR + sdma_offsets[me], (ring->wptr <<2 ) &0x3fffc ); +WREG32 (DMA_RB_WPTR + sdma_offsets[me], + (lower_32_bits (ring->wptr) <<2 ) &0x3fffc ); } static void si_dma_ring_emit_ib(struct amdgpu_ring *ring,
@@ -65,7 +66,7 @@ static void si_dma_ring_emit_ib(struct amdgpu_ring *ring,/* The indirect buffer packet must end on an 8 DW boundary in the DMA ring. * Pad as necessary with NOPs. */ -while ((ring->wptr &7 ) !=5 ) +while ((lower_32_bits (ring->wptr) &7 ) !=5 )amdgpu_ring_write (ring,DMA_PACKET (DMA_PACKET_NOP ,0 ,0 ,0 ,0 ));amdgpu_ring_write (ring,DMA_IB_PACKET (DMA_PACKET_INDIRECT_BUFFER , vm_id,0 ));amdgpu_ring_write (ring, (ib->gpu_addr &0xFFFFFFE0 ));
@@ -184,7 +185,7 @@ static int si_dma_start(struct amdgpu_device *adev)WREG32 (DMA_CNTL + sdma_offsets[i], dma_cntl); ring->wptr =0 ; -WREG32 (DMA_RB_WPTR + sdma_offsets[i], ring->wptr <<2 ); +WREG32 (DMA_RB_WPTR + sdma_offsets[i],lower_32_bits (ring->wptr) <<2 );WREG32 (DMA_RB_CNTL + sdma_offsets[i], rb_cntl |DMA_RB_ENABLE ); ring->ready = true;
@@ -766,6 +767,7 @@ static const struct amdgpu_ring_funcs si_dma_ring_funcs = { .type = AMDGPU_RING_TYPE_SDMA, .align_mask = 0xf, .nop = DMA_PACKET(DMA_PACKET_NOP, 0, 0, 0, 0), + .support_64bit_ptrs = false, .get_rptr = si_dma_ring_get_rptr, .get_wptr = si_dma_ring_get_wptr, .set_wptr = si_dma_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +5 -4
@@ -55,7 +55,7 @@ static void uvd_v4_2_set_dcm(struct amdgpu_device *adev,* * Returns the current hardware read pointer */ -static uint32_t uvd_v4_2_ring_get_rptr (struct amdgpu_ring *ring) +static uint64_t uvd_v4_2_ring_get_rptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -69,7 +69,7 @@ static uint32_t uvd_v4_2_ring_get_rptr(struct amdgpu_ring *ring)* * Returns the current hardware write pointer */ -static uint32_t uvd_v4_2_ring_get_wptr (struct amdgpu_ring *ring) +static uint64_t uvd_v4_2_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -87,7 +87,7 @@ static void uvd_v4_2_ring_set_wptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -WREG32 (mmUVD_RBC_RB_WPTR, ring->wptr); +WREG32 (mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr)); }static int uvd_v4_2_early_init (void *handle)
@@ -367,7 +367,7 @@ static int uvd_v4_2_start(struct amdgpu_device *adev)WREG32 (mmUVD_RBC_RB_RPTR,0x0 ); ring->wptr =RREG32 (mmUVD_RBC_RB_RPTR); -WREG32 (mmUVD_RBC_RB_WPTR, ring->wptr); +WREG32 (mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr));/* set the ring address */ WREG32 (mmUVD_RBC_RB_BASE, ring->gpu_addr);
@@ -770,6 +770,7 @@ static const struct amdgpu_ring_funcs uvd_v4_2_ring_funcs = { .type = AMDGPU_RING_TYPE_UVD, .align_mask = 0xf, .nop = PACKET0(mmUVD_NO_OP, 0), + .support_64bit_ptrs = false, .get_rptr = uvd_v4_2_ring_get_rptr, .get_wptr = uvd_v4_2_ring_get_wptr, .set_wptr = uvd_v4_2_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +5 -4
@@ -51,7 +51,7 @@ static void uvd_v5_0_enable_mgcg(struct amdgpu_device *adev,* * Returns the current hardware read pointer */ -static uint32_t uvd_v5_0_ring_get_rptr (struct amdgpu_ring *ring) +static uint64_t uvd_v5_0_ring_get_rptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -65,7 +65,7 @@ static uint32_t uvd_v5_0_ring_get_rptr(struct amdgpu_ring *ring)* * Returns the current hardware write pointer */ -static uint32_t uvd_v5_0_ring_get_wptr (struct amdgpu_ring *ring) +static uint64_t uvd_v5_0_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -83,7 +83,7 @@ static void uvd_v5_0_ring_set_wptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -WREG32 (mmUVD_RBC_RB_WPTR, ring->wptr); +WREG32 (mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr)); }static int uvd_v5_0_early_init (void *handle)
@@ -424,7 +424,7 @@ static int uvd_v5_0_start(struct amdgpu_device *adev)WREG32 (mmUVD_RBC_RB_RPTR,0 ); ring->wptr =RREG32 (mmUVD_RBC_RB_RPTR); -WREG32 (mmUVD_RBC_RB_WPTR, ring->wptr); +WREG32 (mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr));WREG32_P (mmUVD_RBC_RB_CNTL,0 , ~UVD_RBC_RB_CNTL__RB_NO_FETCH_MASK );
@@ -879,6 +879,7 @@ static const struct amdgpu_ring_funcs uvd_v5_0_ring_funcs = { .type = AMDGPU_RING_TYPE_UVD, .align_mask = 0xf, .nop = PACKET0(mmUVD_NO_OP, 0), + .support_64bit_ptrs = false, .get_rptr = uvd_v5_0_ring_get_rptr, .get_wptr = uvd_v5_0_ring_get_wptr, .set_wptr = uvd_v5_0_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +6 -4
@@ -54,7 +54,7 @@ static void uvd_v6_0_enable_mgcg(struct amdgpu_device *adev,* * Returns the current hardware read pointer */ -static uint32_t uvd_v6_0_ring_get_rptr (struct amdgpu_ring *ring) +static uint64_t uvd_v6_0_ring_get_rptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -68,7 +68,7 @@ static uint32_t uvd_v6_0_ring_get_rptr(struct amdgpu_ring *ring)* * Returns the current hardware write pointer */ -static uint32_t uvd_v6_0_ring_get_wptr (struct amdgpu_ring *ring) +static uint64_t uvd_v6_0_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -86,7 +86,7 @@ static void uvd_v6_0_ring_set_wptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -WREG32 (mmUVD_RBC_RB_WPTR, ring->wptr); +WREG32 (mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr)); }static int uvd_v6_0_early_init (void *handle)
@@ -521,7 +521,7 @@ static int uvd_v6_0_start(struct amdgpu_device *adev)WREG32 (mmUVD_RBC_RB_RPTR,0 ); ring->wptr =RREG32 (mmUVD_RBC_RB_RPTR); -WREG32 (mmUVD_RBC_RB_WPTR, ring->wptr); +WREG32 (mmUVD_RBC_RB_WPTR,lower_32_bits (ring->wptr));WREG32_FIELD (UVD_RBC_RB_CNTL ,RB_NO_FETCH ,0 );
@@ -1108,6 +1108,7 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_phys_funcs = { .type = AMDGPU_RING_TYPE_UVD, .align_mask = 0xf, .nop = PACKET0(mmUVD_NO_OP, 0), + .support_64bit_ptrs = false, .get_rptr = uvd_v6_0_ring_get_rptr, .get_wptr = uvd_v6_0_ring_get_wptr, .set_wptr = uvd_v6_0_ring_set_wptr,
@@ -1134,6 +1135,7 @@ static const struct amdgpu_ring_funcs uvd_v6_0_ring_vm_funcs = { .type = AMDGPU_RING_TYPE_UVD, .align_mask = 0xf, .nop = PACKET0(mmUVD_NO_OP, 0), + .support_64bit_ptrs = false, .get_rptr = uvd_v6_0_ring_get_rptr, .get_wptr = uvd_v6_0_ring_get_wptr, .set_wptr = uvd_v6_0_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +9 -8
@@ -52,7 +52,7 @@ static void vce_v2_0_set_irq_funcs(struct amdgpu_device *adev);* * Returns the current hardware read pointer */ -static uint32_t vce_v2_0_ring_get_rptr (struct amdgpu_ring *ring) +static uint64_t vce_v2_0_ring_get_rptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -69,7 +69,7 @@ static uint32_t vce_v2_0_ring_get_rptr(struct amdgpu_ring *ring)* * Returns the current hardware write pointer */ -static uint32_t vce_v2_0_ring_get_wptr (struct amdgpu_ring *ring) +static uint64_t vce_v2_0_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -91,9 +91,9 @@ static void vce_v2_0_ring_set_wptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->vce.ring[0 ]) -WREG32 (mmVCE_RB_WPTR, ring->wptr); +WREG32 (mmVCE_RB_WPTR,lower_32_bits (ring->wptr));else -WREG32 (mmVCE_RB_WPTR2, ring->wptr); +WREG32 (mmVCE_RB_WPTR2,lower_32_bits (ring->wptr)); }static int vce_v2_0_lmi_clean (struct amdgpu_device *adev)
@@ -241,15 +241,15 @@ static int vce_v2_0_start(struct amdgpu_device *adev)vce_v2_0_mc_resume (adev); ring = &adev->vce.ring[0 ]; -WREG32 (mmVCE_RB_RPTR, ring->wptr); -WREG32 (mmVCE_RB_WPTR, ring->wptr); +WREG32 (mmVCE_RB_RPTR,lower_32_bits (ring->wptr)); +WREG32 (mmVCE_RB_WPTR,lower_32_bits (ring->wptr));WREG32 (mmVCE_RB_BASE_LO, ring->gpu_addr);WREG32 (mmVCE_RB_BASE_HI,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE, ring->ring_size /4 ); ring = &adev->vce.ring[1 ]; -WREG32 (mmVCE_RB_RPTR2, ring->wptr); -WREG32 (mmVCE_RB_WPTR2, ring->wptr); +WREG32 (mmVCE_RB_RPTR2,lower_32_bits (ring->wptr)); +WREG32 (mmVCE_RB_WPTR2,lower_32_bits (ring->wptr));WREG32 (mmVCE_RB_BASE_LO2, ring->gpu_addr);WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 );
@@ -631,6 +631,7 @@ static const struct amdgpu_ring_funcs vce_v2_0_ring_funcs = { .type = AMDGPU_RING_TYPE_VCE, .align_mask = 0xf, .nop = VCE_CMD_NO_OP, + .support_64bit_ptrs = false, .get_rptr = vce_v2_0_ring_get_rptr, .get_wptr = vce_v2_0_ring_get_wptr, .set_wptr = vce_v2_0_ring_set_wptr,
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +13 -11
@@ -73,7 +73,7 @@ static int vce_v3_0_wait_for_idle(void *handle);* * Returns the current hardware read pointer */ -static uint32_t vce_v3_0_ring_get_rptr (struct amdgpu_ring *ring) +static uint64_t vce_v3_0_ring_get_rptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -92,7 +92,7 @@ static uint32_t vce_v3_0_ring_get_rptr(struct amdgpu_ring *ring)* * Returns the current hardware write pointer */ -static uint32_t vce_v3_0_ring_get_wptr (struct amdgpu_ring *ring) +static uint64_t vce_v3_0_ring_get_wptr (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -116,11 +116,11 @@ static void vce_v3_0_ring_set_wptr(struct amdgpu_ring *ring)struct amdgpu_device *adev = ring->adev;if (ring == &adev->vce.ring[0 ]) -WREG32 (mmVCE_RB_WPTR, ring->wptr); +WREG32 (mmVCE_RB_WPTR,lower_32_bits (ring->wptr));else if (ring == &adev->vce.ring[1 ]) -WREG32 (mmVCE_RB_WPTR2, ring->wptr); +WREG32 (mmVCE_RB_WPTR2,lower_32_bits (ring->wptr));else -WREG32 (mmVCE_RB_WPTR3, ring->wptr); +WREG32 (mmVCE_RB_WPTR3,lower_32_bits (ring->wptr)); }static void vce_v3_0_override_vce_clock_gating (struct amdgpu_device *adev,bool override)
@@ -231,22 +231,22 @@ static int vce_v3_0_start(struct amdgpu_device *adev)int idx, r; ring = &adev->vce.ring[0 ]; -WREG32 (mmVCE_RB_RPTR, ring->wptr); -WREG32 (mmVCE_RB_WPTR, ring->wptr); +WREG32 (mmVCE_RB_RPTR,lower_32_bits (ring->wptr)); +WREG32 (mmVCE_RB_WPTR,lower_32_bits (ring->wptr));WREG32 (mmVCE_RB_BASE_LO, ring->gpu_addr);WREG32 (mmVCE_RB_BASE_HI,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE, ring->ring_size /4 ); ring = &adev->vce.ring[1 ]; -WREG32 (mmVCE_RB_RPTR2, ring->wptr); -WREG32 (mmVCE_RB_WPTR2, ring->wptr); +WREG32 (mmVCE_RB_RPTR2,lower_32_bits (ring->wptr)); +WREG32 (mmVCE_RB_WPTR2,lower_32_bits (ring->wptr));WREG32 (mmVCE_RB_BASE_LO2, ring->gpu_addr);WREG32 (mmVCE_RB_BASE_HI2,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE2, ring->ring_size /4 ); ring = &adev->vce.ring[2 ]; -WREG32 (mmVCE_RB_RPTR3, ring->wptr); -WREG32 (mmVCE_RB_WPTR3, ring->wptr); +WREG32 (mmVCE_RB_RPTR3,lower_32_bits (ring->wptr)); +WREG32 (mmVCE_RB_WPTR3,lower_32_bits (ring->wptr));WREG32 (mmVCE_RB_BASE_LO3, ring->gpu_addr);WREG32 (mmVCE_RB_BASE_HI3,upper_32_bits (ring->gpu_addr));WREG32 (mmVCE_RB_SIZE3, ring->ring_size /4 );
@@ -860,6 +860,7 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_phys_funcs = { .type = AMDGPU_RING_TYPE_VCE, .align_mask = 0xf, .nop = VCE_CMD_NO_OP, + .support_64bit_ptrs = false, .get_rptr = vce_v3_0_ring_get_rptr, .get_wptr = vce_v3_0_ring_get_wptr, .set_wptr = vce_v3_0_ring_set_wptr,
@@ -882,6 +883,7 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_vm_funcs = { .type = AMDGPU_RING_TYPE_VCE, .align_mask = 0xf, .nop = VCE_CMD_NO_OP, + .support_64bit_ptrs = false, .get_rptr = vce_v3_0_ring_get_rptr, .get_wptr = vce_v3_0_ring_get_wptr, .set_wptr = vce_v3_0_ring_set_wptr,
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 3/23 drm/amdgpu: add 64bit wb functions
In reply to a message not in the archiveFrom: Ken Wang <[email protected]>
Newer asics need 64 bit writeback slots.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 39 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 50 ++++++++++++++++++++++-------- 3 files changed, 78 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -1021,6 +1021,8 @@ struct amdgpu_wb {int amdgpu_wb_get (struct amdgpu_device *adev,u32 *wb);void amdgpu_wb_free (struct amdgpu_device *adev,u32 wb); +int amdgpu_wb_get_64bit (struct amdgpu_device *adev,u32 *wb); +void amdgpu_wb_free_64bit (struct amdgpu_device *adev,u32 wb);void amdgpu_get_pcie_info (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +39 -0
@@ -516,6 +516,29 @@ int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb) }/** +* amdgpu_wb_get_64bit - Allocate a wb entry +* +* @adev: amdgpu_device pointer +* @wb: wb index +* +* Allocate a wb slot for use by the driver (all asics). +* Returns 0 on success or -EINVAL on failure. +*/ +int amdgpu_wb_get_64bit (struct amdgpu_device *adev,u32 *wb) +{ +unsigned long offset =bitmap_find_next_zero_area_off (adev->wb.used, + adev->wb.num_wb,0 ,2 ,7 ,0 ); +if ((offset +1 ) < adev->wb.num_wb) { +__set_bit (offset, adev->wb.used); +__set_bit (offset +1 , adev->wb.used); + *wb = offset; +return 0 ; + }else { +return -EINVAL ; + } +} + +/** * amdgpu_wb_free - Free a wb entry * * @adev: amdgpu_device pointer
@@ -530,6 +553,22 @@ void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb) }/** +* amdgpu_wb_free_64bit - Free a wb entry +* +* @adev: amdgpu_device pointer +* @wb: wb index +* +* Free a wb slot allocated for use by the driver (all asics) +*/ +void amdgpu_wb_free_64bit (struct amdgpu_device *adev,u32 wb) +{ +if ((wb +1 ) < adev->wb.num_wb) { +__clear_bit (wb, adev->wb.used); +__clear_bit (wb +1 , adev->wb.used); + } +} + +/** * amdgpu_vram_location - try to find VRAM location * @adev: amdgpu device structure holding all necessary informations * @mc: memory controller structure holding memory informations
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +37 -13
63 lines not on this page · raw message
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 4/23 drm/amdgpu: add 64bit doorbell functions (v2)
In reply to a message not in the archiveFrom: Ken Wang <[email protected]>
Newer asics need 64 bit doorbells.
v2: fix comment (Nils)
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 38 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +4 -0
@@ -1521,6 +1521,8 @@ void amdgpu_io_wreg(struct amdgpu_device *adev, u32 reg, u32 v);u32 amdgpu_mm_rdoorbell (struct amdgpu_device *adev,u32 index);void amdgpu_mm_wdoorbell (struct amdgpu_device *adev,u32 index,u32 v); +u64 amdgpu_mm_rdoorbell64 (struct amdgpu_device *adev,u32 index); +void amdgpu_mm_wdoorbell64 (struct amdgpu_device *adev,u32 index,u64 v);/* * Registers read & write functions.
@@ -1575,6 +1577,8 @@ void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v);#define RDOORBELL32 (index) amdgpu_mm_rdoorbell(adev, (index))#define WDOORBELL32 (index, v) amdgpu_mm_wdoorbell(adev, (index), (v)) +#define RDOORBELL64 (index) amdgpu_mm_rdoorbell64(adev, (index)) +#define WDOORBELL64 (index, v) amdgpu_mm_wdoorbell64(adev, (index), (v))#define REG_FIELD_SHIFT (reg, field) reg##__##field##__SHIFT#define REG_FIELD_MASK (reg, field) reg##__##field##_MASK
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +38 -0
@@ -195,6 +195,44 @@ void amdgpu_mm_wdoorbell(struct amdgpu_device *adev, u32 index, u32 v) }/** +* amdgpu_mm_rdoorbell64 - read a doorbell Qword +* +* @adev: amdgpu_device pointer +* @index: doorbell index +* +* Returns the value in the doorbell aperture at the +* requested doorbell index (VEGA10+). +*/ +u64 amdgpu_mm_rdoorbell64 (struct amdgpu_device *adev,u32 index) +{ +if (index < adev->doorbell.num_doorbells) { +return atomic64_read ((atomic64_t *)(adev->doorbell.ptr + index)); + }else { +DRM_ERROR ("reading beyond doorbell aperture: 0x%08x!\n" , index); +return 0 ; + } +} + +/** +* amdgpu_mm_wdoorbell64 - write a doorbell Qword +* +* @adev: amdgpu_device pointer +* @index: doorbell index +* @v: value to write +* +* Writes @v to the doorbell aperture at the +* requested doorbell index (VEGA10+). +*/ +void amdgpu_mm_wdoorbell64 (struct amdgpu_device *adev,u32 index,u64 v) +{ +if (index < adev->doorbell.num_doorbells) { +atomic64_set ((atomic64_t *)(adev->doorbell.ptr + index), v); + }else { +DRM_ERROR ("writing beyond doorbell aperture: 0x%08x!\n" , index); + } +} + +/** * amdgpu_invalid_rreg - dummy reg read function * * @adev: amdgpu device pointer
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 5/23 drm/amdgpu: switch ih handling to two levels (v2)
In reply to a message not in the archiveNewer asics have a two levels of irq ids now:
client id - the IP
src id - the interrupt src within the IP
v2: integrated Christian's comments.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 24 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 6 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 111 +++++++++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 10 ++- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 9 ++- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 ++- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 10 +-- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 1 + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 9 ++- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 9 ++- drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 1 + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- drivers/gpu/drm/amd/include/cgs_linux.h | 19 +++--- 32 files changed, 191 insertions(+), 105 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +18 -6
@@ -571,7 +571,9 @@ static const struct amdgpu_irq_src_funcs cgs_irq_funcs = { .process = cgs_process_irq, }; -static int amdgpu_cgs_add_irq_source(struct cgs_device *cgs_device, unsigned src_id, +static int amdgpu_cgs_add_irq_source(void *cgs_device, + unsigned client_id, + unsigned src_id, unsigned num_types, cgs_irq_source_set_func_t set, cgs_irq_handler_func_t handler,
@@ -597,7 +599,7 @@ static int amdgpu_cgs_add_irq_source(struct cgs_device *cgs_device, unsigned src irq_params->handler = handler; irq_params->private_data = private_data; source->data = (void *)irq_params; - ret =amdgpu_irq_add_id (adev, src_id, source); + ret =amdgpu_irq_add_id (adev, client_id, src_id, source);if (ret) {kfree (irq_params);kfree (source);
@@ -606,16 +608,26 @@ static int amdgpu_cgs_add_irq_source(struct cgs_device *cgs_device, unsigned srcreturn ret; } -static int amdgpu_cgs_irq_get (struct cgs_device *cgs_device,unsigned src_id,unsigned type) +static int amdgpu_cgs_irq_get (void *cgs_device,unsigned client_id, +unsigned src_id,unsigned type) {CGS_FUNC_ADEV ; -return amdgpu_irq_get (adev, adev->irq.sources[src_id], type); + +if (!adev->irq.client[client_id].sources) +return -EINVAL ; + +return amdgpu_irq_get (adev, adev->irq.client[client_id].sources[src_id], type); } -static int amdgpu_cgs_irq_put (struct cgs_device *cgs_device,unsigned src_id,unsigned type) +static int amdgpu_cgs_irq_put (void *cgs_device,unsigned client_id, +unsigned src_id,unsigned type) {CGS_FUNC_ADEV ; -return amdgpu_irq_put (adev, adev->irq.sources[src_id], type); + +if (!adev->irq.client[client_id].sources) +return -EINVAL ; + +return amdgpu_irq_put (adev, adev->irq.client[client_id].sources[src_id], type); } static int amdgpu_cgs_set_clockgating_state(struct cgs_device *cgs_device,
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h +6 -0
@@ -26,6 +26,10 @@struct amdgpu_device ; +#define AMDGPU_IH_CLIENTID_LEGACY 0 + +#define AMDGPU_IH_CLIENTID_MAX 0x1f +/* * R6xx+ IH ring */
@@ -47,10 +51,12 @@ struct amdgpu_ih_ring { };struct amdgpu_iv_entry { +unsigned client_id;unsigned src_id;unsigned src_data;unsigned ring_id;unsigned vm_id; +unsigned vm_id_src;unsigned pas_id;const uint32_t *iv_entry; };
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +76 -35
181 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h +8 -2
@@ -28,6 +28,7 @@#include "amdgpu_ih.h" #define AMDGPU_MAX_IRQ_SRC_ID 0x100 +#define AMDGPU_MAX_IRQ_CLIENT_ID 0x100struct amdgpu_device ;struct amdgpu_iv_entry ;
@@ -44,6 +45,10 @@ struct amdgpu_irq_src {void *data; }; +struct amdgpu_irq_client { +struct amdgpu_irq_src **sources; +}; +/* provided by interrupt generating IP blocks */ struct amdgpu_irq_src_funcs { int (*set)(struct amdgpu_device *adev, struct amdgpu_irq_src *source,
@@ -58,7 +63,7 @@ struct amdgpu_irq {bool installed;spinlock_t lock;/* interrupt sources */ -struct amdgpu_irq_src *sources[AMDGPU_MAX_IRQ_SRC_ID ]; +struct amdgpu_irq_client client[AMDGPU_IH_CLIENTID_MAX ];/* status, etc. */ bool msi_enabled;/* msi enabled */
@@ -80,7 +85,8 @@ irqreturn_t amdgpu_irq_handler(int irq, void *arg);int amdgpu_irq_init (struct amdgpu_device *adev);void amdgpu_irq_fini (struct amdgpu_device *adev); -int amdgpu_irq_add_id (struct amdgpu_device *adev,unsigned src_id, +int amdgpu_irq_add_id (struct amdgpu_device *adev, +unsigned client_id,unsigned src_id,struct amdgpu_irq_src *source);void amdgpu_irq_dispatch (struct amdgpu_device *adev,struct amdgpu_iv_entry *entry);
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +4 -2
@@ -6284,11 +6284,13 @@ static int ci_dpm_sw_init(void *handle)int ret;struct amdgpu_device *adev = (struct amdgpu_device *)handle; - ret =amdgpu_irq_add_id (adev,230 , &adev->pm.dpm.thermal.irq); + ret =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,230 , + &adev->pm.dpm.thermal.irq);if (ret)return ret; - ret =amdgpu_irq_add_id (adev,231 , &adev->pm.dpm.thermal.irq); + ret =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,231 , + &adev->pm.dpm.thermal.irq);if (ret)return ret;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +6 -3
@@ -923,17 +923,20 @@ static int cik_sdma_sw_init(void *handle) }/* SDMA trap event */ - r =amdgpu_irq_add_id (adev,224 , &adev->sdma.trap_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,224 , + &adev->sdma.trap_irq);if (r)return r;/* SDMA Privileged inst */ - r =amdgpu_irq_add_id (adev,241 , &adev->sdma.illegal_inst_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,241 , + &adev->sdma.illegal_inst_irq);if (r)return r;/* SDMA Privileged inst */ - r =amdgpu_irq_add_id (adev,247 , &adev->sdma.illegal_inst_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,247 , + &adev->sdma.illegal_inst_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/cz_ih.c +1 -0
@@ -227,6 +227,7 @@ static void cz_ih_decode_iv(struct amdgpu_device *adev, dw[2 ] =le32_to_cpu (adev->irq.ih.ring[ring_index +2 ]); dw[3 ] =le32_to_cpu (adev->irq.ih.ring[ring_index +3 ]); + entry->client_id =AMDGPU_IH_CLIENTID_LEGACY ; entry->src_id = dw[0 ] &0xff ; entry->src_data = dw[1 ] &0xfffffff ; entry->ring_id = dw[2 ] &0xff ;
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +3 -3
@@ -2947,19 +2947,19 @@ static int dce_v10_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;for (i =0 ; i < adev->mode_info.num_crtc; i++) { - r =amdgpu_irq_add_id (adev, i +1 , &adev->crtc_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY , i +1 , &adev->crtc_irq);if (r)return r; }for (i =8 ; i <20 ; i +=2 ) { - r =amdgpu_irq_add_id (adev, i, &adev->pageflip_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY , i, &adev->pageflip_irq);if (r)return r; }/* HPD hotplug */ - r =amdgpu_irq_add_id (adev,42 , &adev->hpd_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,42 , &adev->hpd_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +3 -3
@@ -3007,19 +3007,19 @@ static int dce_v11_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;for (i =0 ; i < adev->mode_info.num_crtc; i++) { - r =amdgpu_irq_add_id (adev, i +1 , &adev->crtc_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY , i +1 , &adev->crtc_irq);if (r)return r; }for (i =8 ; i <20 ; i +=2 ) { - r =amdgpu_irq_add_id (adev, i, &adev->pageflip_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY , i, &adev->pageflip_irq);if (r)return r; }/* HPD hotplug */ - r =amdgpu_irq_add_id (adev,42 , &adev->hpd_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,42 , &adev->hpd_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +3 -3
@@ -2295,19 +2295,19 @@ static int dce_v6_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;for (i =0 ; i < adev->mode_info.num_crtc; i++) { - r =amdgpu_irq_add_id (adev, i +1 , &adev->crtc_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY , i +1 , &adev->crtc_irq);if (r)return r; }for (i =8 ; i <20 ; i +=2 ) { - r =amdgpu_irq_add_id (adev, i, &adev->pageflip_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY , i, &adev->pageflip_irq);if (r)return r; }/* HPD hotplug */ - r =amdgpu_irq_add_id (adev,42 , &adev->hpd_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,42 , &adev->hpd_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +3 -3
@@ -2794,19 +2794,19 @@ static int dce_v8_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;for (i =0 ; i < adev->mode_info.num_crtc; i++) { - r =amdgpu_irq_add_id (adev, i +1 , &adev->crtc_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY , i +1 , &adev->crtc_irq);if (r)return r; }for (i =8 ; i <20 ; i +=2 ) { - r =amdgpu_irq_add_id (adev, i, &adev->pageflip_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY , i, &adev->pageflip_irq);if (r)return r; }/* HPD hotplug */ - r =amdgpu_irq_add_id (adev,42 , &adev->hpd_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,42 , &adev->hpd_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1 -1
@@ -464,7 +464,7 @@ static int dce_virtual_sw_init(void *handle)int r, i;struct amdgpu_device *adev = (struct amdgpu_device *)handle; - r =amdgpu_irq_add_id (adev,229 , &adev->crtc_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,229 , &adev->crtc_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -3
@@ -3242,15 +3242,15 @@ static int gfx_v6_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i, r; - r =amdgpu_irq_add_id (adev,181 , &adev->gfx.eop_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,181 , &adev->gfx.eop_irq);if (r)return r; - r =amdgpu_irq_add_id (adev,184 , &adev->gfx.priv_reg_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,184 , &adev->gfx.priv_reg_irq);if (r)return r; - r =amdgpu_irq_add_id (adev,185 , &adev->gfx.priv_inst_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,185 , &adev->gfx.priv_inst_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +5 -3
@@ -4669,17 +4669,19 @@ static int gfx_v7_0_sw_init(void *handle)int i, r;/* EOP Event */ - r =amdgpu_irq_add_id (adev,181 , &adev->gfx.eop_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,181 , &adev->gfx.eop_irq);if (r)return r;/* Privileged reg */ - r =amdgpu_irq_add_id (adev,184 , &adev->gfx.priv_reg_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,184 , + &adev->gfx.priv_reg_irq);if (r)return r;/* Privileged inst */ - r =amdgpu_irq_add_id (adev,185 , &adev->gfx.priv_inst_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,185 , + &adev->gfx.priv_inst_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +6 -4
@@ -2073,22 +2073,24 @@ static int gfx_v8_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;/* KIQ event */ - r =amdgpu_irq_add_id (adev,178 , &adev->gfx.kiq.irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,178 , &adev->gfx.kiq.irq);if (r)return r;/* EOP Event */ - r =amdgpu_irq_add_id (adev,181 , &adev->gfx.eop_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,181 , &adev->gfx.eop_irq);if (r)return r;/* Privileged reg */ - r =amdgpu_irq_add_id (adev,184 , &adev->gfx.priv_reg_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,184 , + &adev->gfx.priv_reg_irq);if (r)return r;/* Privileged inst */ - r =amdgpu_irq_add_id (adev,185 , &adev->gfx.priv_inst_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,185 , + &adev->gfx.priv_inst_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +2 -2
@@ -823,11 +823,11 @@ static int gmc_v6_0_sw_init(void *handle)int dma_bits;struct amdgpu_device *adev = (struct amdgpu_device *)handle; - r =amdgpu_irq_add_id (adev,146 , &adev->mc.vm_fault); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,146 , &adev->mc.vm_fault);if (r)return r; - r =amdgpu_irq_add_id (adev,147 , &adev->mc.vm_fault); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,147 , &adev->mc.vm_fault);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +2 -2
@@ -969,11 +969,11 @@ static int gmc_v7_0_sw_init(void *handle) adev->mc.vram_type =gmc_v7_0_convert_vram_type (tmp); } - r =amdgpu_irq_add_id (adev,146 , &adev->mc.vm_fault); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,146 , &adev->mc.vm_fault);if (r)return r; - r =amdgpu_irq_add_id (adev,147 , &adev->mc.vm_fault); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,147 , &adev->mc.vm_fault);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2 -2
@@ -981,11 +981,11 @@ static int gmc_v8_0_sw_init(void *handle) adev->mc.vram_type =gmc_v8_0_convert_vram_type (tmp); } - r =amdgpu_irq_add_id (adev,146 , &adev->mc.vm_fault); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,146 , &adev->mc.vm_fault);if (r)return r; - r =amdgpu_irq_add_id (adev,147 , &adev->mc.vm_fault); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,147 , &adev->mc.vm_fault);if (r)return r;
drivers/gpu/drm/amd/amdgpu/iceland_ih.c +1 -0
@@ -227,6 +227,7 @@ static void iceland_ih_decode_iv(struct amdgpu_device *adev, dw[2 ] =le32_to_cpu (adev->irq.ih.ring[ring_index +2 ]); dw[3 ] =le32_to_cpu (adev->irq.ih.ring[ring_index +3 ]); + entry->client_id =AMDGPU_IH_CLIENTID_LEGACY ; entry->src_id = dw[0 ] &0xff ; entry->src_data = dw[1 ] &0xfffffff ; entry->ring_id = dw[2 ] &0xff ;
drivers/gpu/drm/amd/amdgpu/kv_dpm.c +4 -2
@@ -2981,11 +2981,13 @@ static int kv_dpm_sw_init(void *handle)int ret;struct amdgpu_device *adev = (struct amdgpu_device *)handle; - ret =amdgpu_irq_add_id (adev,230 , &adev->pm.dpm.thermal.irq); + ret =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,230 , + &adev->pm.dpm.thermal.irq);if (ret)return ret; - ret =amdgpu_irq_add_id (adev,231 , &adev->pm.dpm.thermal.irq); + ret =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,231 , + &adev->pm.dpm.thermal.irq);if (ret)return ret;
drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c +2 -2
@@ -566,11 +566,11 @@ int xgpu_vi_mailbox_add_irq_id(struct amdgpu_device *adev) {int r; - r =amdgpu_irq_add_id (adev,135 , &adev->virt.rcv_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,135 , &adev->virt.rcv_irq);if (r)return r; - r =amdgpu_irq_add_id (adev,138 , &adev->virt.ack_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,138 , &adev->virt.ack_irq);if (r) {amdgpu_irq_put (adev, &adev->virt.rcv_irq,0 );return r;
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +6 -3
@@ -921,17 +921,20 @@ static int sdma_v2_4_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;/* SDMA trap event */ - r =amdgpu_irq_add_id (adev,224 , &adev->sdma.trap_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,224 , + &adev->sdma.trap_irq);if (r)return r;/* SDMA Privileged inst */ - r =amdgpu_irq_add_id (adev,241 , &adev->sdma.illegal_inst_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,241 , + &adev->sdma.illegal_inst_irq);if (r)return r;/* SDMA Privileged inst */ - r =amdgpu_irq_add_id (adev,247 , &adev->sdma.illegal_inst_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,247 , + &adev->sdma.illegal_inst_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +6 -3
@@ -1137,17 +1137,20 @@ static int sdma_v3_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;/* SDMA trap event */ - r =amdgpu_irq_add_id (adev,224 , &adev->sdma.trap_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,224 , + &adev->sdma.trap_irq);if (r)return r;/* SDMA Privileged inst */ - r =amdgpu_irq_add_id (adev,241 , &adev->sdma.illegal_inst_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,241 , + &adev->sdma.illegal_inst_irq);if (r)return r;/* SDMA Privileged inst */ - r =amdgpu_irq_add_id (adev,247 , &adev->sdma.illegal_inst_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,247 , + &adev->sdma.illegal_inst_irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/si_dma.c +2 -2
@@ -517,12 +517,12 @@ static int si_dma_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;/* DMA0 trap event */ - r =amdgpu_irq_add_id (adev,224 , &adev->sdma.trap_irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,224 , &adev->sdma.trap_irq);if (r)return r;/* DMA1 trap event */ - r =amdgpu_irq_add_id (adev,244 , &adev->sdma.trap_irq_1); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,244 , &adev->sdma.trap_irq_1);if (r)return r;
drivers/gpu/drm/amd/amdgpu/si_dpm.c +2 -2
@@ -7690,11 +7690,11 @@ static int si_dpm_sw_init(void *handle)int ret;struct amdgpu_device *adev = (struct amdgpu_device *)handle; - ret =amdgpu_irq_add_id (adev,230 , &adev->pm.dpm.thermal.irq); + ret =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,230 , &adev->pm.dpm.thermal.irq);if (ret)return ret; - ret =amdgpu_irq_add_id (adev,231 , &adev->pm.dpm.thermal.irq); + ret =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,231 , &adev->pm.dpm.thermal.irq);if (ret)return ret;
drivers/gpu/drm/amd/amdgpu/tonga_ih.c +1 -0
@@ -238,6 +238,7 @@ static void tonga_ih_decode_iv(struct amdgpu_device *adev, dw[2 ] =le32_to_cpu (adev->irq.ih.ring[ring_index +2 ]); dw[3 ] =le32_to_cpu (adev->irq.ih.ring[ring_index +3 ]); + entry->client_id =AMDGPU_IH_CLIENTID_LEGACY ; entry->src_id = dw[0 ] &0xff ; entry->src_data = dw[1 ] &0xfffffff ; entry->ring_id = dw[2 ] &0xff ;
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +1 -1
@@ -107,7 +107,7 @@ static int uvd_v4_2_sw_init(void *handle)int r;/* UVD TRAP */ - r =amdgpu_irq_add_id (adev,124 , &adev->uvd.irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,124 , &adev->uvd.irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +1 -1
@@ -103,7 +103,7 @@ static int uvd_v5_0_sw_init(void *handle)int r;/* UVD TRAP */ - r =amdgpu_irq_add_id (adev,124 , &adev->uvd.irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,124 , &adev->uvd.irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -1
@@ -106,7 +106,7 @@ static int uvd_v6_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;/* UVD TRAP */ - r =amdgpu_irq_add_id (adev,124 , &adev->uvd.irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,124 , &adev->uvd.irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1 -1
@@ -430,7 +430,7 @@ static int vce_v2_0_sw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;/* VCE */ - r =amdgpu_irq_add_id (adev,167 , &adev->vce.irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,167 , &adev->vce.irq);if (r)return r;
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
@@ -383,7 +383,7 @@ static int vce_v3_0_sw_init(void *handle)int r, i;/* VCE */ - r =amdgpu_irq_add_id (adev,167 , &adev->vce.irq); + r =amdgpu_irq_add_id (adev,AMDGPU_IH_CLIENTID_LEGACY ,167 , &adev->vce.irq);if (r)return r;
drivers/gpu/drm/amd/include/cgs_linux.h +10 -9
@@ -66,7 +66,8 @@ typedef int (*cgs_irq_handler_func_t)(void *private_data,* * Return: 0 on success, -errno otherwise */ -typedef int (*cgs_add_irq_source_t)(struct cgs_device *cgs_device, unsigned src_id, +typedef int (*cgs_add_irq_source_t)(void *cgs_device, unsigned client_id, + unsigned src_id, unsigned num_types, cgs_irq_source_set_func_t set, cgs_irq_handler_func_t handler,
@@ -83,7 +84,7 @@ typedef int (*cgs_add_irq_source_t)(struct cgs_device *cgs_device, unsigned src_* * Return: 0 on success, -errno otherwise */ -typedef int (*cgs_irq_get_t )(struct cgs_device *cgs_device,unsigned src_id,unsigned type); +typedef int (*cgs_irq_get_t )(void *cgs_device,unsigned client_id,unsigned src_id,unsigned type);/** * cgs_irq_put() - Indicate IRQ source is no longer needed
@@ -98,7 +99,7 @@ typedef int (*cgs_irq_get_t)(struct cgs_device *cgs_device, unsigned src_id, uns* * Return: 0 on success, -errno otherwise */ -typedef int (*cgs_irq_put_t )(struct cgs_device *cgs_device,unsigned src_id,unsigned type); +typedef int (*cgs_irq_put_t )(void *cgs_device,unsigned client_id,unsigned src_id,unsigned type);struct cgs_os_ops {/* IRQ handling */
@@ -107,12 +108,12 @@ struct cgs_os_ops { cgs_irq_put_t irq_put; }; -#define cgs_add_irq_source (dev,src_id,num_types,set,handler,private_data) \ - CGS_OS_CALL(add_irq_source,dev,src_id,num_types,set,handler, \ +#define cgs_add_irq_source (dev,client_id,src_id,num_types,set,handler,private_data) \ + CGS_OS_CALL(add_irq_source,dev,client_id,src_id,num_types,set,handler, \ private_data) -#define cgs_irq_get (dev,src_id,type) \ - CGS_OS_CALL(irq_get,dev,src_id,type) -#define cgs_irq_put (dev,src_id,type) \ - CGS_OS_CALL(irq_put,dev,src_id,type) +#define cgs_irq_get (dev,client_id,src_id,type) \ + CGS_OS_CALL(irq_get,dev,client_id,src_id,type) +#define cgs_irq_put (dev,client_id,src_id,type) \ + CGS_OS_CALL(irq_put,dev,client_id,src_id,type)#endif /* _CGS_LINUX_H */
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 6/23 drm/amdgpu/ih: store the full context id
In reply to a message not in the archiveThe contextID field (formerly known as src_data) of the IH vector stores client specific information about an interrupt. It was expanded from 32 bits to 128 on newer asics. Expand the src_id field to handle this.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 4 +++- drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 10 +++++----- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 10 +++++----- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 10 +++++----- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 10 +++++----- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 6 +++--- 15 files changed, 38 insertions(+), 36 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h +3 -1
@@ -50,10 +50,12 @@ struct amdgpu_ih_ring {dma_addr_t rb_dma_addr;/* only used when use_bus_addr = true */ }; +#define AMDGPU_IH_SRC_DATA_MAX_SIZE_DW 4 +struct amdgpu_iv_entry {unsigned client_id;unsigned src_id; -unsigned src_data; +unsigned src_data[AMDGPU_IH_SRC_DATA_MAX_SIZE_DW ];unsigned ring_id;unsigned vm_id;unsigned vm_id_src;
drivers/gpu/drm/amd/amdgpu/cik_ih.c +1 -1
@@ -249,7 +249,7 @@ static void cik_ih_decode_iv(struct amdgpu_device *adev, dw[3 ] =le32_to_cpu (adev->irq.ih.ring[ring_index +3 ]); entry->src_id = dw[0 ] &0xff ; - entry->src_data = dw[1 ] &0xfffffff ; + entry->src_data[0 ] = dw[1 ] &0xfffffff ; entry->ring_id = dw[2 ] &0xff ; entry->vm_id = (dw[2 ] >>8 ) &0xff ; entry->pas_id = (dw[2 ] >>16 ) &0xffff ;
drivers/gpu/drm/amd/amdgpu/cz_ih.c +1 -1
@@ -229,7 +229,7 @@ static void cz_ih_decode_iv(struct amdgpu_device *adev, entry->client_id =AMDGPU_IH_CLIENTID_LEGACY ; entry->src_id = dw[0 ] &0xff ; - entry->src_data = dw[1 ] &0xfffffff ; + entry->src_data[0 ] = dw[1 ] &0xfffffff ; entry->ring_id = dw[2 ] &0xff ; entry->vm_id = (dw[2 ] >>8 ) &0xff ; entry->pas_id = (dw[2 ] >>16 ) &0xffff ;
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +5 -5
@@ -3398,7 +3398,7 @@ static int dce_v10_0_crtc_irq(struct amdgpu_device *adev,uint32_t disp_int =RREG32 (interrupt_status_offsets[crtc].reg);unsigned irq_type =amdgpu_crtc_idx_to_irq_type (adev, crtc); -switch (entry->src_data) { +switch (entry->src_data[0 ]) {case 0 :/* vblank */ if (disp_int & interrupt_status_offsets[crtc].vblank)dce_v10_0_crtc_vblank_int_ack (adev, crtc);
@@ -3421,7 +3421,7 @@ static int dce_v10_0_crtc_irq(struct amdgpu_device *adev,break ;default : -DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data); +DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data[0 ]);break ; }
@@ -3435,12 +3435,12 @@ static int dce_v10_0_hpd_irq(struct amdgpu_device *adev,uint32_t disp_int, mask;unsigned hpd; -if (entry->src_data >= adev->mode_info.num_hpd) { -DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data); +if (entry->src_data[0 ] >= adev->mode_info.num_hpd) { +DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data[0 ]);return 0 ; } - hpd = entry->src_data; + hpd = entry->src_data[0 ]; disp_int =RREG32 (interrupt_status_offsets[hpd].reg); mask = interrupt_status_offsets[hpd].hpd;
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +5 -5
@@ -3462,7 +3462,7 @@ static int dce_v11_0_crtc_irq(struct amdgpu_device *adev,uint32_t disp_int =RREG32 (interrupt_status_offsets[crtc].reg);unsigned irq_type =amdgpu_crtc_idx_to_irq_type (adev, crtc); -switch (entry->src_data) { +switch (entry->src_data[0 ]) {case 0 :/* vblank */ if (disp_int & interrupt_status_offsets[crtc].vblank)dce_v11_0_crtc_vblank_int_ack (adev, crtc);
@@ -3485,7 +3485,7 @@ static int dce_v11_0_crtc_irq(struct amdgpu_device *adev,break ;default : -DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data); +DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data[0 ]);break ; }
@@ -3499,12 +3499,12 @@ static int dce_v11_0_hpd_irq(struct amdgpu_device *adev,uint32_t disp_int, mask;unsigned hpd; -if (entry->src_data >= adev->mode_info.num_hpd) { -DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data); +if (entry->src_data[0 ] >= adev->mode_info.num_hpd) { +DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data[0 ]);return 0 ; } - hpd = entry->src_data; + hpd = entry->src_data[0 ]; disp_int =RREG32 (interrupt_status_offsets[hpd].reg); mask = interrupt_status_offsets[hpd].hpd;
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +5 -5
@@ -2592,7 +2592,7 @@ static int dce_v6_0_crtc_irq(struct amdgpu_device *adev,uint32_t disp_int =RREG32 (interrupt_status_offsets[crtc].reg);unsigned irq_type =amdgpu_crtc_idx_to_irq_type (adev, crtc); -switch (entry->src_data) { +switch (entry->src_data[0 ]) {case 0 :/* vblank */ if (disp_int & interrupt_status_offsets[crtc].vblank)WREG32 (mmVBLANK_STATUS + crtc_offsets[crtc],VBLANK_ACK );
@@ -2613,7 +2613,7 @@ static int dce_v6_0_crtc_irq(struct amdgpu_device *adev,DRM_DEBUG ("IH: D%d vline\n" , crtc +1 );break ;default : -DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data); +DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data[0 ]);break ; }
@@ -2703,12 +2703,12 @@ static int dce_v6_0_hpd_irq(struct amdgpu_device *adev,uint32_t disp_int, mask, tmp;unsigned hpd; -if (entry->src_data >= adev->mode_info.num_hpd) { -DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data); +if (entry->src_data[0 ] >= adev->mode_info.num_hpd) { +DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data[0 ]);return 0 ; } - hpd = entry->src_data; + hpd = entry->src_data[0 ]; disp_int =RREG32 (interrupt_status_offsets[hpd].reg); mask = interrupt_status_offsets[hpd].hpd;
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +5 -5
@@ -3159,7 +3159,7 @@ static int dce_v8_0_crtc_irq(struct amdgpu_device *adev,uint32_t disp_int =RREG32 (interrupt_status_offsets[crtc].reg);unsigned irq_type =amdgpu_crtc_idx_to_irq_type (adev, crtc); -switch (entry->src_data) { +switch (entry->src_data[0 ]) {case 0 :/* vblank */ if (disp_int & interrupt_status_offsets[crtc].vblank)WREG32 (mmLB_VBLANK_STATUS + crtc_offsets[crtc],LB_VBLANK_STATUS__VBLANK_ACK_MASK );
@@ -3180,7 +3180,7 @@ static int dce_v8_0_crtc_irq(struct amdgpu_device *adev,DRM_DEBUG ("IH: D%d vline\n" , crtc +1 );break ;default : -DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data); +DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data[0 ]);break ; }
@@ -3270,12 +3270,12 @@ static int dce_v8_0_hpd_irq(struct amdgpu_device *adev,uint32_t disp_int, mask, tmp;unsigned hpd; -if (entry->src_data >= adev->mode_info.num_hpd) { -DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data); +if (entry->src_data[0 ] >= adev->mode_info.num_hpd) { +DRM_DEBUG ("Unhandled interrupt: %d %d\n" , entry->src_id, entry->src_data[0 ]);return 0 ; } - hpd = entry->src_data; + hpd = entry->src_data[0 ]; disp_int =RREG32 (interrupt_status_offsets[hpd].reg); mask = interrupt_status_offsets[hpd].hpd;
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1 -1
@@ -1093,7 +1093,7 @@ static int gmc_v6_0_process_interrupt(struct amdgpu_device *adev,if (printk_ratelimit ()) {dev_err (adev->dev,"GPU fault detected: %d 0x%08x\n" , - entry->src_id, entry->src_data); + entry->src_id, entry->src_data[0 ]);dev_err (adev->dev," VM_CONTEXT1_PROTECTION_FAULT_ADDR 0x%08X\n" , addr); dev_err(adev->dev, " VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -1
@@ -1264,7 +1264,7 @@ static int gmc_v7_0_process_interrupt(struct amdgpu_device *adev,if (printk_ratelimit ()) {dev_err (adev->dev,"GPU fault detected: %d 0x%08x\n" , - entry->src_id, entry->src_data); + entry->src_id, entry->src_data[0 ]);dev_err (adev->dev," VM_CONTEXT1_PROTECTION_FAULT_ADDR 0x%08X\n" , addr); dev_err(adev->dev, " VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +2 -2
@@ -1301,7 +1301,7 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev,if (amdgpu_sriov_vf (adev)) {dev_err (adev->dev,"GPU fault detected: %d 0x%08x\n" , - entry->src_id, entry->src_data); + entry->src_id, entry->src_data[0 ]);dev_err (adev->dev," Can't decode VM fault info here on SRIOV VF\n" );return 0 ; }
@@ -1320,7 +1320,7 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev,if (printk_ratelimit ()) {dev_err (adev->dev,"GPU fault detected: %d 0x%08x\n" , - entry->src_id, entry->src_data); + entry->src_id, entry->src_data[0 ]);dev_err (adev->dev," VM_CONTEXT1_PROTECTION_FAULT_ADDR 0x%08X\n" , addr); dev_err(adev->dev, " VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",
drivers/gpu/drm/amd/amdgpu/iceland_ih.c +1 -1
@@ -229,7 +229,7 @@ static void iceland_ih_decode_iv(struct amdgpu_device *adev, entry->client_id =AMDGPU_IH_CLIENTID_LEGACY ; entry->src_id = dw[0 ] &0xff ; - entry->src_data = dw[1 ] &0xfffffff ; + entry->src_data[0 ] = dw[1 ] &0xfffffff ; entry->ring_id = dw[2 ] &0xff ; entry->vm_id = (dw[2 ] >>8 ) &0xff ; entry->pas_id = (dw[2 ] >>16 ) &0xffff ;
drivers/gpu/drm/amd/amdgpu/si_ih.c +1 -1
@@ -130,7 +130,7 @@ static void si_ih_decode_iv(struct amdgpu_device *adev, dw[3 ] =le32_to_cpu (adev->irq.ih.ring[ring_index +3 ]); entry->src_id = dw[0 ] &0xff ; - entry->src_data = dw[1 ] &0xfffffff ; + entry->src_data[0 ] = dw[1 ] &0xfffffff ; entry->ring_id = dw[2 ] &0xff ; entry->vm_id = (dw[2 ] >>8 ) &0xff ;
drivers/gpu/drm/amd/amdgpu/tonga_ih.c +1 -1
@@ -240,7 +240,7 @@ static void tonga_ih_decode_iv(struct amdgpu_device *adev, entry->client_id =AMDGPU_IH_CLIENTID_LEGACY ; entry->src_id = dw[0 ] &0xff ; - entry->src_data = dw[1 ] &0xfffffff ; + entry->src_data[0 ] = dw[1 ] &0xfffffff ; entry->ring_id = dw[2 ] &0xff ; entry->vm_id = (dw[2 ] >>8 ) &0xff ; entry->pas_id = (dw[2 ] >>16 ) &0xffff ;
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3 -3
@@ -560,14 +560,14 @@ static int vce_v2_0_process_interrupt(struct amdgpu_device *adev, struct amdgpu_iv_entry *entry) {DRM_DEBUG ("IH: VCE\n" ); -switch (entry->src_data) { +switch (entry->src_data[0 ]) {case 0 :case 1 : -amdgpu_fence_process (&adev->vce.ring[entry->src_data]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data[0 ]]);break ;default :DRM_ERROR ("Unhandled interrupt: %d %d\n" , - entry->src_id, entry->src_data); + entry->src_id, entry->src_data[0 ]);break ; }
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +3 -3
@@ -695,15 +695,15 @@ static int vce_v3_0_process_interrupt(struct amdgpu_device *adev,WREG32_FIELD (VCE_SYS_INT_STATUS ,VCE_SYS_INT_TRAP_INTERRUPT_INT ,1 ); -switch (entry->src_data) { +switch (entry->src_data[0 ]) {case 0 :case 1 :case 2 : -amdgpu_fence_process (&adev->vce.ring[entry->src_data]); +amdgpu_fence_process (&adev->vce.ring[entry->src_data[0 ]]);break ;default :DRM_ERROR ("Unhandled interrupt: %d %d\n" , - entry->src_id, entry->src_data); + entry->src_id, entry->src_data[0 ]);break ; }
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 7/23 drm/amdgpu: expand pte flags to uint64_t
In reply to a message not in the archiveFrom: Chunming Zhou <[email protected]>
Necessary for new asics.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 ++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 +++++++++--------- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +4 -4
@@ -280,7 +280,7 @@ struct amdgpu_vm_pte_funcs {void (*set_pte_pde)(struct amdgpu_ib *ib,uint64_t pe,uint64_t addr,unsigned count, -uint32_t incr,uint32_t flags); +uint32_t incr,uint64_t flags); };/* provided by the gmc block */
@@ -293,7 +293,7 @@ struct amdgpu_gart_funcs {void *cpu_pt_addr,/* cpu addr of page table */ uint32_t gpu_page_idx, /* pte/pde to update */ uint64_t addr, /* addr to write into pte/pde */ - uint32_t flags); /* access flags */ + uint64_t flags); /* access flags *//* enable/disable PRT support */ void (*set_prt)(struct amdgpu_device *adev,bool enable); };
@@ -539,7 +539,7 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset, int pages);int amdgpu_gart_bind (struct amdgpu_device *adev,uint64_t offset,int pages,struct page **pagelist, -dma_addr_t *dma_addr,uint32_t flags); +dma_addr_t *dma_addr,uint64_t flags);int amdgpu_ttm_recover_gart (struct amdgpu_device *adev);/*
@@ -1746,7 +1746,7 @@ bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start,bool amdgpu_ttm_tt_userptr_invalidated (struct ttm_tt *ttm,int *last_invalidated);bool amdgpu_ttm_tt_is_readonly (struct ttm_tt *ttm); -uint32_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm, +uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm,struct ttm_mem_reg *mem);void amdgpu_vram_location (struct amdgpu_device *adev,struct amdgpu_mc *mc,u64 base);void amdgpu_gtt_location (struct amdgpu_device *adev,struct amdgpu_mc *mc);
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +2 -2
@@ -229,7 +229,7 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,unsigned p;int i, j;u64 page_base; -uint32_t flags =AMDGPU_PTE_SYSTEM ; +uint64_t flags =AMDGPU_PTE_SYSTEM ;if (!adev->gart.ready) {WARN (1 ,"trying to unbind memory from uninitialized GART !\n" );
@@ -271,7 +271,7 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,*/ int amdgpu_gart_bind (struct amdgpu_device *adev,uint64_t offset,int pages,struct page **pagelist,dma_addr_t *dma_addr, -uint32_t flags) +uint64_t flags) {unsigned t;unsigned p;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -3
@@ -746,7 +746,7 @@ int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem) {struct ttm_tt *ttm = bo->ttm;struct amdgpu_ttm_tt *gtt = (void *)bo->ttm; -uint32_t flags; +uint64_t flags;int r;if (!ttm ||amdgpu_ttm_is_bound (ttm))
@@ -1027,10 +1027,10 @@ bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm)return !!(gtt->userflags &AMDGPU_GEM_USERPTR_READONLY ); } -uint32_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm, +uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm,struct ttm_mem_reg *mem) { -uint32_t flags =0 ; +uint64_t flags =0 ;if (mem && mem->mem_type !=TTM_PL_SYSTEM ) flags |=AMDGPU_PTE_VALID ;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +9 -9
@@ -64,7 +64,7 @@ struct amdgpu_pte_update_params {/* Function which actually does the update */ void (*func)(struct amdgpu_pte_update_params *params,uint64_t pe,uint64_t addr,unsigned count,uint32_t incr, -uint32_t flags); +uint64_t flags);/* indicate update pt or its shadow */ bool shadow; };
@@ -496,7 +496,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_find(struct amdgpu_vm *vm,static void amdgpu_vm_do_set_ptes (struct amdgpu_pte_update_params *params,uint64_t pe,uint64_t addr,unsigned count,uint32_t incr, -uint32_t flags) +uint64_t flags) {trace_amdgpu_vm_set_ptes (pe, addr, count, incr, flags);
@@ -525,7 +525,7 @@ static void amdgpu_vm_do_set_ptes(struct amdgpu_pte_update_params *params,static void amdgpu_vm_do_copy_ptes (struct amdgpu_pte_update_params *params,uint64_t pe,uint64_t addr,unsigned count,uint32_t incr, -uint32_t flags) +uint64_t flags) {uint64_t src = (params->src + (addr >>12 ) *8 );
@@ -718,7 +718,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,static void amdgpu_vm_update_ptes (struct amdgpu_pte_update_params *params,struct amdgpu_vm *vm,uint64_t start,uint64_t end, -uint64_t dst,uint32_t flags) +uint64_t dst,uint64_t flags) {const uint64_t mask =AMDGPU_VM_PTE_COUNT -1 ;
@@ -808,7 +808,7 @@ static void amdgpu_vm_update_ptes(struct amdgpu_pte_update_params *params,static void amdgpu_vm_frag_ptes (struct amdgpu_pte_update_params *params,struct amdgpu_vm *vm,uint64_t start,uint64_t end, -uint64_t dst,uint32_t flags) +uint64_t dst,uint64_t flags) {/** * The MC L1 TLB supports variable sized pages, based on a fragment
@@ -885,7 +885,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,dma_addr_t *pages_addr, struct amdgpu_vm *vm, uint64_t start, uint64_t last, - uint32_t flags, uint64_t addr, + uint64_t flags, uint64_t addr, struct dma_fence **fence) { struct amdgpu_ring *ring;
@@ -1023,11 +1023,11 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,*/ static int amdgpu_vm_bo_split_mapping (struct amdgpu_device *adev,struct dma_fence *exclusive, -uint32_t gtt_flags, +uint64_t gtt_flags,dma_addr_t *pages_addr,struct amdgpu_vm *vm,struct amdgpu_bo_va_mapping *mapping, -uint32_t flags, +uint64_t flags,struct drm_mm_node *nodes,struct dma_fence **fence) {
@@ -1114,7 +1114,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev,struct amdgpu_vm *vm = bo_va->vm;struct amdgpu_bo_va_mapping *mapping;dma_addr_t *pages_addr =NULL ; -uint32_t gtt_flags, flags; +uint64_t gtt_flags, flags;struct ttm_mem_reg *mem;struct drm_mm_node *nodes;struct dma_fence *exclusive;
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +1 -1
@@ -749,7 +749,7 @@ static void cik_sdma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,*/ static void cik_sdma_vm_set_pte_pde (struct amdgpu_ib *ib,uint64_t pe,uint64_t addr,unsigned count, -uint32_t incr,uint32_t flags) +uint32_t incr,uint64_t flags) {/* for physically contiguous pages (vram) */ ib->ptr[ib->length_dw++] =SDMA_PACKET (SDMA_OPCODE_GENERATE_PTE_PDE ,0 ,0 );
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1 -1
@@ -367,7 +367,7 @@ static int gmc_v6_0_gart_set_pte_pde(struct amdgpu_device *adev,void *cpu_pt_addr, uint32_t gpu_page_idx, uint64_t addr, - uint32_t flags) + uint64_t flags) { void __iomem *ptr = (void *)cpu_pt_addr;uint64_t value;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -1
@@ -439,7 +439,7 @@ static int gmc_v7_0_gart_set_pte_pde(struct amdgpu_device *adev,void *cpu_pt_addr, uint32_t gpu_page_idx, uint64_t addr, - uint32_t flags) + uint64_t flags) { void __iomem *ptr = (void *)cpu_pt_addr;uint64_t value;
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1 -1
@@ -531,7 +531,7 @@ static int gmc_v8_0_gart_set_pte_pde(struct amdgpu_device *adev,void *cpu_pt_addr, uint32_t gpu_page_idx, uint64_t addr, - uint32_t flags) + uint64_t flags) { void __iomem *ptr = (void *)cpu_pt_addr;uint64_t value;
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +1 -1
@@ -798,7 +798,7 @@ static void sdma_v2_4_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,*/ static void sdma_v2_4_vm_set_pte_pde (struct amdgpu_ib *ib,uint64_t pe,uint64_t addr,unsigned count, -uint32_t incr,uint32_t flags) +uint32_t incr,uint64_t flags) {/* for physically contiguous pages (vram) */ ib->ptr[ib->length_dw++] =SDMA_PKT_HEADER_OP (SDMA_OP_GEN_PTEPDE );
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +1 -1
@@ -1007,7 +1007,7 @@ static void sdma_v3_0_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,*/ static void sdma_v3_0_vm_set_pte_pde (struct amdgpu_ib *ib,uint64_t pe,uint64_t addr,unsigned count, -uint32_t incr,uint32_t flags) +uint32_t incr,uint64_t flags) {/* for physically contiguous pages (vram) */ ib->ptr[ib->length_dw++] =SDMA_PKT_HEADER_OP (SDMA_OP_GEN_PTEPDE );
drivers/gpu/drm/amd/amdgpu/si_dma.c +1 -1
@@ -398,7 +398,7 @@ static void si_dma_vm_write_pte(struct amdgpu_ib *ib, uint64_t pe,static void si_dma_vm_set_pte_pde (struct amdgpu_ib *ib,uint64_t pe,uint64_t addr,unsigned count, -uint32_t incr,uint32_t flags) +uint32_t incr,uint64_t flags) {uint64_t value;unsigned ndw;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 8/23 drm/amdgpu: add a ucode size member into firmware info
In reply to a message not in the archiveFrom: Huang Rui <[email protected]>
This will be used for newer asics.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +5 -2
@@ -232,9 +232,12 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_firmware_info *ucode,return 0 ; header = (const struct common_firmware_header *)ucode->fw->data; + + ucode->ucode_size =le32_to_cpu (header->ucode_size_bytes); +memcpy (ucode->kaddr, (void *)((uint8_t *)ucode->fw->data + -le32_to_cpu (header->ucode_array_offset_bytes)), -le32_to_cpu (header->ucode_size_bytes)); +le32_to_cpu (header->ucode_array_offset_bytes)), + ucode->ucode_size);return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +2 -0
@@ -161,6 +161,8 @@ struct amdgpu_firmware_info {uint64_t mc_addr;/* kernel linear address */ void *kaddr; +/* ucode_size_bytes */ +uint32_t ucode_size; };void amdgpu_ucode_print_mc_hdr (const struct common_firmware_header *hdr);
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 9/23 drm/amdgpu: set GART PTE asic specific flags
In reply to a message not in the archiveFrom: Alex Xie <[email protected]>
Set asic specific gart pte flags in the gmc IP module for each asic.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +--- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + 5 files changed, 8 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +4 -0
@@ -524,6 +524,10 @@ struct amdgpu_gart {struct page **pages;#endif bool ready; + +/* Asic default pte flags */ +uint64_t gart_pte_flags; +const struct amdgpu_gart_funcs *gart_funcs; };
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 -3
@@ -1042,9 +1042,7 @@ uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, flags |=AMDGPU_PTE_SNOOPED ; } -if (adev->asic_type >=CHIP_TONGA ) - flags |=AMDGPU_PTE_EXECUTABLE ; - + flags |= adev->gart.gart_pte_flags; flags |=AMDGPU_PTE_READABLE ;if (!amdgpu_ttm_tt_is_readonly (ttm))
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1 -0
@@ -554,6 +554,7 @@ static int gmc_v6_0_gart_init(struct amdgpu_device *adev)if (r)return r; adev->gart.table_size = adev->gart.num_gpu_pages *8 ; + adev->gart.gart_pte_flags =0 ;return amdgpu_gart_table_vram_alloc (adev); }
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -0
@@ -658,6 +658,7 @@ static int gmc_v7_0_gart_init(struct amdgpu_device *adev)if (r)return r; adev->gart.table_size = adev->gart.num_gpu_pages *8 ; + adev->gart.gart_pte_flags =0 ;return amdgpu_gart_table_vram_alloc (adev); }
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1 -0
@@ -789,6 +789,7 @@ static int gmc_v8_0_gart_init(struct amdgpu_device *adev)if (r)return r; adev->gart.table_size = adev->gart.num_gpu_pages *8 ; + adev->gart.gart_pte_flags =AMDGPU_PTE_EXECUTABLE ;return amdgpu_gart_table_vram_alloc (adev); }
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 10/23 drm/amdgpu: add a callback to set vm mapping flags
In reply to a message not in the archiveFrom: Alex Xie <[email protected]>
This lets each asic set whichever flags it supports.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +++--------- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 16 ++++++++++++++++ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 16 ++++++++++++++++ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 18 ++++++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +4 -0
@@ -296,6 +296,9 @@ struct amdgpu_gart_funcs { uint64_t flags); /* access flags *//* enable/disable PRT support */ void (*set_prt)(struct amdgpu_device *adev,bool enable); +/* set pte flags based per asic */ +uint64_t (*get_vm_pte_flags)(struct amdgpu_device *adev, +uint32_t flags); };/* provided by the ih block */
@@ -1682,6 +1685,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)#define amdgpu_vm_copy_pte (adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))#define amdgpu_vm_write_pte (adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))#define amdgpu_vm_set_pte_pde (adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags))) +#define amdgpu_vm_get_pte_flags (adev, flags) (adev)->gart.gart_funcs->get_vm_pte_flags((adev),(flags))#define amdgpu_ring_parse_cs (r, p, ib) ((r)->funcs->parse_cs((p), (ib)))#define amdgpu_ring_test_ring (r) (r)->funcs->test_ring((r))#define amdgpu_ring_test_ib (r, t) (r)->funcs->test_ib((r), (t))
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +3 -9
@@ -569,7 +569,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,struct ttm_validate_buffer tv;struct ww_acquire_ctx ticket;struct list_head list; -uint64_t va_flags =0 ; +uint64_t va_flags;int r =0 ;if (!adev->vm_manager.enabled)
@@ -631,14 +631,8 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,switch (args->operation) {case AMDGPU_VA_OP_MAP : -if (args->flags &AMDGPU_VM_PAGE_READABLE ) - va_flags |=AMDGPU_PTE_READABLE ; -if (args->flags &AMDGPU_VM_PAGE_WRITEABLE ) - va_flags |=AMDGPU_PTE_WRITEABLE ; -if (args->flags &AMDGPU_VM_PAGE_EXECUTABLE ) - va_flags |=AMDGPU_PTE_EXECUTABLE ; -if (args->flags &AMDGPU_VM_PAGE_PRT ) - va_flags |=AMDGPU_PTE_PRT ; + va_flags =amdgpu_vm_get_pte_flags (adev, args->flags); + r =amdgpu_vm_bo_map (adev, bo_va, args->va_address, args->offset_in_bo, args->map_size, va_flags);
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +16 -0
@@ -379,6 +379,21 @@ static int gmc_v6_0_gart_set_pte_pde(struct amdgpu_device *adev,return 0 ; } +static uint64_t gmc_v6_0_get_vm_pte_flags (struct amdgpu_device *adev, +uint32_t flags) +{ +uint64_t pte_flag =0 ; + +if (flags &AMDGPU_VM_PAGE_READABLE ) + pte_flag |=AMDGPU_PTE_READABLE ; +if (flags &AMDGPU_VM_PAGE_WRITEABLE ) + pte_flag |=AMDGPU_PTE_WRITEABLE ; +if (flags &AMDGPU_VM_PAGE_PRT ) + pte_flag |=AMDGPU_PTE_PRT ; + +return pte_flag; +} +static void gmc_v6_0_set_fault_enable_default (struct amdgpu_device *adev,bool value) {
@@ -1138,6 +1153,7 @@ static const struct amdgpu_gart_funcs gmc_v6_0_gart_funcs = { .flush_gpu_tlb = gmc_v6_0_gart_flush_gpu_tlb, .set_pte_pde = gmc_v6_0_gart_set_pte_pde, .set_prt = gmc_v6_0_set_prt, + .get_vm_pte_flags = gmc_v6_0_get_vm_pte_flags };static const struct amdgpu_irq_src_funcs gmc_v6_0_irq_funcs = {
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +16 -0
@@ -451,6 +451,21 @@ static int gmc_v7_0_gart_set_pte_pde(struct amdgpu_device *adev,return 0 ; } +static uint64_t gmc_v7_0_get_vm_pte_flags (struct amdgpu_device *adev, +uint32_t flags) +{ +uint64_t pte_flag =0 ; + +if (flags &AMDGPU_VM_PAGE_READABLE ) + pte_flag |=AMDGPU_PTE_READABLE ; +if (flags &AMDGPU_VM_PAGE_WRITEABLE ) + pte_flag |=AMDGPU_PTE_WRITEABLE ; +if (flags &AMDGPU_VM_PAGE_PRT ) + pte_flag |=AMDGPU_PTE_PRT ; + +return pte_flag; +} +/** * gmc_v8_0_set_fault_enable_default - update VM fault handling *
@@ -1323,6 +1338,7 @@ static const struct amdgpu_gart_funcs gmc_v7_0_gart_funcs = { .flush_gpu_tlb = gmc_v7_0_gart_flush_gpu_tlb, .set_pte_pde = gmc_v7_0_gart_set_pte_pde, .set_prt = gmc_v7_0_set_prt, + .get_vm_pte_flags = gmc_v7_0_get_vm_pte_flags };static const struct amdgpu_irq_src_funcs gmc_v7_0_irq_funcs = {
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +18 -0
@@ -563,6 +563,23 @@ static int gmc_v8_0_gart_set_pte_pde(struct amdgpu_device *adev,return 0 ; } +static uint64_t gmc_v8_0_get_vm_pte_flags (struct amdgpu_device *adev, +uint32_t flags) +{ +uint64_t pte_flag =0 ; + +if (flags &AMDGPU_VM_PAGE_EXECUTABLE ) + pte_flag |=AMDGPU_PTE_EXECUTABLE ; +if (flags &AMDGPU_VM_PAGE_READABLE ) + pte_flag |=AMDGPU_PTE_READABLE ; +if (flags &AMDGPU_VM_PAGE_WRITEABLE ) + pte_flag |=AMDGPU_PTE_WRITEABLE ; +if (flags &AMDGPU_VM_PAGE_PRT ) + pte_flag |=AMDGPU_PTE_PRT ; + +return pte_flag; +} +/** * gmc_v8_0_set_fault_enable_default - update VM fault handling *
@@ -1562,6 +1579,7 @@ static const struct amdgpu_gart_funcs gmc_v8_0_gart_funcs = { .flush_gpu_tlb = gmc_v8_0_gart_flush_gpu_tlb, .set_pte_pde = gmc_v8_0_gart_set_pte_pde, .set_prt = gmc_v8_0_set_prt, + .get_vm_pte_flags = gmc_v8_0_get_vm_pte_flags };static const struct amdgpu_irq_src_funcs gmc_v8_0_irq_funcs = {
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 11/23 drm/amdgpu: check function points valid before use. (v2)
In reply to a message not in the archiveFrom: Rex Zhu <[email protected]>
v2: agd: integrate Christian's comments.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +12 -14
@@ -1191,13 +1191,12 @@ int amdgpu_set_clockgating_state(struct amdgpu_device *adev,for (i =0 ; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, - state); -if (r) -return r; -break ; - } +if (adev->ip_blocks[i].version->type != block_type) +continue ; +if (!adev->ip_blocks[i].version->funcs->set_clockgating_state) +continue ; + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ( + (void *)adev, state); }return r; }
@@ -1211,13 +1210,12 @@ int amdgpu_set_powergating_state(struct amdgpu_device *adev,for (i =0 ; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_powergating_state ((void *)adev, - state); -if (r) -return r; -break ; - } +if (adev->ip_blocks[i].version->type != block_type) +continue ; +if (!adev->ip_blocks[i].version->funcs->set_powergating_state) +continue ; + r = adev->ip_blocks[i].version->funcs->set_powergating_state ( + (void *)adev, state); }return r; }
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1489073143-23428-12-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 11/23] drm/amdgpu: check function points valid before use. (v2)
Am 09.03.2017 um 16:25 schrieb Alex Deucher:
Quoted 21 lines
From: Rex Zhu <[email protected]>
v2: agd: integrate Christian's comments.
Signed-off-by Rex Zhu <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-3@@ -1191,13 +1191,12 @@ int amdgpu_set_clockgating_state(struct amdgpu_device *adev,for (i =0 ; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, - state);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c int amdgpu_set_clockgating_state(struct amdgpu_device *adev, · line 1199
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +6
-4-if (r) -return r; -break ; - } +if (adev->ip_blocks[i].version->type != block_type) +continue ; +if (!adev->ip_blocks[i].version->funcs->set_clockgating_state) +continue ; + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ( + (void *)adev, state);
Aren't we missing the "if (r) return r" now? Not that it makes much difference, cause we currently only have one block of each type, don't we?
Christian.
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-6}return r; }@@ -1211,13 +1210,12 @@ int amdgpu_set_powergating_state(struct amdgpu_device *adev,for (i =0 ; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_powergating_state ((void *)adev, - state); -if (r) -return r; -break ;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c int amdgpu_set_powergating_state(struct amdgpu_device *adev, · line 1221
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +6
-1- } +if (adev->ip_blocks[i].version->type != block_type) +continue ; +if (!adev->ip_blocks[i].version->funcs->set_powergating_state) +continue ; + r = adev->ip_blocks[i].version->funcs->set_powergating_state ( + (void *)adev, state); }return r; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): d383c6a0-1ad9-fc0c-f415-a9b999662fc3-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Re: [PATCH 11/23] drm/amdgpu: check function points valid before use. (v2)
Quoted 36 lines · Christian König
Am 09.03.2017 um 16:25 schrieb Alex Deucher:
Quoted 35 lines
From: Rex Zhu <[email protected]>
v2: agd: integrate Christian's comments.
Signed-off-by Rex Zhu <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-7@@ -1191,13 +1191,12 @@ int amdgpu_set_clockgating_state(struct amdgpu_device *adev, for (i = 0; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, - state); -if (r) -return r; -break ; - } +if (adev->ip_blocks[i].version->type != block_type) +continue ; + if(!adev->ip_blocks[i].version->funcs->set_clockgating_state)
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+continue ; + r =adev->ip_blocks[i].version->funcs->set_clockgating_state(
+ (void *)adev, state);Aren't we missing the "if (r) return r" now? Not that it makes much difference, cause we currently only have one block of each type, don't we?
yeah, I dropped them on purpose since we could theoretically have multiple blocks of the same type. We don't at the moment.
Alex
Quoted 24 lines
Christian.
Quoted 20 lines
} return r;}
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-7@@ -1211,13 +1210,12 @@ int amdgpu_set_powergating_state(struct amdgpu_device *adev, for (i = 0; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_powergating_state ((void *)adev, - state); -if (r) -return r; -break ; - } +if (adev->ip_blocks[i].version->type != block_type) +continue ; + if
Quoted 11 lines
Quoted 8 lines
(!adev->ip_blocks[i].version->funcs->set_powergating_state)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+continue ; + r =adev->ip_blocks[i].version->funcs->set_powergating_state(
+ (void *)adev, state); } return r;}
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_Oshjz3ZehWBxFeB0o_5P46RYpAoD=RN8eoq2cgtjaekQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: [PATCH 11/23] drm/amdgpu: check function points valid before use. (v2)
Am 09.03.2017 um 16:57 schrieb Alex Deucher:
Quoted 44 lines
Quoted 34 lines · Christian König
Am 09.03.2017 um 16:25 schrieb Alex Deucher:
Quoted 33 lines
From: Rex Zhu <[email protected]>
v2: agd: integrate Christian's comments.
Signed-off-by Rex Zhu <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-7@@ -1191,13 +1191,12 @@ int amdgpu_set_clockgating_state(struct amdgpu_device *adev, for (i = 0; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, - state); -if (r) -return r; -break ; - } +if (adev->ip_blocks[i].version->type != block_type) +continue ; + ifQuoted 8 lines
Quoted 5 lines
(!adev->ip_blocks[i].version->funcs->set_clockgating_state)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+continue ; + r =adev->ip_blocks[i].version->funcs->set_clockgating_state(
+ (void *)adev, state);Aren't we missing the "if (r) return r" now? Not that it makes much difference, cause we currently only have one block of each type, don't we?
Quoted 2 lines
yeah, I dropped them on purpose since we could theoretically have multiple blocks of the same type. We don't at the moment.
But in this case we should probably at least print some warning.
Otherwise if we ever get more than one block of a type and the first one has a problem we never notice that because the return value is lost after the second instance is called.
Christian.
Quoted 36 lines
Alex
Quoted 33 lines
Christian.
Quoted 28 lines
} return r;}
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-7@@ -1211,13 +1210,12 @@ int amdgpu_set_powergating_state(struct amdgpu_device *adev, for (i = 0; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_powergating_state ((void *)adev, - state); -if (r) -return r; -break ; - } +if (adev->ip_blocks[i].version->type != block_type) +continue ; + if(!adev->ip_blocks[i].version->funcs->set_powergating_state)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+continue ; + r =adev->ip_blocks[i].version->funcs->set_powergating_state(
+ (void *)adev, state); } return r;}
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): b091d47e-4f33-38a6-c2ec-09c211667e9d-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Re: [PATCH 11/23] drm/amdgpu: check function points valid before use. (v2)
Quoted 55 lines · Christian König
Am 09.03.2017 um 16:57 schrieb Alex Deucher:
Quoted 50 lines
Quoted 38 lines · Christian König
Am 09.03.2017 um 16:25 schrieb Alex Deucher:
Quoted 36 lines
From: Rex Zhu <[email protected]>
v2: agd: integrate Christian's comments.
Signed-off-by Rex Zhu <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-7@@ -1191,13 +1191,12 @@ int amdgpu_set_clockgating_state(struct amdgpu_device *adev, for (i = 0; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, - state); -if (r) -return r; -break ; - } +if (adev->ip_blocks[i].version->type != block_type) +continue ; + if(!adev->ip_blocks[i].version->funcs->set_clockgating_state)
+ continue;Quoted 8 lines
Quoted 3 lines
+ r =
adev->ip_blocks[i].version->funcs->set_clockgating_state(
+ (void *)adev, state);Aren't we missing the "if (r) return r" now? Not that it makes much difference, cause we currently only have one block of each type, don't we?
Quoted 2 lines
yeah, I dropped them on purpose since we could theoretically have multiple blocks of the same type. We don't at the moment.
Quoted 5 lines
But in this case we should probably at least print some warning.
Otherwise if we ever get more than one block of a type and the first one has a problem we never notice that because the return value is lost after the second instance is called.
Sure, I'll update the patch.
Alex
Quoted 42 lines
Christian.
Quoted 37 lines
Alex
Quoted 34 lines
Christian.
Quoted 28 lines
} return r;}
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-7@@ -1211,13 +1210,12 @@ int amdgpu_set_powergating_state(struct amdgpu_device *adev, for (i = 0; i < adev->num_ip_blocks; i++) {if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].version->type == block_type) { - r = adev->ip_blocks[i].version->funcs->set_powergating_state ((void *)adev, - state); -if (r) -return r; -break ; - } +if (adev->ip_blocks[i].version->type != block_type) +continue ; + if(!adev->ip_blocks[i].version->funcs->set_powergating_state)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-0+continue ; + r =adev->ip_blocks[i].version->funcs->set_powergating_state(
+ (void *)adev, state); } return r;}
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 12/23 drm/amdgpu: add asic callback to get memsize register
In reply to a message not in the archiveNewer asics use different registers so abstract it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/amdgpu/cik.c | 6 ++++++ drivers/gpu/drm/amd/amdgpu/si.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/vi.c | 6 ++++++ 5 files changed, 23 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +3 -0
@@ -1221,6 +1221,8 @@ struct amdgpu_asic_funcs {/* static power management */ int (*get_pcie_lanes)(struct amdgpu_device *adev);void (*set_pcie_lanes)(struct amdgpu_device *adev,int lanes); +/* get config memsize register */ +u32 (*get_config_memsize)(struct amdgpu_device *adev); };/*
@@ -1680,6 +1682,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)#define amdgpu_asic_read_disabled_bios (adev) (adev)->asic_funcs->read_disabled_bios((adev))#define amdgpu_asic_read_bios_from_rom (adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l))#define amdgpu_asic_read_register (adev, se, sh, offset, v)((adev)->asic_funcs->read_register((adev), (se), (sh), (offset), (v))) +#define amdgpu_asic_get_config_memsize (adev) (adev)->asic_funcs->get_config_memsize((adev))#define amdgpu_gart_flush_gpu_tlb (adev, vmid) (adev)->gart.gart_funcs->flush_gpu_tlb((adev), (vmid))#define amdgpu_gart_set_pte_pde (adev, pt, idx, addr, flags) (adev)->gart.gart_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags))#define amdgpu_vm_copy_pte (adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -713,7 +713,7 @@ bool amdgpu_need_post(struct amdgpu_device *adev)return true; }/* then check MEM_SIZE, in case the crtcs are off */ - reg =RREG32 (mmCONFIG_MEMSIZE); + reg =amdgpu_asic_get_config_memsize (adev);if (reg)return false;
drivers/gpu/drm/amd/amdgpu/cik.c +6 -0
@@ -1212,6 +1212,11 @@ static int cik_asic_reset(struct amdgpu_device *adev)return r; } +static u32 cik_get_config_memsize (struct amdgpu_device *adev) +{ +return RREG32 (mmCONFIG_MEMSIZE); +} +static int cik_set_uvd_clock (struct amdgpu_device *adev,u32 clock,u32 cntl_reg,u32 status_reg) {
@@ -1641,6 +1646,7 @@ static const struct amdgpu_asic_funcs cik_asic_funcs = .get_xclk = &cik_get_xclk, .set_uvd_clocks = &cik_set_uvd_clocks, .set_vce_clocks = &cik_set_vce_clocks, + .get_config_memsize = &cik_get_config_memsize, };static int cik_common_early_init (void *handle)
drivers/gpu/drm/amd/amdgpu/si.c +7 -0
@@ -45,6 +45,7 @@#include "gmc/gmc_6_0_d.h" #include "dce/dce_6_0_d.h" #include "uvd/uvd_4_0_d.h" +#include "bif/bif_3_0_d.h" static const u32 tahiti_golden_registers[] = {
@@ -1155,6 +1156,11 @@ static int si_asic_reset(struct amdgpu_device *adev)return 0 ; } +static u32 si_get_config_memsize (struct amdgpu_device *adev) +{ +return RREG32 (mmCONFIG_MEMSIZE); +} +static void si_vga_set_state (struct amdgpu_device *adev,bool state) {uint32_t temp;
@@ -1206,6 +1212,7 @@ static const struct amdgpu_asic_funcs si_asic_funcs = .get_xclk = &si_get_xclk, .set_uvd_clocks = &si_set_uvd_clocks, .set_vce_clocks = NULL, + .get_config_memsize = &si_get_config_memsize, };static uint32_t si_get_rev_id (struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/vi.c +6 -0
@@ -751,6 +751,11 @@ static int vi_asic_reset(struct amdgpu_device *adev)return r; } +static u32 vi_get_config_memsize (struct amdgpu_device *adev) +{ +return RREG32 (mmCONFIG_MEMSIZE); +} +static int vi_set_uvd_clock (struct amdgpu_device *adev,u32 clock,u32 cntl_reg,u32 status_reg) {
@@ -900,6 +905,7 @@ static const struct amdgpu_asic_funcs vi_asic_funcs = .get_xclk = &vi_get_xclk, .set_uvd_clocks = &vi_set_uvd_clocks, .set_vce_clocks = &vi_set_vce_clocks, + .get_config_memsize = &vi_get_config_memsize, };static int vi_common_early_init (void *handle)
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 13/23 drm/amdgpu: add DRM MGCG header
In reply to a message not in the archiveFrom: Huang Rui <[email protected]>
--- drivers/gpu/drm/amd/include/amd_shared.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/include/amd_shared.h +1 -0
@@ -157,6 +157,7 @@ struct amd_pp_profile {#define AMD_CG_SUPPORT_BIF_MGCG (1 << 19)#define AMD_CG_SUPPORT_GFX_3D_CGCG (1 << 20)#define AMD_CG_SUPPORT_GFX_3D_CGLS (1 << 21) +#define AMD_CG_SUPPORT_DRM_MGCG (1 << 22)/* PG flags */ #define AMD_PG_SUPPORT_GFX_PG (1 << 0)
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 14/23 drm/amdgpu: add DF MGCG flag
In reply to a message not in the archiveFrom: Huang Rui <[email protected]>
--- drivers/gpu/drm/amd/include/amd_shared.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/include/amd_shared.h +1 -0
@@ -158,6 +158,7 @@ struct amd_pp_profile {#define AMD_CG_SUPPORT_GFX_3D_CGCG (1 << 20)#define AMD_CG_SUPPORT_GFX_3D_CGLS (1 << 21)#define AMD_CG_SUPPORT_DRM_MGCG (1 << 22) +#define AMD_CG_SUPPORT_DF_MGCG (1 << 23)/* PG flags */ #define AMD_PG_SUPPORT_GFX_PG (1 << 0)
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 15/23 drm/amdgpu: add a ring func for end command
In reply to a message not in the archiveFrom: Leo Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + 2 files changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3 -0
@@ -222,6 +222,9 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,return r; } +if (ring->funcs->insert_end) + ring->funcs->insert_end (ring); +/* wrap the last IB with fence */ if (job && job->uf_addr) { amdgpu_ring_emit_fence(ring, job->uf_addr, job->uf_sequence,
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -127,6 +127,7 @@ struct amdgpu_ring_funcs {int (*test_ib)(struct amdgpu_ring *ring,long timeout);/* insert NOP packets */ void (*insert_nop)(struct amdgpu_ring *ring,uint32_t count); +void (*insert_end)(struct amdgpu_ring *ring);/* pad the indirect buffer to the necessary number of dw */ void (*pad_ib)(struct amdgpu_ring *ring,struct amdgpu_ib *ib);unsigned (*init_cond_exec)(struct amdgpu_ring *ring);
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 16/23 drm/amdgpu: move amdgpu_uvd structure to uvd header
In reply to a message not in the archiveFrom: Leo Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 30 +----------------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -29
@@ -59,6 +59,7 @@#include "amd_powerplay.h" #include "amdgpu_dpm.h" #include "amdgpu_acp.h" +#include "amdgpu_uvd.h" #include "gpu_scheduler.h" #include "amdgpu_virt.h"
@@ -1034,35 +1035,6 @@ void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb);void amdgpu_get_pcie_info (struct amdgpu_device *adev);/* -* UVD -*/ -#define AMDGPU_DEFAULT_UVD_HANDLES 10 -#define AMDGPU_MAX_UVD_HANDLES 40 -#define AMDGPU_UVD_STACK_SIZE (200*1024) -#define AMDGPU_UVD_HEAP_SIZE (256*1024) -#define AMDGPU_UVD_SESSION_SIZE (50*1024) -#define AMDGPU_UVD_FIRMWARE_OFFSET 256 - -struct amdgpu_uvd { -struct amdgpu_bo *vcpu_bo; -void *cpu_addr; -uint64_t gpu_addr; -unsigned fw_version; -void *saved_bo; -unsigned max_handles; -atomic_t handles[AMDGPU_MAX_UVD_HANDLES ]; -struct drm_file *filp[AMDGPU_MAX_UVD_HANDLES ]; -struct delayed_work idle_work; -const struct firmware *fw;/* UVD firmware */ -struct amdgpu_ring ring; -struct amdgpu_irq_src irq; -bool address_64_bit; -bool use_ctx_buf; -struct amd_sched_entity entity; -uint32_t srbm_soft_reset; -}; - -/* * VCE */ #define AMDGPU_MAX_VCE_HANDLES 16
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h +26 -0
@@ -24,6 +24,32 @@#ifndef __AMDGPU_UVD_H__#define __AMDGPU_UVD_H__ +#define AMDGPU_DEFAULT_UVD_HANDLES 10 +#define AMDGPU_MAX_UVD_HANDLES 40 +#define AMDGPU_UVD_STACK_SIZE (200*1024) +#define AMDGPU_UVD_HEAP_SIZE (256*1024) +#define AMDGPU_UVD_SESSION_SIZE (50*1024) +#define AMDGPU_UVD_FIRMWARE_OFFSET 256 + +struct amdgpu_uvd { +struct amdgpu_bo *vcpu_bo; +void *cpu_addr; +uint64_t gpu_addr; +unsigned fw_version; +void *saved_bo; +unsigned max_handles; +atomic_t handles[AMDGPU_MAX_UVD_HANDLES ]; +struct drm_file *filp[AMDGPU_MAX_UVD_HANDLES ]; +struct delayed_work idle_work; +const struct firmware *fw;/* UVD firmware */ +struct amdgpu_ring ring; +struct amdgpu_irq_src irq; +bool address_64_bit; +bool use_ctx_buf; +struct amd_sched_entity entity; +uint32_t srbm_soft_reset; +}; +int amdgpu_uvd_sw_init (struct amdgpu_device *adev);int amdgpu_uvd_sw_fini (struct amdgpu_device *adev);int amdgpu_uvd_suspend (struct amdgpu_device *adev);
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 17/23 drm/amdgpu: move amdgpu_vce structure to vce header
In reply to a message not in the archiveFrom: Leo Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 29 +---------------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -28
@@ -60,6 +60,7 @@#include "amdgpu_dpm.h" #include "amdgpu_acp.h" #include "amdgpu_uvd.h" +#include "amdgpu_vce.h" #include "gpu_scheduler.h" #include "amdgpu_virt.h"
@@ -1035,34 +1036,6 @@ void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb);void amdgpu_get_pcie_info (struct amdgpu_device *adev);/* -* VCE -*/ -#define AMDGPU_MAX_VCE_HANDLES 16 -#define AMDGPU_VCE_FIRMWARE_OFFSET 256 - -#define AMDGPU_VCE_HARVEST_VCE0 (1 << 0) -#define AMDGPU_VCE_HARVEST_VCE1 (1 << 1) - -struct amdgpu_vce { -struct amdgpu_bo *vcpu_bo; -uint64_t gpu_addr; -unsigned fw_version; -unsigned fb_version; -atomic_t handles[AMDGPU_MAX_VCE_HANDLES ]; -struct drm_file *filp[AMDGPU_MAX_VCE_HANDLES ]; -uint32_t img_size[AMDGPU_MAX_VCE_HANDLES ]; -struct delayed_work idle_work; -struct mutex idle_mutex; -const struct firmware *fw;/* VCE firmware */ -struct amdgpu_ring ring[AMDGPU_MAX_VCE_RINGS ]; -struct amdgpu_irq_src irq; -unsigned harvest_config; -struct amd_sched_entity entity; -uint32_t srbm_soft_reset; -unsigned num_rings; -}; - -/* * SDMA */ struct amdgpu_sdma_instance {
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h +25 -0
@@ -24,6 +24,31 @@#ifndef __AMDGPU_VCE_H__#define __AMDGPU_VCE_H__ +#define AMDGPU_MAX_VCE_HANDLES 16 +#define AMDGPU_VCE_FIRMWARE_OFFSET 256 + +#define AMDGPU_VCE_HARVEST_VCE0 (1 << 0) +#define AMDGPU_VCE_HARVEST_VCE1 (1 << 1) + +struct amdgpu_vce { +struct amdgpu_bo *vcpu_bo; +uint64_t gpu_addr; +unsigned fw_version; +unsigned fb_version; +atomic_t handles[AMDGPU_MAX_VCE_HANDLES ]; +struct drm_file *filp[AMDGPU_MAX_VCE_HANDLES ]; +uint32_t img_size[AMDGPU_MAX_VCE_HANDLES ]; +struct delayed_work idle_work; +struct mutex idle_mutex; +const struct firmware *fw;/* VCE firmware */ +struct amdgpu_ring ring[AMDGPU_MAX_VCE_RINGS ]; +struct amdgpu_irq_src irq; +unsigned harvest_config; +struct amd_sched_entity entity; +uint32_t srbm_soft_reset; +unsigned num_rings; +}; +int amdgpu_vce_sw_init (struct amdgpu_device *adev,unsigned long size);int amdgpu_vce_sw_fini (struct amdgpu_device *adev);int amdgpu_vce_suspend (struct amdgpu_device *adev);
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 18/23 drm/amdgpu: add uvd enc rings
In reply to a message not in the archiveFrom: Leo Liu <[email protected]>
And initialize them
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +2 -1
@@ -27,10 +27,11 @@#include "gpu_scheduler.h" /* max number of rings */ -#define AMDGPU_MAX_RINGS 16 +#define AMDGPU_MAX_RINGS 18#define AMDGPU_MAX_GFX_RINGS 1#define AMDGPU_MAX_COMPUTE_RINGS 8#define AMDGPU_MAX_VCE_RINGS 3 +#define AMDGPU_MAX_UVD_ENC_RINGS 2/* some special values for the owner field */ #define AMDGPU_FENCE_OWNER_UNDEFINED ((void*)0ul)
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h +2 -0
@@ -43,11 +43,13 @@ struct amdgpu_uvd {struct delayed_work idle_work;const struct firmware *fw;/* UVD firmware */ struct amdgpu_ring ring; +struct amdgpu_ring ring_enc[AMDGPU_MAX_UVD_ENC_RINGS ];struct amdgpu_irq_src irq;bool address_64_bit;bool use_ctx_buf;struct amd_sched_entity entity;uint32_t srbm_soft_reset; +unsigned num_enc_rings; };int amdgpu_uvd_sw_init (struct amdgpu_device *adev);
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 19/23 drm/amdgpu: add uvd enc run queue
In reply to a message not in the archiveFrom: Leo Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h +1 -0
@@ -48,6 +48,7 @@ struct amdgpu_uvd {bool address_64_bit;bool use_ctx_buf;struct amd_sched_entity entity; +struct amd_sched_entity entity_enc;uint32_t srbm_soft_reset;unsigned num_enc_rings; };
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 20/23 drm/amdgpu: add uvd enc ring type and functions
In reply to a message not in the archiveFrom: Leo Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +2 -1
@@ -46,7 +46,8 @@ enum amdgpu_ring_type {AMDGPU_RING_TYPE_SDMA ,AMDGPU_RING_TYPE_UVD ,AMDGPU_RING_TYPE_VCE , - AMDGPU_RING_TYPE_KIQ +AMDGPU_RING_TYPE_KIQ , + AMDGPU_RING_TYPE_UVD_ENC };struct amdgpu_device ;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 21/23 uapi/drm: add AMDGPU_HW_IP_UVD_ENC
In reply to a message not in the archiveFrom: Leo Liu <[email protected]>
--- include/uapi/drm/amdgpu_drm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/uapi/drm/amdgpu_drm.h +2 -1
@@ -385,7 +385,8 @@ struct drm_amdgpu_gem_va {#define AMDGPU_HW_IP_DMA 2#define AMDGPU_HW_IP_UVD 3#define AMDGPU_HW_IP_VCE 4 -#define AMDGPU_HW_IP_NUM 5 +#define AMDGPU_HW_IP_UVD_ENC 5 +#define AMDGPU_HW_IP_NUM 6#define AMDGPU_HW_IP_INSTANCE_MAX_COUNT 1
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 22/23 drm/amdgpu: add AMDGPU_HW_IP_UVD_ENC to info query
In reply to a message not in the archiveFrom: Leo Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +10 -0
@@ -309,6 +309,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file ib_start_alignment =AMDGPU_GPU_PAGE_SIZE ; ib_size_alignment =1 ;break ; +case AMDGPU_HW_IP_UVD_ENC : + type =AMD_IP_BLOCK_TYPE_UVD ; +for (i =0 ; i < adev->uvd.num_enc_rings; i++) + ring_mask |= ((adev->uvd.ring_enc[i].ready ?1 :0 ) << i); + ib_start_alignment =AMDGPU_GPU_PAGE_SIZE ; + ib_size_alignment =1 ; +break ;default :return -EINVAL ; }
@@ -348,6 +355,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_filecase AMDGPU_HW_IP_VCE : type =AMD_IP_BLOCK_TYPE_VCE ;break ; +case AMDGPU_HW_IP_UVD_ENC : + type =AMD_IP_BLOCK_TYPE_UVD ; +break ;default :return -EINVAL ; }
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 23/23 drm/amdgpu: get cs support of AMDGPU_HW_IP_UVD_ENC
In reply to a message not in the archiveFrom: Leo Liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +9 -0
@@ -82,6 +82,15 @@ int amdgpu_cs_get_ring(struct amdgpu_device *adev, u32 ip_type,return -EINVAL ; }break ; +case AMDGPU_HW_IP_UVD_ENC : +if (ring < adev->uvd.num_enc_rings){ + *out_ring = &adev->uvd.ring_enc[ring]; + }else { +DRM_ERROR ("only %d UVD ENC rings are supported\n" , + adev->uvd.num_enc_rings); +return -EINVAL ; + } +break ; }if (!(*out_ring && (*out_ring)->adev)) {
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Patch #1 is Acked-by: Christian König <[email protected]>.
Patch #2 and #5 are Reviewed-by: Christian König <[email protected]>.
One more comment on patch #11 and I didn't miss anything, did I?
Christian.
Am 09.03.2017 um 16:25 schrieb Alex Deucher:
Quoted 91 lines
This set of patches updates various infrastructure in the driver to support new asics.
v2: integrate comments and reviews.
Alex Deucher (3):
drm/amdgpu: switch ih handling to two levels (v2) drm/amdgpu/ih: store the full context id drm/amdgpu: add asic callback to get memsize registerAlex Xie (2):
drm/amdgpu: set GART PTE asic specific flags drm/amdgpu: add a callback to set vm mapping flagsChunming Zhou (1):
drm/amdgpu: expand pte flags touint64_tHuang Rui (3):
drm/amdgpu: add a ucode size member into firmware info drm/amdgpu: add DRM MGCG header
drm/amdgpu: add DF MGCG flagJunwei Zhang (1):
drm/amdgpu: init aperture definitions (v2)Ken Wang (3):
drm/amdgpu: change wptr to 64 bits (v2)
drm/amdgpu: add 64bit wb functions
drm/amdgpu: add 64bit doorbell functions (v2)Leo Liu (9):
drm/amdgpu: add a ring func for end command drm/amdgpu: moveamdgpu_uvdstructure to uvd header drm/amdgpu: moveamdgpu_vcestructure to vce header drm/amdgpu: add uvd enc rings
drm/amdgpu: add uvd enc run queue drm/amdgpu: add uvd enc ring type and functions uapi/drm: addAMDGPU_HW_IP_UVD_ENCdrm/amdgpu: addAMDGPU_HW_IP_UVD_ENCto info query drm/amdgpu: get cs support ofAMDGPU_HW_IP_UVD_ENCRex Zhu (1):
drm/amdgpu: check function points valid before use. (v2)drivers/gpu/drm/amd/amdgpu/amdgpu.h | 91 ++++++++--------------- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 24 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 9 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 105 +++++++++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 111 ++++++++++++++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 55 ++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 19 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 29 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 25 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 ++--- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/cik.c | 6 ++ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 23 +++--- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 17 ++--- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 50 +++++++++---- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 50 ++++++++----- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 25 +++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 33 +++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 37 ++++++++-- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 22 +++--- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 26 ++++--- drivers/gpu/drm/amd/amdgpu/si.c | 7 ++ drivers/gpu/drm/amd/amdgpu/si_dma.c | 18 ++--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 11 +-- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 11 +--
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 12 ++-- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 25 +++---- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 32 +++++---- drivers/gpu/drm/amd/amdgpu/vi.c | 6 ++ drivers/gpu/drm/amd/include/amd_shared.h | 2 + drivers/gpu/drm/amd/include/cgs_linux.h | 19 ++--- include/uapi/drm/amdgpu_drm.h | 3 +- 54 files changed, 730 insertions(+), 358 deletions(-)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): c729005a-f4c2-3dfa-43ae-87c900e1dd5b-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Quoted 5 lines · Christian König
Patch #1 is Acked-by: Christian König <[email protected]>.
Patch #2 and #5 are Reviewed-by: Christian König <[email protected]>.
One more comment on patch #11 and I didn't miss anything, did I?
Nope, I think that's it.
Alex
Quoted 109 lines
Christian.
Am 09.03.2017 um 16:25 schrieb Alex Deucher:
Quoted 103 lines
This set of patches updates various infrastructure in the driver to support new asics.
v2: integrate comments and reviews.
Alex Deucher (3):
drm/amdgpu: switch ih handling to two levels (v2) drm/amdgpu/ih: store the full context id drm/amdgpu: add asic callback to get memsize registerAlex Xie (2):
drm/amdgpu: set GART PTE asic specific flags drm/amdgpu: add a callback to set vm mapping flagsChunming Zhou (1):
drm/amdgpu: expand pte flags touint64_tHuang Rui (3):
drm/amdgpu: add a ucode size member into firmware info drm/amdgpu: add DRM MGCG header
drm/amdgpu: add DF MGCG flagJunwei Zhang (1):
drm/amdgpu: init aperture definitions (v2)Ken Wang (3):
drm/amdgpu: change wptr to 64 bits (v2)
drm/amdgpu: add 64bit wb functions
drm/amdgpu: add 64bit doorbell functions (v2)Leo Liu (9):
drm/amdgpu: add a ring func for end command drm/amdgpu: moveamdgpu_uvdstructure to uvd header drm/amdgpu: moveamdgpu_vcestructure to vce header drm/amdgpu: add uvd enc rings
drm/amdgpu: add uvd enc run queue drm/amdgpu: add uvd enc ring type and functions uapi/drm: addAMDGPU_HW_IP_UVD_ENCdrm/amdgpu: addAMDGPU_HW_IP_UVD_ENCto info query drm/amdgpu: get cs support ofAMDGPU_HW_IP_UVD_ENCRex Zhu (1):
drm/amdgpu: check function points valid before use. (v2)drivers/gpu/drm/amd/amdgpu/amdgpu.h | 91 ++++++++--------------- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 24 +++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 9 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 105 +++++++++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 111 ++++++++++++++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 10 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 55 ++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 19 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 29 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 25 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 ++--- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/cik.c | 6 ++ drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 23 +++--- drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 17 ++--- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 50 +++++++++---- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 50 ++++++++----- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 25 +++++-- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 33 +++++++-- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 37 ++++++++-- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 22 +++--- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 26 ++++--- drivers/gpu/drm/amd/amdgpu/si.c | 7 ++ drivers/gpu/drm/amd/amdgpu/si_dma.c | 18 ++--- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 4 +- drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 11 +-- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 11 +-- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 12 ++-- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 25 +++---- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 32 +++++---- drivers/gpu/drm/amd/amdgpu/vi.c | 6 ++ drivers/gpu/drm/amd/include/amd_shared.h | 2 + drivers/gpu/drm/amd/include/cgs_linux.h | 19 ++--- include/uapi/drm/amdgpu_drm.h | 3 +- 54 files changed, 730 insertions(+), 358 deletions(-)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx