[Intel-gfx] [PATCH 21/23] drm/vc4: Stop updating plane->fb/crtc
Maarten Lankhorst
maarten.lankhorst at linux.intel.com
Thu Mar 22 16:50:56 UTC 2018
Op 22-03-18 om 16:23 schreef Ville Syrjala:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> We want to get rid of plane->fb/crtc on atomic drivers. Stop setting
> them.
>
> Cc: Eric Anholt <eric at anholt.net>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
> drivers/gpu/drm/vc4/vc4_crtc.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
> index bf4667481935..a9f65e15889d 100644
> --- a/drivers/gpu/drm/vc4/vc4_crtc.c
> +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
> @@ -837,7 +837,6 @@ static int vc4_async_page_flip(struct drm_crtc *crtc,
> * is released.
> */
> drm_atomic_set_fb_for_plane(plane->state, fb);
> - plane->fb = fb;
>
> vc4_queue_seqno_cb(dev, &flip_state->cb, bo->seqno,
> vc4_async_page_flip_complete);
> @@ -1032,7 +1031,6 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data)
> drm_crtc_init_with_planes(drm, crtc, primary_plane, NULL,
> &vc4_crtc_funcs, NULL);
> drm_crtc_helper_add(crtc, &vc4_crtc_helper_funcs);
> - primary_plane->crtc = crtc;
> vc4_crtc->channel = vc4_crtc->data->hvs_channel;
> drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
>
> @@ -1062,7 +1060,6 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data)
> cursor_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_CURSOR);
> if (!IS_ERR(cursor_plane)) {
> cursor_plane->possible_crtcs = 1 << drm_crtc_index(crtc);
> - cursor_plane->crtc = crtc;
> crtc->cursor = cursor_plane;
> }
>
With all my comments fixed, for the whole series:
Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
More information about the Intel-gfx
mailing list