summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-05-18 10:31:01 +0200
committerAlex Deucher <alexander.deucher@amd.com>2017-06-14 09:23:42 -0400
commitc0f83da96b906ea331e2eea2bd5d2e7f221d27ab (patch)
treef0c6d3ae82ef858b3614f9dde44dfbfafadb637e /drivers/gpu/drm/radeon
parent6e88007e224ce51969ccf9afeec645146c638816 (diff)
downloadlinux-stable-c0f83da96b906ea331e2eea2bd5d2e7f221d27ab.tar.gz
linux-stable-c0f83da96b906ea331e2eea2bd5d2e7f221d27ab.tar.bz2
linux-stable-c0f83da96b906ea331e2eea2bd5d2e7f221d27ab.zip
drm/radeon: fix "force the UVD DPB into VRAM as well"
The DPB must be in VRAM, but not in the first segment. Signed-off-by: Christian König <christian.koenig@amd.com> Tested-by: Arthur Marsh <arthur.marsh@internode.on.net> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r--drivers/gpu/drm/radeon/radeon_uvd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index 7431eb4a11b7..d34d1cf33895 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -621,7 +621,7 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p,
}
/* TODO: is this still necessary on NI+ ? */
- if ((cmd == 0 || cmd == 1 || cmd == 0x3) &&
+ if ((cmd == 0 || cmd == 0x3) &&
(start >> 28) != (p->rdev->uvd.gpu_addr >> 28)) {
DRM_ERROR("msg/fb buffer %LX-%LX out of 256MB segment!\n",
start, end);