From 8c27a2de24f1fe17759c213eaabce177b460f50d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 10 Jan 2006 19:56:17 +1100 Subject: [PATCH] --- yaml --- r: 18260 b: refs/heads/master c: f8e0f2905bf0a7cb5ef2baaf009f0c26f80c3056 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/radeon_state.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9bc1687cad81..0ce909951602 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2185200cd2a910ca7f4e3fa0370c6ed8a2bdc49c +refs/heads/master: f8e0f2905bf0a7cb5ef2baaf009f0c26f80c3056 diff --git a/trunk/drivers/char/drm/radeon_state.c b/trunk/drivers/char/drm/radeon_state.c index e9d8ec3a0994..7bc27516d425 100644 --- a/trunk/drivers/char/drm/radeon_state.c +++ b/trunk/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