Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 581bc3a9f628dad6221536d9f37af0472c66bb92

Authored by Christian König
Committed by Alex Deucher
1 parent 7220f639c2
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

drm/radeon: fix scratch reg handling for UVD fence 

Also init the scratch reg to zero on the UVD ring.
This fixes UVD on AGP based cards.

Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/gpu/drm/radeon/radeon_fence.c
Diff comments   View file @ 581bc3a
... ... @@ -767,8 +767,8 @@
767 767  
768 768 radeon_scratch_free(rdev, rdev->fence_drv[ring].scratch_reg);
769 769 if (rdev->wb.use_event || !radeon_ring_supports_scratch_reg(rdev, &rdev->ring[ring])) {
  770 + rdev->fence_drv[ring].scratch_reg = 0;
770 771 if (ring != R600_RING_TYPE_UVD_INDEX) {
771   - rdev->fence_drv[ring].scratch_reg = 0;
772 772 index = R600_WB_EVENT_OFFSET + ring * 4;
773 773 rdev->fence_drv[ring].cpu_addr = &rdev->wb.wb[index/4];
774 774 rdev->fence_drv[ring].gpu_addr = rdev->wb.gpu_addr +