* [PATCH] drm/rockchip: fix compile warnings for 64-bit
@ 2016-06-09 17:46 Brian Norris
2016-06-09 20:57 ` Doug Anderson
2016-06-10 0:51 ` Caesar Wang
0 siblings, 2 replies; 4+ messages in thread
From: Brian Norris @ 2016-06-09 17:46 UTC (permalink / raw)
To: Mark Yao
Cc: David Airlie, Heiko Stuebner, dri-devel, linux-rockchip,
linux-kernel, Brian Norris, Brian Norris
Rockchip DRM does not yet build properly for ARM64, but we might as well
get the printf formatting correct now, to avoid the following warnings:
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c: In function 'rockchip_drm_fbdev_create':
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c:111:2: warning: format '%d' expects argument of type 'int', but argument 8 has type 'size_t' [-Wformat=]
DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%d\n",
^
drivers/gpu/drm/rockchip/rockchip_drm_gem.c: In function 'rockchip_gem_alloc_buf':
drivers/gpu/drm/rockchip/rockchip_drm_gem.c:41:3: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'size_t' [-Wformat=]
DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);
^
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
index f261512bb4a0..bab4cd18b6b0 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
@@ -108,7 +108,7 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper,
fbi->screen_size = rk_obj->base.size;
fbi->fix.smem_len = rk_obj->base.size;
- DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%d\n",
+ DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%zu\n",
fb->width, fb->height, fb->depth, rk_obj->kvaddr,
offset, size);
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index 9c2d8a894093..059e902f872d 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -38,7 +38,7 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj,
&rk_obj->dma_addr, GFP_KERNEL,
&rk_obj->dma_attrs);
if (!rk_obj->kvaddr) {
- DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);
+ DRM_ERROR("failed to allocate %zu byte dma buffer", obj->size);
return -ENOMEM;
}
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/rockchip: fix compile warnings for 64-bit
2016-06-09 17:46 [PATCH] drm/rockchip: fix compile warnings for 64-bit Brian Norris
@ 2016-06-09 20:57 ` Doug Anderson
2016-06-10 14:34 ` Daniel Vetter
2016-06-10 0:51 ` Caesar Wang
1 sibling, 1 reply; 4+ messages in thread
From: Doug Anderson @ 2016-06-09 20:57 UTC (permalink / raw)
To: Brian Norris
Cc: Mark Yao, David Airlie, Heiko Stuebner, dri-devel,
open list:ARM/Rockchip SoC...,
linux-kernel, Brian Norris
Brian,
On Thu, Jun 9, 2016 at 10:46 AM, Brian Norris <briannorris@chromium.org> wrote:
> Rockchip DRM does not yet build properly for ARM64, but we might as well
> get the printf formatting correct now, to avoid the following warnings:
>
> drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c: In function 'rockchip_drm_fbdev_create':
> drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c:111:2: warning: format '%d' expects argument of type 'int', but argument 8 has type 'size_t' [-Wformat=]
> DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%d\n",
> ^
>
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c: In function 'rockchip_gem_alloc_buf':
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c:41:3: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'size_t' [-Wformat=]
> DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);
> ^
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Douglas Anderson <dianders@chromium.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/rockchip: fix compile warnings for 64-bit
2016-06-09 17:46 [PATCH] drm/rockchip: fix compile warnings for 64-bit Brian Norris
2016-06-09 20:57 ` Doug Anderson
@ 2016-06-10 0:51 ` Caesar Wang
1 sibling, 0 replies; 4+ messages in thread
From: Caesar Wang @ 2016-06-10 0:51 UTC (permalink / raw)
To: Brian Norris, Mark Yao
Cc: Heiko Stuebner, David Airlie, linux-kernel, dri-devel,
linux-rockchip, Brian Norris
在 2016年06月10日 01:46, Brian Norris 写道:
> Rockchip DRM does not yet build properly for ARM64, but we might as well
> get the printf formatting correct now, to avoid the following warnings:
>
> drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c: In function 'rockchip_drm_fbdev_create':
> drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c:111:2: warning: format '%d' expects argument of type 'int', but argument 8 has type 'size_t' [-Wformat=]
> DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%d\n",
> ^
>
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c: In function 'rockchip_gem_alloc_buf':
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c:41:3: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'size_t' [-Wformat=]
> DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);
> ^
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
Tested-by: Caesar Wang <wxt@rock-chips.com>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
> index f261512bb4a0..bab4cd18b6b0 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
> @@ -108,7 +108,7 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper,
> fbi->screen_size = rk_obj->base.size;
> fbi->fix.smem_len = rk_obj->base.size;
>
> - DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%d\n",
> + DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%zu\n",
> fb->width, fb->height, fb->depth, rk_obj->kvaddr,
> offset, size);
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> index 9c2d8a894093..059e902f872d 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> @@ -38,7 +38,7 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj,
> &rk_obj->dma_addr, GFP_KERNEL,
> &rk_obj->dma_attrs);
> if (!rk_obj->kvaddr) {
> - DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);
> + DRM_ERROR("failed to allocate %zu byte dma buffer", obj->size);
> return -ENOMEM;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/rockchip: fix compile warnings for 64-bit
2016-06-09 20:57 ` Doug Anderson
@ 2016-06-10 14:34 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2016-06-10 14:34 UTC (permalink / raw)
To: Doug Anderson
Cc: Brian Norris, linux-kernel, dri-devel,
open list:ARM/Rockchip SoC...,
Brian Norris
On Thu, Jun 09, 2016 at 01:57:54PM -0700, Doug Anderson wrote:
> Brian,
>
> On Thu, Jun 9, 2016 at 10:46 AM, Brian Norris <briannorris@chromium.org> wrote:
> > Rockchip DRM does not yet build properly for ARM64, but we might as well
> > get the printf formatting correct now, to avoid the following warnings:
> >
> > drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c: In function 'rockchip_drm_fbdev_create':
> > drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c:111:2: warning: format '%d' expects argument of type 'int', but argument 8 has type 'size_t' [-Wformat=]
> > DRM_DEBUG_KMS("FB [%dx%d]-%d kvaddr=%p offset=%ld size=%d\n",
> > ^
> >
> > drivers/gpu/drm/rockchip/rockchip_drm_gem.c: In function 'rockchip_gem_alloc_buf':
> > drivers/gpu/drm/rockchip/rockchip_drm_gem.c:41:3: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'size_t' [-Wformat=]
> > DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);
> > ^
> >
> > Signed-off-by: Brian Norris <briannorris@chromium.org>
> > ---
> > drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +-
> > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
Applied to drm-misc, thanks.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-10 14:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-09 17:46 [PATCH] drm/rockchip: fix compile warnings for 64-bit Brian Norris
2016-06-09 20:57 ` Doug Anderson
2016-06-10 14:34 ` Daniel Vetter
2016-06-10 0:51 ` Caesar Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).