From f819663cec0f703d6df903d984a0412b0acdeaa8 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Fri, 9 Nov 2012 12:10:41 +0000 Subject: [PATCH] --- yaml --- r: 345325 b: refs/heads/master c: ef8cf3a1c523afa499d15856e7db3844ad59d1fb h: refs/heads/master i: 345323: bf6f792d92f4990ce5f425b52b2a3881e53a8f91 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r600.c | 8 +------- trunk/drivers/gpu/drm/radeon/r600_cp.c | 7 +------ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 516448241015..7586c6f402da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6311803b1294432ee680fec5e628efae0d485fa2 +refs/heads/master: ef8cf3a1c523afa499d15856e7db3844ad59d1fb diff --git a/trunk/drivers/gpu/drm/radeon/r600.c b/trunk/drivers/gpu/drm/radeon/r600.c index cda280d157da..169ecc9628ea 100644 --- a/trunk/drivers/gpu/drm/radeon/r600.c +++ b/trunk/drivers/gpu/drm/radeon/r600.c @@ -1424,13 +1424,7 @@ u32 r6xx_remap_render_backend(struct radeon_device *rdev, int r600_count_pipe_bits(uint32_t val) { - int i, ret = 0; - - for (i = 0; i < 32; i++) { - ret += val & 1; - val >>= 1; - } - return ret; + return hweight32(val); } static void r600_gpu_init(struct radeon_device *rdev) diff --git a/trunk/drivers/gpu/drm/radeon/r600_cp.c b/trunk/drivers/gpu/drm/radeon/r600_cp.c index 2514123d2d00..be85f75aedda 100644 --- a/trunk/drivers/gpu/drm/radeon/r600_cp.c +++ b/trunk/drivers/gpu/drm/radeon/r600_cp.c @@ -721,12 +721,7 @@ static u32 r600_get_tile_pipe_to_backend_map(u32 num_tile_pipes, static int r600_count_pipe_bits(uint32_t val) { - int i, ret = 0; - for (i = 0; i < 32; i++) { - ret += val & 1; - val >>= 1; - } - return ret; + return hweight32(val); } static void r600_gfx_init(struct drm_device *dev,