Skip to content

Commit

Permalink
gpu: vc4_firmware_kms: Fix up 64 bit compile warnings.
Browse files Browse the repository at this point in the history
Resolve two build warnings with regard using incorrectly
sized parameters in logging messages on 64 bit builds.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  • Loading branch information
6by9 authored and pelwell committed Jan 29, 2019
1 parent 23d5204 commit 4bd4659
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/gpu/drm/vc4/vc4_firmware_kms.c
Expand Up @@ -160,14 +160,14 @@ static void vc4_primary_plane_atomic_update(struct drm_plane *plane,
WARN_ON_ONCE(vc4_plane->pitch != fb->pitches[0]);
}

DRM_DEBUG_ATOMIC("[PLANE:%d:%s] primary update %dx%d@%d +%d,%d 0x%08x/%d\n",
DRM_DEBUG_ATOMIC("[PLANE:%d:%s] primary update %dx%d@%d +%d,%d 0x%pad/%d\n",
plane->base.id, plane->name,
state->crtc_w,
state->crtc_h,
bpp,
state->crtc_x,
state->crtc_y,
bo->paddr + fb->offsets[0],
&fbinfo->base,
fb->pitches[0]);

ret = rpi_firmware_transaction(vc4->firmware,
Expand Down Expand Up @@ -197,6 +197,7 @@ static void vc4_cursor_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *state = plane->state;
struct drm_framebuffer *fb = state->fb;
struct drm_gem_cma_object *bo = drm_fb_cma_get_gem_obj(fb, 0);
dma_addr_t addr = bo->paddr + fb->offsets[0];
int ret;
u32 packet_state[] = {
state->crtc->state->active,
Expand All @@ -206,13 +207,13 @@ static void vc4_cursor_plane_atomic_update(struct drm_plane *plane,
};
WARN_ON_ONCE(fb->pitches[0] != state->crtc_w * 4);

DRM_DEBUG_ATOMIC("[PLANE:%d:%s] update %dx%d cursor at %d,%d (0x%08x/%d)",
DRM_DEBUG_ATOMIC("[PLANE:%d:%s] update %dx%d cursor at %d,%d (0x%pad/%d)",
plane->base.id, plane->name,
state->crtc_w,
state->crtc_h,
state->crtc_x,
state->crtc_y,
bo->paddr + fb->offsets[0],
&addr,
fb->pitches[0]);

/* add on the top/left offsets when overscan is active */
Expand All @@ -238,7 +239,7 @@ static void vc4_cursor_plane_atomic_update(struct drm_plane *plane,
fb != old_state->fb) {
u32 packet_info[] = { state->crtc_w, state->crtc_h,
0, /* unused */
bo->paddr + fb->offsets[0],
addr,
0, 0, /* hotx, hoty */};

ret = rpi_firmware_property(vc4->firmware,
Expand Down

0 comments on commit 4bd4659

Please sign in to comment.