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

Commit 7513e095 authored by Russell King's avatar Russell King
Browse files

DRM: Armada: fix printing of phys_addr_t/dma_addr_t 



These can be 64-bit quantities, so fix them up appropriately.

Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 077acbab

drivers/gpu/drm/armada/armada_fbdev.c

+3 −3
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ static int armada_fb_create(struct drm_fb_helper *fbh, 
	drm_fb_helper_fill_fix(info, dfb->fb.pitches[0], dfb->fb.depth);

	drm_fb_helper_fill_var(info, fbh, sizes->fb_width, sizes->fb_height);



	DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08x\n",

		dfb->fb.width, dfb->fb.height,

		dfb->fb.bits_per_pixel, obj->phys_addr);

	DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08llx\n",

		dfb->fb.width, dfb->fb.height, dfb->fb.bits_per_pixel,

		(unsigned long long)obj->phys_addr);



	return 0;

drivers/gpu/drm/armada/armada_gem.c

+3 −2
Original line number Diff line number Diff line
@@ -172,8 +172,9 @@ armada_gem_linear_back(struct drm_device *dev, struct armada_gem_object *obj) 
		obj->dev_addr = obj->linear->start;

	}



	DRM_DEBUG_DRIVER("obj %p phys %#x dev %#x\n",

			 obj, obj->phys_addr, obj->dev_addr);

	DRM_DEBUG_DRIVER("obj %p phys %#llx dev %#llx\n", obj,

			 (unsigned long long)obj->phys_addr,

			 (unsigned long long)obj->dev_addr);



	return 0;

}