| From 65a61a6258ff75ab1e47bbf25973cc8a5f879180 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] 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 |
| @@ -194,8 +194,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); |
| int ret; |
| @@ -681,8 +681,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) |