From: Christian König Date: Wed, 27 Aug 2014 07:59:45 +0000 (+0200) Subject: drm/radeon: enable RB_ARB before resetting the VCPU X-Git-Tag: v3.18-rc1~44^2~75^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32517d59ebb3b6eb7a5a5736020072ce7e609e76;p=platform%2Fkernel%2Flinux-exynos.git drm/radeon: enable RB_ARB before resetting the VCPU This fixes "UVD not responding, trying to reset the VCPU" messages on earlier ASICs. Signed-off-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c index c3e182b..e72b3cb 100644 --- a/drivers/gpu/drm/radeon/uvd_v1_0.c +++ b/drivers/gpu/drm/radeon/uvd_v1_0.c @@ -319,12 +319,12 @@ int uvd_v1_0_start(struct radeon_device *rdev) /* enable UMC */ WREG32_P(UVD_LMI_CTRL2, 0, ~(1 << 8)); + WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); + /* boot up the VCPU */ WREG32(UVD_SOFT_RESET, 0); mdelay(10); - WREG32_P(UVD_RB_ARB_CTRL, 0, ~(1 << 3)); - for (i = 0; i < 10; ++i) { uint32_t status; for (j = 0; j < 100; ++j) {