Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f958af7 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/vc4: Stop updating plane->fb/crtc 



We want to get rid of plane->fb/crtc on atomic drivers. Stop setting
them.

Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180525185045.29689-13-ville.syrjala@linux.intel.com


Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
parent 50dcd554

drivers/gpu/drm/vc4/vc4_crtc.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -818,7 +818,6 @@ static int vc4_async_page_flip(struct drm_crtc *crtc, 
	 * is released.

	 * is released.

	 */

	 */

	drm_atomic_set_fb_for_plane(plane->state, fb);

	drm_atomic_set_fb_for_plane(plane->state, fb);

	plane->fb = fb;





	vc4_queue_seqno_cb(dev, &flip_state->cb, bo->seqno,

	vc4_queue_seqno_cb(dev, &flip_state->cb, bo->seqno,

			   vc4_async_page_flip_complete);

			   vc4_async_page_flip_complete);
@@ -1013,7 +1012,6 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) 
	drm_crtc_init_with_planes(drm, crtc, primary_plane, NULL,

	drm_crtc_init_with_planes(drm, crtc, primary_plane, NULL,

				  &vc4_crtc_funcs, NULL);

				  &vc4_crtc_funcs, NULL);

	drm_crtc_helper_add(crtc, &vc4_crtc_helper_funcs);

	drm_crtc_helper_add(crtc, &vc4_crtc_helper_funcs);

	primary_plane->crtc = crtc;

	vc4_crtc->channel = vc4_crtc->data->hvs_channel;

	vc4_crtc->channel = vc4_crtc->data->hvs_channel;

	drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));

	drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));

	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);

	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
@@ -1049,7 +1047,6 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) 
	cursor_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_CURSOR);

	cursor_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_CURSOR);

	if (!IS_ERR(cursor_plane)) {

	if (!IS_ERR(cursor_plane)) {

		cursor_plane->possible_crtcs = 1 << drm_crtc_index(crtc);

		cursor_plane->possible_crtcs = 1 << drm_crtc_index(crtc);

		cursor_plane->crtc = crtc;

		crtc->cursor = cursor_plane;

		crtc->cursor = cursor_plane;

	}

	}