diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-09 19:50:30 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2019-08-27 11:10:01 +0200 |
commit | 2340c646e6a5da658e114be2f721ff90853588d4 (patch) | |
tree | df9744d2344e71e8c5d1b75c3e1528bc474313fe /target/linux/brcm2708/patches-4.19/950-0323-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch | |
parent | 81d0da118694feb874f992093063a2852285d194 (diff) | |
download | upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.gz upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.bz2 upstream-2340c646e6a5da658e114be2f721ff90853588d4.zip |
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0323-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0323-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0323-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch b/target/linux/brcm2708/patches-4.19/950-0323-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch deleted file mode 100644 index 20e8903d06..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0323-gpu-vc4_firmware_kms-Fix-up-64-bit-compile-warnings.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f5f2adb60536b902d5c8ed8e0d93209062313a74 Mon Sep 17 00:00:00 2001 -From: Dave Stevenson <dave.stevenson@raspberrypi.org> -Date: Mon, 28 Jan 2019 14:40:16 +0000 -Subject: [PATCH 323/725] gpu: vc4_firmware_kms: Fix up 64 bit compile - warnings. - -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> ---- - drivers/gpu/drm/vc4/vc4_firmware_kms.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - ---- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c -+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c -@@ -160,14 +160,14 @@ static void vc4_primary_plane_atomic_upd - 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, -@@ -197,6 +197,7 @@ static void vc4_cursor_plane_atomic_upda - 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, -@@ -206,13 +207,13 @@ static void vc4_cursor_plane_atomic_upda - }; - 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 */ -@@ -238,7 +239,7 @@ static void vc4_cursor_plane_atomic_upda - 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, |