From: Greg Kroah-Hartman Date: Mon, 6 Jan 2014 17:43:18 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v3.4.76~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b194877d419bf3b70027f45234391fff162b156a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: drm-radeon-fix-uvd-256mb-check.patch --- diff --git a/queue-3.10/drm-radeon-fix-uvd-256mb-check.patch b/queue-3.10/drm-radeon-fix-uvd-256mb-check.patch new file mode 100644 index 00000000000..6b6426b62e4 --- /dev/null +++ b/queue-3.10/drm-radeon-fix-uvd-256mb-check.patch @@ -0,0 +1,30 @@ +From bae651dbd7ade3c5d6518f89599ae680a2fe2b85 Mon Sep 17 00:00:00 2001 +From: Christian König +Date: Fri, 20 Dec 2013 17:48:54 +0100 +Subject: drm/radeon: fix UVD 256MB check + +From: Christian König + +commit bae651dbd7ade3c5d6518f89599ae680a2fe2b85 upstream. + +Otherwise the kernel might reject our decoding requests. + +Signed-off-by: Christian König +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/radeon/radeon_uvd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/radeon/radeon_uvd.c ++++ b/drivers/gpu/drm/radeon/radeon_uvd.c +@@ -460,7 +460,7 @@ static int radeon_uvd_cs_reloc(struct ra + 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; diff --git a/queue-3.10/series b/queue-3.10/series index 56e7508353f..285d680cf71 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -45,3 +45,4 @@ drm-i915-hold-mutex-across-i915_gem_release.patch drm-i915-don-t-update-the-dri1-breadcrumb-with-modesetting.patch drm-radeon-fix-asic-gfx-values-for-scrapper-asics.patch drm-i915-use-the-correct-gmch_ctrl-register-for-sandybridge.patch +drm-radeon-fix-uvd-256mb-check.patch