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

Commit a42e5a23 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: remove pre-atomic check from SKL update_primary_plane 



The comment suggests the check was there for some non-fully-atomic
case, and I couldn't find a case where we wouldn't correctly
initialize plane_state, so remove the check.

Let's leave a WARN there just in case.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3badb49f

drivers/gpu/drm/i915/intel_display.c

+13 −21
Original line number Diff line number Diff line
@@ -3131,12 +3131,8 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, 
					       fb->pixel_format);

	surf_addr = intel_plane_obj_offset(to_intel_plane(plane), obj, 0);



	/*

	 * FIXME: intel_plane_state->src, dst aren't set when transitional

	 * update_plane helpers are called from legacy paths.

	 * Once full atomic crtc is available, below check can be avoided.

	 */

	if (drm_rect_width(&plane_state->src)) {

	WARN_ON(drm_rect_width(&plane_state->src) == 0);



	scaler_id = plane_state->scaler_id;

	src_x = plane_state->src.x1 >> 16;

	src_y = plane_state->src.y1 >> 16;
@@ -3148,10 +3144,6 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, 
	dst_h = drm_rect_height(&plane_state->dst);



	WARN_ON(x != src_x || y != src_y);

	} else {

		src_w = intel_crtc->config->pipe_src_w;

		src_h = intel_crtc->config->pipe_src_h;

	}



	if (intel_rotation_90_or_270(rotation)) {

		/* stride = Surface height in tiles */