On Wed, Feb 24, 2010 at 8:23 PM, Matt Turner <matts...@gmail.com> wrote:
> CC: Jerome Glisse <jgli...@redhat.com>
> CC: Alex Deucher <alexdeuc...@gmail.com>
> CC: Dave Airlie <airl...@redhat.com>
> Signed-off-by: Matt Turner <matts...@gmail.com>
> ---
> drivers/gpu/drm/radeon/r600_blit.c | 2 +-
> drivers/gpu/drm/radeon/r600_blit_kms.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/r600_blit.c
> b/drivers/gpu/drm/radeon/r600_blit.c
> index 5ea4323..f4fb88e 100644
> --- a/drivers/gpu/drm/radeon/r600_blit.c
> +++ b/drivers/gpu/drm/radeon/r600_blit.c
> @@ -49,7 +49,7 @@ set_render_target(drm_radeon_private_t *dev_priv, int
> format, int w, int h, u64
> RING_LOCALS;
> DRM_DEBUG("\n");
>
> - h = (h + 7) & ~7;
> + h = ALIGN(h, 8);
> if (h < 8)
> h = 8;
>
> diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c
> b/drivers/gpu/drm/radeon/r600_blit_kms.c
> index 446b765..ddea43a 100644
> --- a/drivers/gpu/drm/radeon/r600_blit_kms.c
> +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
> @@ -25,7 +25,7 @@ set_render_target(struct radeon_device *rdev, int format,
> u32 cb_color_info;
> int pitch, slice;
>
> - h = (h + 7) & ~7;
> + h = ALIGN(h, 8);
> if (h < 8)
> h = 8;
>
> @@ -396,7 +396,7 @@ set_default_state(struct radeon_device *rdev)
>
> NUM_ES_STACK_ENTRIES(num_es_stack_entries));
>
> /* emit an IB pointing at default state */
> - dwords = (rdev->r600_blit.state_len + 0xf) & ~0xf;
> + dwords = ALIGN(rdev->r600_blit.state_len, 0x10);
> gpu_addr = rdev->r600_blit.shader_gpu_addr +
> rdev->r600_blit.state_offset;
> radeon_ring_write(rdev, PACKET3(PACKET3_INDIRECT_BUFFER, 2));
> radeon_ring_write(rdev, gpu_addr & 0xFFFFFFFC);
> --
> 1.6.4.4
Seems entirely reasonable. Haven't tested, though.
Reviewed-by: Corbin Simpson <mostawesomed...@gmail.com>
--
Only fools are easily impressed by what is only
barely beyond their reach. ~ Unknown
Corbin Simpson
<mostawesomed...@gmail.com>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
