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

Commit 282dbf9b authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass intel_plane and intel_crtc to plane hooks 



Streamline things by passing intel_plane and intel_crtc instead of
the drm types to our plane hooks.

v2: s/ilk/g4x/ in sprite code

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170327185546.2977-3-ville.syrjala@linux.intel.com
parent d509e28b

drivers/gpu/drm/i915/intel_atomic_plane.c

+3 −3
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ int intel_plane_atomic_check_with_state(struct intel_crtc_state *crtc_state, 
	}



	intel_state->base.visible = false;

	ret = intel_plane->check_plane(plane, crtc_state, intel_state);

	ret = intel_plane->check_plane(intel_plane, crtc_state, intel_state);

	if (ret)

		return ret;
@@ -235,14 +235,14 @@ static void intel_plane_atomic_update(struct drm_plane *plane, 
		trace_intel_update_plane(plane,

					 to_intel_crtc(crtc));



		intel_plane->update_plane(plane,

		intel_plane->update_plane(intel_plane,

					  to_intel_crtc_state(crtc->state),

					  intel_state);

	} else {

		trace_intel_disable_plane(plane,

					  to_intel_crtc(crtc));



		intel_plane->disable_plane(plane, crtc);

		intel_plane->disable_plane(intel_plane, to_intel_crtc(crtc));

	}

}

drivers/gpu/drm/i915/intel_display.c

+51 −58
Original line number Diff line number Diff line
@@ -2750,7 +2750,7 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc, 
				false);

	intel_pre_disable_primary_noatomic(&intel_crtc->base);

	trace_intel_disable_plane(primary, intel_crtc);

	intel_plane->disable_plane(primary, &intel_crtc->base);

	intel_plane->disable_plane(intel_plane, intel_crtc);



	return;
@@ -3061,14 +3061,14 @@ int i9xx_check_plane_surface(struct intel_plane_state *plane_state) 
	return 0;

}



static void i9xx_update_primary_plane(struct drm_plane *primary,

static void i9xx_update_primary_plane(struct intel_plane *primary,

				      const struct intel_crtc_state *crtc_state,

				      const struct intel_plane_state *plane_state)

{

	struct drm_i915_private *dev_priv = to_i915(primary->dev);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);

	struct drm_framebuffer *fb = plane_state->base.fb;

	int plane = intel_crtc->plane;

	struct drm_i915_private *dev_priv = to_i915(primary->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	const struct drm_framebuffer *fb = plane_state->base.fb;

	enum plane plane = primary->plane;

	u32 linear_offset;

	u32 dspcntr = plane_state->ctl;

	i915_reg_t reg = DSPCNTR(plane);
@@ -3079,12 +3079,12 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, 
	linear_offset = intel_fb_xy_to_linear(x, y, plane_state, 0);



	if (INTEL_GEN(dev_priv) >= 4)

		intel_crtc->dspaddr_offset = plane_state->main.offset;

		crtc->dspaddr_offset = plane_state->main.offset;

	else

		intel_crtc->dspaddr_offset = linear_offset;

		crtc->dspaddr_offset = linear_offset;



	intel_crtc->adjusted_x = x;

	intel_crtc->adjusted_y = y;

	crtc->adjusted_x = x;

	crtc->adjusted_y = y;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
@@ -3110,31 +3110,29 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, 
	if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) {

		I915_WRITE_FW(DSPSURF(plane),

			      intel_plane_ggtt_offset(plane_state) +

			      intel_crtc->dspaddr_offset);

			      crtc->dspaddr_offset);

		I915_WRITE_FW(DSPOFFSET(plane), (y << 16) | x);

	} else if (INTEL_GEN(dev_priv) >= 4) {

		I915_WRITE_FW(DSPSURF(plane),

			      intel_plane_ggtt_offset(plane_state) +

			      intel_crtc->dspaddr_offset);

			      crtc->dspaddr_offset);

		I915_WRITE_FW(DSPTILEOFF(plane), (y << 16) | x);

		I915_WRITE_FW(DSPLINOFF(plane), linear_offset);

	} else {

		I915_WRITE_FW(DSPADDR(plane),

			      intel_plane_ggtt_offset(plane_state) +

			      intel_crtc->dspaddr_offset);

			      crtc->dspaddr_offset);

	}

	POSTING_READ_FW(reg);



	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void i9xx_disable_primary_plane(struct drm_plane *primary,

				       struct drm_crtc *crtc)

static void i9xx_disable_primary_plane(struct intel_plane *primary,

				       struct intel_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	int plane = intel_crtc->plane;

	struct drm_i915_private *dev_priv = to_i915(primary->base.dev);

	enum plane plane = primary->plane;

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
@@ -3319,16 +3317,15 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, 
	return plane_ctl;

}



static void skylake_update_primary_plane(struct drm_plane *plane,

static void skylake_update_primary_plane(struct intel_plane *plane,

					 const struct intel_crtc_state *crtc_state,

					 const struct intel_plane_state *plane_state)

{

	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);

	struct drm_framebuffer *fb = plane_state->base.fb;

	enum plane_id plane_id = to_intel_plane(plane)->id;

	enum pipe pipe = to_intel_plane(plane)->pipe;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	const struct drm_framebuffer *fb = plane_state->base.fb;

	enum plane_id plane_id = plane->id;

	enum pipe pipe = plane->pipe;

	u32 plane_ctl = plane_state->ctl;

	unsigned int rotation = plane_state->base.rotation;

	u32 stride = skl_plane_stride(fb, 0, rotation);
@@ -3350,10 +3347,10 @@ static void skylake_update_primary_plane(struct drm_plane *plane, 
	dst_w--;

	dst_h--;



	intel_crtc->dspaddr_offset = surf_addr;

	crtc->dspaddr_offset = surf_addr;



	intel_crtc->adjusted_x = src_x;

	intel_crtc->adjusted_y = src_y;

	crtc->adjusted_x = src_x;

	crtc->adjusted_y = src_y;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
@@ -3392,13 +3389,12 @@ static void skylake_update_primary_plane(struct drm_plane *plane, 
	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void skylake_disable_primary_plane(struct drm_plane *primary,

					  struct drm_crtc *crtc)

static void skylake_disable_primary_plane(struct intel_plane *primary,

					  struct intel_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	enum plane_id plane_id = to_intel_plane(primary)->id;

	enum pipe pipe = to_intel_plane(primary)->pipe;

	struct drm_i915_private *dev_priv = to_i915(primary->base.dev);

	enum plane_id plane_id = primary->id;

	enum pipe pipe = primary->pipe;

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
@@ -3431,7 +3427,7 @@ static void intel_update_primary_planes(struct drm_device *dev) 
			trace_intel_update_plane(&plane->base,

						 to_intel_crtc(crtc));



			plane->update_plane(&plane->base,

			plane->update_plane(plane,

					    to_intel_crtc_state(crtc->state),

					    plane_state);

		}
@@ -5081,7 +5077,7 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc, unsigned plane_mask 
	intel_crtc_dpms_overlay_disable(intel_crtc);



	drm_for_each_plane_mask(p, dev, plane_mask)

		to_intel_plane(p)->disable_plane(p, crtc);

		to_intel_plane(p)->disable_plane(to_intel_plane(p), intel_crtc);



	/*

	 * FIXME: Once we grow proper nuclear flip support out of this we need
@@ -13279,11 +13275,11 @@ skl_max_scale(struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state 
}



static int

intel_check_primary_plane(struct drm_plane *plane,

intel_check_primary_plane(struct intel_plane *plane,

			  struct intel_crtc_state *crtc_state,

			  struct intel_plane_state *state)

{

	struct drm_i915_private *dev_priv = to_i915(plane->dev);

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

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

	int min_scale = DRM_PLANE_HELPER_NO_SCALING;

	int max_scale = DRM_PLANE_HELPER_NO_SCALING;
@@ -13498,12 +13494,12 @@ intel_legacy_cursor_update(struct drm_plane *plane, 


	if (plane->state->visible) {

		trace_intel_update_plane(plane, to_intel_crtc(crtc));

		intel_plane->update_plane(plane,

		intel_plane->update_plane(intel_plane,

					  to_intel_crtc_state(crtc->state),

					  to_intel_plane_state(plane->state));

	} else {

		trace_intel_disable_plane(plane, to_intel_crtc(crtc));

		intel_plane->disable_plane(plane, crtc);

		intel_plane->disable_plane(intel_plane, to_intel_crtc(crtc));

	}



	intel_cleanup_plane_fb(plane, new_plane_state);
@@ -13647,14 +13643,14 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
}



static int

intel_check_cursor_plane(struct drm_plane *plane,

intel_check_cursor_plane(struct intel_plane *plane,

			 struct intel_crtc_state *crtc_state,

			 struct intel_plane_state *state)

{

	struct drm_i915_private *dev_priv = to_i915(plane->dev);

	struct drm_framebuffer *fb = state->base.fb;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	const struct drm_framebuffer *fb = state->base.fb;

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

	enum pipe pipe = to_intel_plane(plane)->pipe;

	enum pipe pipe = plane->pipe;

	unsigned stride;

	int ret;
@@ -13714,23 +13710,20 @@ intel_check_cursor_plane(struct drm_plane *plane, 
}



static void

intel_disable_cursor_plane(struct drm_plane *plane,

			   struct drm_crtc *crtc)

intel_disable_cursor_plane(struct intel_plane *plane,

			   struct intel_crtc *crtc)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



	intel_crtc->cursor_addr = 0;

	intel_crtc_update_cursor(crtc, NULL);

	crtc->cursor_addr = 0;

	intel_crtc_update_cursor(&crtc->base, NULL);

}



static void

intel_update_cursor_plane(struct drm_plane *plane,

intel_update_cursor_plane(struct intel_plane *plane,

			  const struct intel_crtc_state *crtc_state,

			  const struct intel_plane_state *state)

{

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

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct drm_i915_private *dev_priv = to_i915(plane->dev);

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct drm_i915_gem_object *obj = intel_fb_obj(state->base.fb);

	uint32_t addr;
@@ -13741,8 +13734,8 @@ intel_update_cursor_plane(struct drm_plane *plane, 
	else

		addr = obj->phys_handle->busaddr;



	intel_crtc->cursor_addr = addr;

	intel_crtc_update_cursor(crtc, state);

	crtc->cursor_addr = addr;

	intel_crtc_update_cursor(&crtc->base, state);

}



static struct intel_plane *
@@ -15160,7 +15153,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) 
				continue;



			trace_intel_disable_plane(&plane->base, crtc);

			plane->disable_plane(&plane->base, &crtc->base);

			plane->disable_plane(plane, crtc);

		}

	}

drivers/gpu/drm/i915/intel_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -851,12 +851,12 @@ struct intel_plane { 
	 * the intel_plane_state structure and accessed via plane_state.

	 */



	void (*update_plane)(struct drm_plane *plane,

	void (*update_plane)(struct intel_plane *plane,

			     const struct intel_crtc_state *crtc_state,

			     const struct intel_plane_state *plane_state);

	void (*disable_plane)(struct drm_plane *plane,

			      struct drm_crtc *crtc);

	int (*check_plane)(struct drm_plane *plane,

	void (*disable_plane)(struct intel_plane *plane,

			      struct intel_crtc *crtc);

	int (*check_plane)(struct intel_plane *plane,

			   struct intel_crtc_state *crtc_state,

			   struct intel_plane_state *state);

};

drivers/gpu/drm/i915/intel_sprite.c

+46 −64
Original line number Diff line number Diff line
@@ -207,16 +207,14 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work 
}



static void

skl_update_plane(struct drm_plane *drm_plane,

skl_update_plane(struct intel_plane *plane,

		 const struct intel_crtc_state *crtc_state,

		 const struct intel_plane_state *plane_state)

{

	struct drm_device *dev = drm_plane->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_plane *intel_plane = to_intel_plane(drm_plane);

	struct drm_framebuffer *fb = plane_state->base.fb;

	enum plane_id plane_id = intel_plane->id;

	enum pipe pipe = intel_plane->pipe;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	const struct drm_framebuffer *fb = plane_state->base.fb;

	enum plane_id plane_id = plane->id;

	enum pipe pipe = plane->pipe;

	u32 plane_ctl = plane_state->ctl;

	const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;

	u32 surf_addr = plane_state->main.offset;
@@ -285,13 +283,11 @@ skl_update_plane(struct drm_plane *drm_plane, 
}



static void

skl_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)

skl_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc)

{

	struct drm_device *dev = dplane->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_plane *intel_plane = to_intel_plane(dplane);

	enum plane_id plane_id = intel_plane->id;

	enum pipe pipe = intel_plane->pipe;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	enum plane_id plane_id = plane->id;

	enum pipe pipe = plane->pipe;

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
@@ -305,10 +301,10 @@ skl_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc) 
}



static void

chv_update_csc(struct intel_plane *intel_plane, uint32_t format)

chv_update_csc(struct intel_plane *plane, uint32_t format)

{

	struct drm_i915_private *dev_priv = to_i915(intel_plane->base.dev);

	enum plane_id plane_id = intel_plane->id;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	enum plane_id plane_id = plane->id;



	/* Seems RGB data bypasses the CSC always */

	if (!format_is_yuv(format))
@@ -408,16 +404,14 @@ static u32 vlv_sprite_ctl(const struct intel_crtc_state *crtc_state, 
}



static void

vlv_update_plane(struct drm_plane *dplane,

vlv_update_plane(struct intel_plane *plane,

		 const struct intel_crtc_state *crtc_state,

		 const struct intel_plane_state *plane_state)

{

	struct drm_device *dev = dplane->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_plane *intel_plane = to_intel_plane(dplane);

	struct drm_framebuffer *fb = plane_state->base.fb;

	enum pipe pipe = intel_plane->pipe;

	enum plane_id plane_id = intel_plane->id;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	const struct drm_framebuffer *fb = plane_state->base.fb;

	enum pipe pipe = plane->pipe;

	enum plane_id plane_id = plane->id;

	u32 sprctl = plane_state->ctl;

	u32 sprsurf_offset = plane_state->main.offset;

	u32 linear_offset;
@@ -439,7 +433,7 @@ vlv_update_plane(struct drm_plane *dplane, 
	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_B)

		chv_update_csc(intel_plane, fb->format->format);

		chv_update_csc(plane, fb->format->format);



	if (key->flags) {

		I915_WRITE_FW(SPKEYMINVAL(pipe, plane_id), key->min_value);
@@ -466,13 +460,11 @@ vlv_update_plane(struct drm_plane *dplane, 
}



static void

vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc)

vlv_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc)

{

	struct drm_device *dev = dplane->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_plane *intel_plane = to_intel_plane(dplane);

	enum pipe pipe = intel_plane->pipe;

	enum plane_id plane_id = intel_plane->id;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	enum pipe pipe = plane->pipe;

	enum plane_id plane_id = plane->id;

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
@@ -542,15 +534,13 @@ static u32 ivb_sprite_ctl(const struct intel_crtc_state *crtc_state, 
}



static void

ivb_update_plane(struct drm_plane *plane,

ivb_update_plane(struct intel_plane *plane,

		 const struct intel_crtc_state *crtc_state,

		 const struct intel_plane_state *plane_state)

{

	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct drm_framebuffer *fb = plane_state->base.fb;

	enum pipe pipe = intel_plane->pipe;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	const struct drm_framebuffer *fb = plane_state->base.fb;

	enum pipe pipe = plane->pipe;

	u32 sprctl = plane_state->ctl, sprscale = 0;

	u32 sprsurf_offset = plane_state->main.offset;

	u32 linear_offset;
@@ -597,7 +587,7 @@ ivb_update_plane(struct drm_plane *plane, 
		I915_WRITE_FW(SPRLINOFF(pipe), linear_offset);



	I915_WRITE_FW(SPRSIZE(pipe), (crtc_h << 16) | crtc_w);

	if (intel_plane->can_scale)

	if (plane->can_scale)

		I915_WRITE_FW(SPRSCALE(pipe), sprscale);

	I915_WRITE_FW(SPRCTL(pipe), sprctl);

	I915_WRITE_FW(SPRSURF(pipe),
@@ -608,19 +598,17 @@ ivb_update_plane(struct drm_plane *plane, 
}



static void

ivb_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc)

ivb_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc)

{

	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_plane *intel_plane = to_intel_plane(plane);

	int pipe = intel_plane->pipe;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	enum pipe pipe = plane->pipe;

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);



	I915_WRITE_FW(SPRCTL(pipe), 0);

	/* Can't leave the scaler enabled... */

	if (intel_plane->can_scale)

	if (plane->can_scale)

		I915_WRITE_FW(SPRSCALE(pipe), 0);



	I915_WRITE_FW(SPRSURF(pipe), 0);
@@ -683,15 +671,13 @@ static u32 g4x_sprite_ctl(const struct intel_crtc_state *crtc_state, 
}



static void

g4x_update_plane(struct drm_plane *plane,

g4x_update_plane(struct intel_plane *plane,

		 const struct intel_crtc_state *crtc_state,

		 const struct intel_plane_state *plane_state)

{

	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct drm_framebuffer *fb = plane_state->base.fb;

	int pipe = intel_plane->pipe;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	const struct drm_framebuffer *fb = plane_state->base.fb;

	enum pipe pipe = plane->pipe;

	u32 dvscntr = plane_state->ctl, dvsscale = 0;

	u32 dvssurf_offset = plane_state->main.offset;

	u32 linear_offset;
@@ -744,12 +730,10 @@ g4x_update_plane(struct drm_plane *plane, 
}



static void

g4x_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc)

g4x_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc)

{

	struct drm_device *dev = plane->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_plane *intel_plane = to_intel_plane(plane);

	int pipe = intel_plane->pipe;

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	enum pipe pipe = plane->pipe;

	unsigned long irqflags;



	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
@@ -765,14 +749,12 @@ g4x_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc) 
}



static int

intel_check_sprite_plane(struct drm_plane *plane,

intel_check_sprite_plane(struct intel_plane *plane,

			 struct intel_crtc_state *crtc_state,

			 struct intel_plane_state *state)

{

	struct drm_i915_private *dev_priv = to_i915(plane->dev);

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

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_plane *intel_plane = to_intel_plane(plane);

	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct drm_framebuffer *fb = state->base.fb;

	int crtc_x, crtc_y;

	unsigned int crtc_w, crtc_h;
@@ -794,7 +776,7 @@ intel_check_sprite_plane(struct drm_plane *plane, 
	}



	/* Don't modify another pipe's plane */

	if (intel_plane->pipe != intel_crtc->pipe) {

	if (plane->pipe != crtc->pipe) {

		DRM_DEBUG_KMS("Wrong plane <-> crtc mapping\n");

		return -EINVAL;

	}
@@ -811,16 +793,16 @@ intel_check_sprite_plane(struct drm_plane *plane, 
		if (state->ckey.flags == I915_SET_COLORKEY_NONE) {

			can_scale = 1;

			min_scale = 1;

			max_scale = skl_max_scale(intel_crtc, crtc_state);

			max_scale = skl_max_scale(crtc, crtc_state);

		} else {

			can_scale = 0;

			min_scale = DRM_PLANE_HELPER_NO_SCALING;

			max_scale = DRM_PLANE_HELPER_NO_SCALING;

		}

	} else {

		can_scale = intel_plane->can_scale;

		max_scale = intel_plane->max_downscale << 16;

		min_scale = intel_plane->can_scale ? 1 : (1 << 16);

		can_scale = plane->can_scale;

		max_scale = plane->max_downscale << 16;

		min_scale = plane->can_scale ? 1 : (1 << 16);

	}



	/*