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-0351-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.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-0351-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0351-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0351-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch b/target/linux/brcm2708/patches-4.19/950-0351-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch new file mode 100644 index 0000000000..46a972ef22 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0351-gpu-vc4-fkms-Update-driver-to-not-use-plane-crtc.patch @@ -0,0 +1,36 @@ +From a38d0527a01e53499a5c54b49c2e56b518b75b48 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.org> +Date: Tue, 19 Feb 2019 15:06:31 +0000 +Subject: [PATCH 351/773] gpu:vc4-fkms: Update driver to not use plane->crtc. + +Following on from +commit 2f958af7fc248 ("drm/vc4: Stop updating plane->fb/crtc") +do the same in the firmwarekms driver and look at plane_state->crtc +instead. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +--- + drivers/gpu/drm/vc4/vc4_firmware_kms.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c +@@ -193,8 +193,8 @@ static void vc4_cursor_plane_atomic_upda + struct drm_plane_state *old_state) + { + struct vc4_dev *vc4 = to_vc4_dev(plane->dev); +- struct vc4_crtc *vc4_crtc = to_vc4_crtc(plane->crtc); + struct drm_plane_state *state = plane->state; ++ struct vc4_crtc *vc4_crtc = to_vc4_crtc(state->crtc); + 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]; +@@ -682,8 +682,6 @@ static int vc4_fkms_bind(struct device * + drm_crtc_init_with_planes(drm, crtc, primary_plane, cursor_plane, + &vc4_crtc_funcs, NULL); + drm_crtc_helper_add(crtc, &vc4_crtc_helper_funcs); +- primary_plane->crtc = crtc; +- cursor_plane->crtc = crtc; + + vc4_encoder = devm_kzalloc(dev, sizeof(*vc4_encoder), GFP_KERNEL); + if (!vc4_encoder) |