summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/uvd_v1_0.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2013-10-15 20:12:03 +0200
committerAlex Deucher <alexander.deucher@amd.com>2013-10-18 16:16:16 -0400
commitbcf6f1e935b92aa40c259c5abb427ac49fc083eb (patch)
tree353ba1e1754bcb787ffebcc4c708d0d3bac3fe86 /drivers/gpu/drm/radeon/uvd_v1_0.c
parent5510f124c6ee53cb52cf632240aea982d64c7d99 (diff)
downloadblackbird-op-linux-bcf6f1e935b92aa40c259c5abb427ac49fc083eb.tar.gz
blackbird-op-linux-bcf6f1e935b92aa40c259c5abb427ac49fc083eb.zip
drm/radeon/uvd: revert lower msg&fb buffer requirements on UVD3
This only seem to work for H.264 but not for VC-1 streams. Need to investigate further why exactly. This reverts commit 4b40e5921230beb1951f04d2b1b92c4c88fbad43. 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/uvd_v1_0.c')
-rw-r--r--drivers/gpu/drm/radeon/uvd_v1_0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/uvd_v1_0.c b/drivers/gpu/drm/radeon/uvd_v1_0.c
index 3100fa9cb52f..7266805d9786 100644
--- a/drivers/gpu/drm/radeon/uvd_v1_0.c
+++ b/drivers/gpu/drm/radeon/uvd_v1_0.c
@@ -212,8 +212,8 @@ int uvd_v1_0_start(struct radeon_device *rdev)
/* enable VCPU clock */
WREG32(UVD_VCPU_CNTL, 1 << 9);
- /* enable UMC and NC0 */
- WREG32_P(UVD_LMI_CTRL2, 1 << 13, ~((1 << 8) | (1 << 13)));
+ /* enable UMC */
+ WREG32_P(UVD_LMI_CTRL2, 0, ~(1 << 8));
/* boot up the VCPU */
WREG32(UVD_SOFT_RESET, 0);
OpenPOWER on IntegriCloud