| Message ID | 1430748979-7845-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, May 04, 2015 at 04:16:19PM +0200, Geert Uytterhoeven wrote: > From: Magnus Damm <damm+renesas@opensource.se> > > Fix warnings related to size_t when building for 64-bit architectures: > > drivers/gpu/drm/drm_gem_cma_helper.c: In function ‘drm_gem_cma_create’: > drivers/gpu/drm/drm_gem_cma_helper.c:114:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ [-Wformat=] > size); > ^ > drivers/gpu/drm/drm_gem_cma_helper.c: In function ‘drm_gem_cma_describe’: > drivers/gpu/drm/drm_gem_cma_helper.c:393:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 8 has type ‘size_t’ [-Wformat=] > off, &cma_obj->paddr, cma_obj->vaddr, obj->size); > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/gpu/drm/drm_gem_cma_helper.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Thierry Reding <treding@nvidia.com> Daniel, is this perhaps something you'd like to pick up into your misc branch? Thierry
On Fri, Jun 05, 2015 at 01:24:30PM +0200, Thierry Reding wrote: > On Mon, May 04, 2015 at 04:16:19PM +0200, Geert Uytterhoeven wrote: > > From: Magnus Damm <damm+renesas@opensource.se> > > > > Fix warnings related to size_t when building for 64-bit architectures: > > > > drivers/gpu/drm/drm_gem_cma_helper.c: In function ‘drm_gem_cma_create’: > > drivers/gpu/drm/drm_gem_cma_helper.c:114:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ [-Wformat=] > > size); > > ^ > > drivers/gpu/drm/drm_gem_cma_helper.c: In function ‘drm_gem_cma_describe’: > > drivers/gpu/drm/drm_gem_cma_helper.c:393:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 8 has type ‘size_t’ [-Wformat=] > > off, &cma_obj->paddr, cma_obj->vaddr, obj->size); > > > > Signed-off-by: Magnus Damm <damm+renesas@opensource.se> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > --- > > drivers/gpu/drm/drm_gem_cma_helper.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > Reviewed-by: Thierry Reding <treding@nvidia.com> > > Daniel, is this perhaps something you'd like to pick up into your misc > branch? Well I generally try to shy away from arm-driver specific drm stuff, but because vacation I'm in a good mood ;-) Applied to drm-misc, thanks. -Daniel
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index e419eedf751de6cb..bd75f303da63d9c6 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -110,7 +110,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, cma_obj->vaddr = dma_alloc_writecombine(drm->dev, size, &cma_obj->paddr, GFP_KERNEL | __GFP_NOWARN); if (!cma_obj->vaddr) { - dev_err(drm->dev, "failed to allocate buffer with size %d\n", + dev_err(drm->dev, "failed to allocate buffer with size %zu\n", size); ret = -ENOMEM; goto error; @@ -388,7 +388,7 @@ void drm_gem_cma_describe(struct drm_gem_cma_object *cma_obj, off = drm_vma_node_start(&obj->vma_node); - seq_printf(m, "%2d (%2d) %08llx %pad %p %d", + seq_printf(m, "%2d (%2d) %08llx %pad %p %zu", obj->name, obj->refcount.refcount.counter, off, &cma_obj->paddr, cma_obj->vaddr, obj->size);