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

Commit c03242b1 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Remove commit_plane function pointer. 



With sprites, cursors and primary planes taking the atomic state
this is now unused. It's removed in a separate commit to allow
a revert.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1452164052-21752-8-git-send-email-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent a8d201af

drivers/gpu/drm/i915/intel_atomic_plane.c

+1 −3
Original line number Diff line number Diff line
@@ -198,9 +198,7 @@ static void intel_plane_atomic_update(struct drm_plane *plane, 
	struct drm_crtc_state *crtc_state =

		drm_atomic_get_existing_crtc_state(old_state->state, crtc);



	if (intel_plane->commit_plane)

		intel_plane->commit_plane(plane, intel_state);

	else if (intel_state->visible)

	if (intel_state->visible)

		intel_plane->update_plane(plane,

					  to_intel_crtc_state(crtc_state),

					  intel_state);

drivers/gpu/drm/i915/intel_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -692,8 +692,6 @@ struct intel_plane { 
	int (*check_plane)(struct drm_plane *plane,

			   struct intel_crtc_state *crtc_state,

			   struct intel_plane_state *state);

	void (*commit_plane)(struct drm_plane *plane,

			     struct intel_plane_state *state);

};



struct intel_watermark_params {