---

yaml --- r: 18260 b: refs/heads/master c: f8e0f29 h: refs/heads/master v: v3
git-mirror · Jan 10, 2006 · 8c27a2d · 8c27a2d
1 parent 4b13d37
commit 8c27a2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -1651,15 +1651,15 @@ 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,
 						       data + 16, 16);
 				}
 			} 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