diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-10 03:56:17 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-01-10 03:56:17 -0500 |
commit | f8e0f2905bf0a7cb5ef2baaf009f0c26f80c3056 (patch) | |
tree | a46e7cac673c4167387d4762fda76160bcdf227d | |
parent | 2185200cd2a910ca7f4e3fa0370c6ed8a2bdc49c (diff) |
drm: fix radeon warnings on 64-bit
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>
-rw-r--r-- | drivers/char/drm/radeon_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c index e9d8ec3a0994..7bc27516d425 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/char/drm/radeon_state.c | |||
@@ -1651,7 +1651,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp, | |||
1651 | if (tex->height == 1) { | 1651 | if (tex->height == 1) { |
1652 | if (tex_width >= 64 || tex_width <= 16) { | 1652 | if (tex_width >= 64 || tex_width <= 16) { |
1653 | RADEON_COPY_MT(buffer, data, | 1653 | RADEON_COPY_MT(buffer, data, |
1654 | tex_width * sizeof(u32)); | 1654 | (int)(tex_width * sizeof(u32))); |
1655 | } else if (tex_width == 32) { | 1655 | } else if (tex_width == 32) { |
1656 | RADEON_COPY_MT(buffer, data, 16); | 1656 | RADEON_COPY_MT(buffer, data, 16); |
1657 | RADEON_COPY_MT(buffer + 8, | 1657 | RADEON_COPY_MT(buffer + 8, |
@@ -1659,7 +1659,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp, | |||
1659 | } | 1659 | } |
1660 | } else if (tex_width >= 64 || tex_width == 16) { | 1660 | } else if (tex_width >= 64 || tex_width == 16) { |
1661 | RADEON_COPY_MT(buffer, data, | 1661 | RADEON_COPY_MT(buffer, data, |
1662 | dwords * sizeof(u32)); | 1662 | (int)(dwords * sizeof(u32))); |
1663 | } else if (tex_width < 16) { | 1663 | } else if (tex_width < 16) { |
1664 | for (i = 0; i < tex->height; i++) { | 1664 | for (i = 0; i < tex->height; i++) { |
1665 | RADEON_COPY_MT(buffer, data, tex_width); | 1665 | RADEON_COPY_MT(buffer, data, tex_width); |
@@ -1687,7 +1687,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp, | |||
1687 | * can upload it directly. | 1687 | * can upload it directly. |
1688 | */ | 1688 | */ |
1689 | RADEON_COPY_MT(buffer, data, | 1689 | RADEON_COPY_MT(buffer, data, |
1690 | dwords * sizeof(u32)); | 1690 | (int)(dwords * sizeof(u32))); |
1691 | } else { | 1691 | } else { |
1692 | /* Texture image width is less than the minimum, so we | 1692 | /* Texture image width is less than the minimum, so we |
1693 | * need to pad out each image scanline to the minimum | 1693 | * need to pad out each image scanline to the minimum |