> -----Original Message----- > From: Pixel Ding [mailto:Pixel.Ding at amd.com] > Sent: Monday, September 25, 2017 2:38 AM > To: amd-gfx at lists.freedesktop.org; Ding, Pixel; Min, Frank; Liu, Monk; > Deucher, Alexander > Subject: [PATCH] drm/amdgpu: right shift 2 bits for > SDMA_GFX_RB_WPTR_POLL_ADDR_LO v2 > > Both Tonga and Vega register SPECs indicate that this registers only > use 31:2 bits in DW. SRIOV test case immediately fails withtout this > shift. Are you sure this is correct? I think the comment is just saying that the address is dword aligned. Also, if it indeed needs to be shifted, I'd imaging the _HI addr field needs to be shifted as well. Alex > > v2: write to ADDR field > > Signed-off-by: Pixel Ding <Pixel.Ding at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 9 +++++---- > drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 +++++--- > 2 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > index 72f31cc..8b83b96 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c > @@ -643,7 +643,7 @@ static void sdma_v3_0_enable(struct amdgpu_device > *adev, bool enable) > static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev) > { > struct amdgpu_ring *ring; > - u32 rb_cntl, ib_cntl, wptr_poll_cntl; > + u32 rb_cntl, ib_cntl, wptr_poll_cntl, wptr_poll_addr_lo; > u32 rb_bufsz; > u32 wb_offset; > u32 doorbell; > @@ -712,9 +712,10 @@ static int sdma_v3_0_gfx_resume(struct > amdgpu_device *adev) > > /* setup the wptr shadow polling */ > wptr_gpu_addr = adev->wb.gpu_addr + (ring->wptr_offs * > 4); > - > - WREG32(mmSDMA0_GFX_RB_WPTR_POLL_ADDR_LO + > sdma_offsets[i], > - lower_32_bits(wptr_gpu_addr)); > + wptr_poll_addr_lo = > RREG32(mmSDMA0_GFX_RB_WPTR_POLL_ADDR_LO + sdma_offsets[i]); > + wptr_poll_addr_lo = REG_SET_FIELD(wptr_poll_addr_lo, > SDMA0_GFX_RB_WPTR_POLL_ADDR_LO, > + ADDR, > lower_32_bits(wptr_gpu_addr) >> 2); > + WREG32(mmSDMA0_GFX_RB_WPTR_POLL_ADDR_LO + > sdma_offsets[i], wptr_poll_addr_lo; > WREG32(mmSDMA0_GFX_RB_WPTR_POLL_ADDR_HI + > sdma_offsets[i], > upper_32_bits(wptr_gpu_addr)); > wptr_poll_cntl = > RREG32(mmSDMA0_GFX_RB_WPTR_POLL_CNTL + sdma_offsets[i]); > diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > index c26d205..8b8338d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c > @@ -574,7 +574,7 @@ static void sdma_v4_0_enable(struct amdgpu_device > *adev, bool enable) > static int sdma_v4_0_gfx_resume(struct amdgpu_device *adev) > { > struct amdgpu_ring *ring; > - u32 rb_cntl, ib_cntl, wptr_poll_cntl; > + u32 rb_cntl, ib_cntl, wptr_poll_cntl, wptr_poll_addr_lo > u32 rb_bufsz; > u32 wb_offset; > u32 doorbell; > @@ -664,8 +664,10 @@ static int sdma_v4_0_gfx_resume(struct > amdgpu_device *adev) > > /* setup the wptr shadow polling */ > wptr_gpu_addr = adev->wb.gpu_addr + (ring->wptr_offs * > 4); > - WREG32(sdma_v4_0_get_reg_offset(i, > mmSDMA0_GFX_RB_WPTR_POLL_ADDR_LO), > - lower_32_bits(wptr_gpu_addr)); > + wptr_poll_addr_lo = RREG32(sdma_v4_0_get_reg_offset(i, > mmSDMA0_GFX_RB_WPTR_POLL_ADDR_LO)); > + wptr_poll_addr_lo = REG_SET_FIELD(wptr_poll_addr_lo, > SDMA0_GFX_RB_WPTR_POLL_ADDR_LO, > + ADDR, > lower_32_bits(wptr_gpu_addr) >> 2); > + WREG32(sdma_v4_0_get_reg_offset(i, > mmSDMA0_GFX_RB_WPTR_POLL_ADDR_LO), wptr_poll_addr_lo); > WREG32(sdma_v4_0_get_reg_offset(i, > mmSDMA0_GFX_RB_WPTR_POLL_ADDR_HI), > upper_32_bits(wptr_gpu_addr)); > wptr_poll_cntl = RREG32(sdma_v4_0_get_reg_offset(i, > mmSDMA0_GFX_RB_WPTR_POLL_CNTL)); > -- > 2.7.4
