Commit 30c4cf3b authored May 04, 2015 by Magnus Damm Committed by Daniel Vetter Jun 15, 2015

drm/cma: Fix 64-bit size_t build warnings



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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 712a0dd9

drivers/gpu/drm/drm_gem_cma_helper.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);