Skip to contentSkip to conversation

drm/radeon: use ALIGN instead of open coding it

PATCH In review Matt Turner 2 participants 2 messages Feb 25, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/radeon: use ALIGN instead of open coding it

CC Jerome Glisse <[email protected]>
CC Alex Deucher <[email protected]>
CC Dave Airlie <[email protected]>
---
 drivers/gpu/drm/radeon/r600_blit.c     |    2 +-
 drivers/gpu/drm/radeon/r600_blit_kms.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/r600_blit.c +1 -1
index 5ea4323..f4fb88e 100644
@@ -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;
 
drivers/gpu/drm/radeon/r600_blit_kms.c +2 -2
index 446b765..ddea43a 100644
@@ -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);
Signature · 10 lines
1.6.4.4


------------------------------------------------------------------------------
Download Intel&#174; 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
--
Reviewed-by on v1 1/1
#1 lore raw
Quoted 45 lines · Matt Turner
CC Jerome Glisse <[email protected]>
CC Alex Deucher <[email protected]>
CC Dave Airlie <[email protected]>

---
 drivers/gpu/drm/radeon/r600_blit.c     |    2 +- drivers/gpu/drm/radeon/r600_blit_kms.c |    4 ++--

 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/r600_blit.c +1 -1
index 5ea4323..f4fb88e 100644
@@ -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;
 
drivers/gpu/drm/radeon/r600_blit_kms.c +2 -3
index 446b765..ddea43a 100644
@@ -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);
--
Quoted 1 line

1.6.4.4

Seems entirely reasonable. Haven't tested, though.

Signature · 13 lines
Only fools are easily impressed by what is only
barely beyond their reach. ~ Unknown

Corbin Simpson
<[email protected]>

------------------------------------------------------------------------------
Download Intel&#174; 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
--