summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2006-01-10 19:56:17 +1100
committerDave Airlie <airlied@linux.ie>2006-01-10 19:56:17 +1100
commitf8e0f2905bf0a7cb5ef2baaf009f0c26f80c3056 (patch)
treea46e7cac673c4167387d4762fda76160bcdf227d /drivers
parent2185200cd2a910ca7f4e3fa0370c6ed8a2bdc49c (diff)
downloadop-kernel-dev-f8e0f2905bf0a7cb5ef2baaf009f0c26f80c3056.zip
op-kernel-dev-f8e0f2905bf0a7cb5ef2baaf009f0c26f80c3056.tar.gz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/drm/radeon_state.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index e9d8ec3..7bc2751 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,
if (tex->height == 1) {
if (tex_width >= 64 || tex_width <= 16) {
RADEON_COPY_MT(buffer, data,
- tex_width * sizeof(u32));
+ (int)(tex_width * sizeof(u32)));
} else if (tex_width == 32) {
RADEON_COPY_MT(buffer, data, 16);
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) {
RADEON_COPY_MT(buffer, data,
- dwords * sizeof(u32));
+ (int)(dwords * sizeof(u32)));
} else if (tex_width < 16) {
for (i = 0; i < tex->height; i++) {
RADEON_COPY_MT(buffer, data, tex_width);
@@ -1687,7 +1687,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
* can upload it directly.
*/
RADEON_COPY_MT(buffer, data,
- dwords * sizeof(u32));
+ (int)(dwords * sizeof(u32)));
} else {
/* Texture image width is less than the minimum, so we
* need to pad out each image scanline to the minimum
OpenPOWER on IntegriCloud