aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
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 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