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

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

drm/i915: Do not use commit_plane for sprite planes. 



Use update_plane and disable_plane directly.

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


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

drivers/gpu/drm/i915/intel_atomic_plane.c

+11 −1
Original line number Diff line number Diff line
@@ -194,8 +194,18 @@ static void intel_plane_atomic_update(struct drm_plane *plane, 
	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct intel_plane_state *intel_state =

		to_intel_plane_state(plane->state);

	struct drm_crtc *crtc = plane->state->crtc ?: old_state->crtc;

	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)

		intel_plane->update_plane(plane,

					  to_intel_crtc_state(crtc_state),

					  intel_state);

	else

		intel_plane->disable_plane(plane, crtc);

}



const struct drm_plane_helper_funcs intel_plane_helper_funcs = {

drivers/gpu/drm/i915/intel_sprite.c

+0 −19
Original line number Diff line number Diff line
@@ -931,24 +931,6 @@ intel_check_sprite_plane(struct drm_plane *plane, 
	return 0;

}



static void

intel_commit_sprite_plane(struct drm_plane *plane,

			  struct intel_plane_state *state)

{

	struct intel_plane *intel_plane = to_intel_plane(plane);



	if (state->visible) {

		struct intel_crtc_state *crtc_state =

			to_intel_crtc(state->base.crtc)->config;



		intel_plane->update_plane(plane, crtc_state, state);

	} else {

		struct drm_crtc *crtc = state->base.crtc;



		intel_plane->disable_plane(plane, crtc ?: plane->crtc);

	}

}



int intel_sprite_set_colorkey(struct drm_device *dev, void *data,

			      struct drm_file *file_priv)

{
@@ -1130,7 +1112,6 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) 
	intel_plane->plane = plane;

	intel_plane->frontbuffer_bit = INTEL_FRONTBUFFER_SPRITE(pipe, plane);

	intel_plane->check_plane = intel_check_sprite_plane;

	intel_plane->commit_plane = intel_commit_sprite_plane;

	possible_crtcs = (1 << pipe);

	ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs,

				       &intel_plane_funcs,