Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8e0f290 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 2185200c

drivers/char/drm/radeon_state.c

+3 −3
Original line number Diff line number Diff line
@@ -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