2019-09-19 14:43:19 +00:00
|
|
|
From e5285033e0fbfb6750d7d39e7edebf67a16c8434 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
|
|
|
Date: Tue, 19 Feb 2019 15:06:31 +0000
|
2019-09-19 14:43:19 +00:00
|
|
|
Subject: [PATCH 350/806] gpu:vc4-fkms: Update driver to not use plane->crtc.
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
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)
|
