AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

drm: fix radeon warnings on 64-bit

Browse Source 
From: Andrew Morton <akpm@osdl.org>

drivers/char/drm/radeon_state.c: In function `radeon_cp_dispatch_texture':
drivers/char/drm/radeon_state.c:1653: warning: int format, different type arg
(arg 3)
drivers/char/drm/radeon_state.c:1661: warning: int format, different type arg
(arg 3)
drivers/char/drm/radeon_state.c:1689: warning: int format, different type arg
(arg 3)

sizeof() doesn't return an int.

Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
Dave Airlie 2006-01-10 19:56:17 +11:00 committed by Dave Airlie
parent 2185200cd2
commit f8e0f2905b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/drm/radeon_state.c
View File

@ -1651,7 +1651,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
if (tex->height == 1) { if (tex->height == 1) {
if (tex_width >= 64 || tex_width <= 16) { if (tex_width >= 64 || tex_width <= 16) {
RADEON_COPY_MT(buffer, data, RADEON_COPY_MT(buffer, data,
tex_width * sizeof(u32)); (int)(tex_width * sizeof(u32)));
} else if (tex_width == 32) { } else if (tex_width == 32) {
RADEON_COPY_MT(buffer, data, 16); RADEON_COPY_MT(buffer, data, 16);
RADEON_COPY_MT(buffer + 8, RADEON_COPY_MT(buffer + 8,
@ -1659,7 +1659,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
} }
} else if (tex_width >= 64 || tex_width == 16) { } else if (tex_width >= 64 || tex_width == 16) {
RADEON_COPY_MT(buffer, data, RADEON_COPY_MT(buffer, data,
dwords * sizeof(u32)); (int)(dwords * sizeof(u32)));
} else if (tex_width < 16) { } else if (tex_width < 16) {
for (i = 0; i < tex->height; i++) { for (i = 0; i < tex->height; i++) {
RADEON_COPY_MT(buffer, data, tex_width); RADEON_COPY_MT(buffer, data, tex_width);
@ -1687,7 +1687,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
* can upload it directly. * can upload it directly.
*/ */
RADEON_COPY_MT(buffer, data, RADEON_COPY_MT(buffer, data,
dwords * sizeof(u32)); (int)(dwords * sizeof(u32)));
} else { } else {
/* Texture image width is less than the minimum, so we /* Texture image width is less than the minimum, so we
* need to pad out each image scanline to the minimum * need to pad out each image scanline to the minimum