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

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
...@@ -3131,27 +3131,19 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, ...@@ -3131,27 +3131,19 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,
fb->pixel_format); fb->pixel_format);
surf_addr = intel_plane_obj_offset(to_intel_plane(plane), obj, 0); surf_addr = intel_plane_obj_offset(to_intel_plane(plane), obj, 0);
/* WARN_ON(drm_rect_width(&plane_state->src) == 0);
* FIXME: intel_plane_state->src, dst aren't set when transitional
* update_plane helpers are called from legacy paths. scaler_id = plane_state->scaler_id;
* Once full atomic crtc is available, below check can be avoided. src_x = plane_state->src.x1 >> 16;
*/ src_y = plane_state->src.y1 >> 16;
if (drm_rect_width(&plane_state->src)) { src_w = drm_rect_width(&plane_state->src) >> 16;
scaler_id = plane_state->scaler_id; src_h = drm_rect_height(&plane_state->src) >> 16;
src_x = plane_state->src.x1 >> 16; dst_x = plane_state->dst.x1;
src_y = plane_state->src.y1 >> 16; dst_y = plane_state->dst.y1;
src_w = drm_rect_width(&plane_state->src) >> 16; dst_w = drm_rect_width(&plane_state->dst);
src_h = drm_rect_height(&plane_state->src) >> 16; dst_h = drm_rect_height(&plane_state->dst);
dst_x = plane_state->dst.x1;
dst_y = plane_state->dst.y1; WARN_ON(x != src_x || y != src_y);
dst_w = drm_rect_width(&plane_state->dst);
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)) { if (intel_rotation_90_or_270(rotation)) {
/* stride = Surface height in tiles */ /* stride = Surface height in tiles */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment