Attachment 34850 Details for Bug 27478 – atom parser fixes

[patch] atom parser fixes

0001-drm-radeon-kms-more-atom-parser-fixes.patch (text/plain), 1.97 KB, created by Alex Deucher on 2010-04-09 11:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2010-04-09 11:40:04 UTC

Size: 1.97 KB

patch

obsolete

>From 44cc309323e38fc4fa7b7c7bea190aeaa0abd224 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Fri, 9 Apr 2010 14:27:18 -0400
>Subject: [PATCH] drm/radeon/kms: more atom parser fixes
>
>shr/shl ops need the full dst rather than the pre-masked
>version.  Fixes fdo bug 27478 and kernel bug 15738.
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/atom.c |   12 ++++++++++--
> 1 files changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
>index 58845e0..44c8cbd 100644
>--- a/drivers/gpu/drm/radeon/atom.c
>+++ b/drivers/gpu/drm/radeon/atom.c
>@@ -905,13 +905,17 @@ static void atom_op_shift_right(atom_exec_context *ctx, int *ptr, int arg)
> static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg)
> {
> 	uint8_t attr = U8((*ptr)++), shift;
>-	uint32_t saved, dst;
>+	uint32_t saved, dst, tmp;
> 	int dptr = *ptr;
>+	uint32_t dst_align = atom_dst_to_src[(attr >> 3) & 7][(attr >> 6) & 3];
> 	SDEBUG("   dst: ");
> 	dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);
>+	dst = saved;
> 	shift = atom_get_src(ctx, attr, ptr);
> 	SDEBUG("   shift: %d\n", shift);
> 	dst <<= shift;
>+	dst &= atom_arg_mask[dst_align];
>+	dst >>= atom_arg_shift[dst_align];
> 	SDEBUG("   dst: ");
> 	atom_put_dst(ctx, arg, attr, &dptr, dst, saved);
> }
>@@ -919,13 +923,17 @@ static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg)
> static void atom_op_shr(atom_exec_context *ctx, int *ptr, int arg)
> {
> 	uint8_t attr = U8((*ptr)++), shift;
>-	uint32_t saved, dst;
>+	uint32_t saved, dst, tmp;
> 	int dptr = *ptr;
>+	uint32_t dst_align = atom_dst_to_src[(attr >> 3) & 7][(attr >> 6) & 3];
> 	SDEBUG("   dst: ");
> 	dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);
>+	dst = saved;
> 	shift = atom_get_src(ctx, attr, ptr);
> 	SDEBUG("   shift: %d\n", shift);
> 	dst >>= shift;
>+	dst &= atom_arg_mask[dst_align];
>+	dst >>= atom_arg_shift[dst_align];
> 	SDEBUG("   dst: ");
> 	atom_put_dst(ctx, arg, attr, &dptr, dst, saved);
> }
>-- 
>1.5.6.3
>

Actions: View | Splinter Review

Attachments on bug 27478: 34695 | 34696 | 34697 | 34714 | 34715 | 34718 | 34734 | 34850 | 35322 | 35360 | 36589 | 36687

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.