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

Commit 8d4a6a70 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "drm/msm: Add .commit() callback to msm_kms functions""

parents eb937834 a4078bda

drivers/gpu/drm/msm/msm_atomic.c

+0 −5
Original line number Diff line number Diff line
@@ -71,11 +71,6 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state) 


	drm_atomic_helper_commit_modeset_enables(dev, state);



	if (kms->funcs->commit) {

		DRM_DEBUG_ATOMIC("triggering commit\n");

		kms->funcs->commit(kms, state);

	}



	msm_atomic_wait_for_commit_done(dev, state);



	kms->funcs->complete_commit(kms, state);

drivers/gpu/drm/msm/msm_kms.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ struct msm_kms_funcs { 
	void (*disable_vblank)(struct msm_kms *kms, struct drm_crtc *crtc);

	/* modeset, bracketing atomic_commit(): */

	void (*prepare_commit)(struct msm_kms *kms, struct drm_atomic_state *state);

	void (*commit)(struct msm_kms *kms, struct drm_atomic_state *state);

	void (*complete_commit)(struct msm_kms *kms, struct drm_atomic_state *state);

	/* functions to wait for atomic commit completed on each CRTC */

	void (*wait_for_crtc_commit_done)(struct msm_kms *kms,