summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2013-12-20 17:48:54 +0100
committerAlex Deucher <alexander.deucher@amd.com>2013-12-23 10:03:41 -0500
commitbae651dbd7ade3c5d6518f89599ae680a2fe2b85 (patch)
tree8f7d6eea2bc25da3784eab12d8e7b3e4f5ee7198
parent418cb50bd6f977249b38f8888359e0adca6fc8ea (diff)
downloadlinux-bae651dbd7ade3c5d6518f89599ae680a2fe2b85.tar.gz
linux-bae651dbd7ade3c5d6518f89599ae680a2fe2b85.tar.bz2
linux-bae651dbd7ade3c5d6518f89599ae680a2fe2b85.zip
drm/radeon: fix UVD 256MB check
Otherwise the kernel might reject our decoding requests. Signed-off-by: Christian König <christian.koenig@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-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 373d088bac66..b9c0529b4a2e 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -473,7 +473,7 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p,
return -EINVAL;
}
- if ((start >> 28) != (end >> 28)) {
+ if ((start >> 28) != ((end - 1) >> 28)) {
DRM_ERROR("reloc %LX-%LX crossing 256MB boundary!\n",
start, end);
return -EINVAL;