diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2017-02-21 02:57:12 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2017-06-02 03:57:13 -0400 |
commit | 2150c19b15b01458cfa0b2db68c7ad035011a1fb (patch) | |
tree | 062a03044c0cc4974c843413c75ded5dcf07356e /drivers | |
parent | 2e953d83a6797e4f1c6fe48c08fc9a8fcb50db78 (diff) |
drm/omap: 64bit compile fixes
Fix a few type issues that cause compile warnings on 64 bit ARM
compiler. The change should not affect 32bit platforms.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fb.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c index 3cab06661a08..1dd3dafc59af 100644 --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | |||
@@ -388,7 +388,7 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w, | |||
388 | u32 min_align = 128; | 388 | u32 min_align = 128; |
389 | int ret; | 389 | int ret; |
390 | unsigned long flags; | 390 | unsigned long flags; |
391 | size_t slot_bytes; | 391 | u32 slot_bytes; |
392 | 392 | ||
393 | BUG_ON(!validfmt(fmt)); | 393 | BUG_ON(!validfmt(fmt)); |
394 | 394 | ||
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index ee615fa048a5..4bf9fcfcf673 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c | |||
@@ -450,7 +450,7 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, | |||
450 | 450 | ||
451 | if (size > omap_gem_mmap_size(bos[i]) - mode_cmd->offsets[i]) { | 451 | if (size > omap_gem_mmap_size(bos[i]) - mode_cmd->offsets[i]) { |
452 | dev_dbg(dev->dev, | 452 | dev_dbg(dev->dev, |
453 | "provided buffer object is too small! %d < %d\n", | 453 | "provided buffer object is too small! %zu < %d\n", |
454 | bos[i]->size - mode_cmd->offsets[i], size); | 454 | bos[i]->size - mode_cmd->offsets[i], size); |
455 | ret = -EINVAL; | 455 | ret = -EINVAL; |
456 | goto fail; | 456 | goto fail; |
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 461fbb5c0075..13abf221d153 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c | |||
@@ -1048,7 +1048,7 @@ void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m) | |||
1048 | area->p1.x, area->p1.y); | 1048 | area->p1.x, area->p1.y); |
1049 | } | 1049 | } |
1050 | } else { | 1050 | } else { |
1051 | seq_printf(m, " %d", obj->size); | 1051 | seq_printf(m, " %zu", obj->size); |
1052 | } | 1052 | } |
1053 | 1053 | ||
1054 | seq_printf(m, "\n"); | 1054 | seq_printf(m, "\n"); |