aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/vce_v2_0.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-03-23 11:33:00 +0100
committerAlex Deucher <alexander.deucher@amd.com>2015-03-27 10:17:44 -0400
commit88f9eae4d74c1b5c35adb026d7f0d4d44d2fdf70 (patch)
tree9b934180db70f89728c61245b497a30b1894c787 /drivers/gpu/drm/radeon/vce_v2_0.c
parentdrm/radeon: always dump the ring content if it's available (diff)
downloadlinux-dev-88f9eae4d74c1b5c35adb026d7f0d4d44d2fdf70.tar.xz
linux-dev-88f9eae4d74c1b5c35adb026d7f0d4d44d2fdf70.zip
drm/radeon: programm the VCE fw BAR as well
Otherwise the VCE firmware needs to be in the first 256MB of VRAM. Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/vce_v2_0.c')
-rw-r--r--drivers/gpu/drm/radeon/vce_v2_0.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/vce_v2_0.c b/drivers/gpu/drm/radeon/vce_v2_0.c
index 1ac7bb825a1b..fbbe78fbd087 100644
--- a/drivers/gpu/drm/radeon/vce_v2_0.c
+++ b/drivers/gpu/drm/radeon/vce_v2_0.c
@@ -156,6 +156,9 @@ int vce_v2_0_resume(struct radeon_device *rdev)
WREG32(VCE_LMI_SWAP_CNTL1, 0);
WREG32(VCE_LMI_VM_CTRL, 0);
+ WREG32(VCE_LMI_VCPU_CACHE_40BIT_BAR, addr >> 8);
+
+ addr &= 0xff;
size = RADEON_GPU_PAGE_ALIGN(rdev->vce_fw->size);
WREG32(VCE_VCPU_CACHE_OFFSET0, addr & 0x7fffffff);
WREG32(VCE_VCPU_CACHE_SIZE0, size);