RE: [027/101] drm/radeon/kms: fix typo in r100_blit_copy

From: Deucher, Alexander
Date: Thu Nov 03 2011 - 09:02:31 EST


Please don't apply. This ended up getting reverted upstream.

> -----Original Message-----
> From: Greg KH [mailto:gregkh@xxxxxxx]
> Sent: Wednesday, November 02, 2011 6:26 PM
> To: linux-kernel@xxxxxxxxxxxxxxx; stable@xxxxxxxxxxxxxxx
> Cc: torvalds@xxxxxxxxxxxxxxxxxxxx; akpm@xxxxxxxxxxxxxxxxxxxx;
> alan@xxxxxxxxxxxxxxxxxxx; Deucher, Alexander; Dave Airlie
> Subject: [027/101] drm/radeon/kms: fix typo in r100_blit_copy
>
> 2.6.33-longterm review patch. If anyone has any objections, please let us
> know.
>
> ------------------
>
> From: Alex Deucher <alexander.deucher@xxxxxxx>
>
> commit 18b4fada275dd2b6dd9db904ddf70fe39e272222 upstream.
>
> cur_pages is the number of pages per loop iteration.
>
> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
> Reviewed-by: Michel Dänzer <michel.daenzer@xxxxxxx>
> Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
>
> ---
> drivers/gpu/drm/radeon/r100.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -496,8 +496,8 @@ int r100_copy_blit(struct radeon_device
> radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));
> radeon_ring_write(rdev, 0);
> radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));
> - radeon_ring_write(rdev, num_pages);
> - radeon_ring_write(rdev, num_pages);
> + radeon_ring_write(rdev, cur_pages);
> + radeon_ring_write(rdev, cur_pages);
> radeon_ring_write(rdev, cur_pages | (stride_pixels << 16));
> }
> radeon_ring_write(rdev, PACKET0(RADEON_DSTCACHE_CTLSTAT,
> 0));
>
>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/