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

Commit 45dea7b0 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Extract ivb_sprite_ctl() 



Pull the code to calculate the IVB-BDW sprite control register value
into a separate function. Allows us to pre-compute it in the future.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170317211808.14693-6-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 96ef6854

drivers/gpu/drm/i915/intel_sprite.c

+44 −36
Original line number Diff line number Diff line
@@ -503,31 +503,23 @@ vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc) 
	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void

ivb_update_plane(struct drm_plane *plane,

		 const struct intel_crtc_state *crtc_state,

static u32 ivb_sprite_ctl(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;

	u32 sprctl, sprscale = 0;

	u32 sprsurf_offset, linear_offset;

	struct drm_i915_private *dev_priv =

		to_i915(plane_state->base.plane->dev);

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

	unsigned int rotation = plane_state->base.rotation;

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

	int crtc_x = plane_state->base.dst.x1;

	int crtc_y = plane_state->base.dst.y1;

	uint32_t crtc_w = drm_rect_width(&plane_state->base.dst);

	uint32_t crtc_h = drm_rect_height(&plane_state->base.dst);

	uint32_t x = plane_state->base.src.x1 >> 16;

	uint32_t y = plane_state->base.src.y1 >> 16;

	uint32_t src_w = drm_rect_width(&plane_state->base.src) >> 16;

	uint32_t src_h = drm_rect_height(&plane_state->base.src) >> 16;

	unsigned long irqflags;

	u32 sprctl;



	sprctl = SPRITE_ENABLE;

	sprctl = SPRITE_ENABLE | SPRITE_GAMMA_ENABLE;



	if (IS_IVYBRIDGE(dev_priv))

		sprctl |= SPRITE_TRICKLE_FEED_DISABLE;



	if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))

		sprctl |= SPRITE_PIPE_CSC_ENABLE;



	switch (fb->format->format) {

	case DRM_FORMAT_XBGR8888:
@@ -549,34 +541,50 @@ ivb_update_plane(struct drm_plane *plane, 
		sprctl |= SPRITE_FORMAT_YUV422 | SPRITE_YUV_ORDER_VYUY;

		break;

	default:

		BUG();

		MISSING_CASE(fb->format->format);

		return 0;

	}



	/*

	 * Enable gamma to match primary/cursor plane behaviour.

	 * FIXME should be user controllable via propertiesa.

	 */

	sprctl |= SPRITE_GAMMA_ENABLE;



	if (fb->modifier == I915_FORMAT_MOD_X_TILED)

		sprctl |= SPRITE_TILED;



	if (rotation & DRM_ROTATE_180)

		sprctl |= SPRITE_ROTATE_180;



	if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))

		sprctl &= ~SPRITE_TRICKLE_FEED_DISABLE;

	else

		sprctl |= SPRITE_TRICKLE_FEED_DISABLE;



	if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))

		sprctl |= SPRITE_PIPE_CSC_ENABLE;



	if (key->flags & I915_SET_COLORKEY_DESTINATION)

		sprctl |= SPRITE_DEST_KEY;

	else if (key->flags & I915_SET_COLORKEY_SOURCE)

		sprctl |= SPRITE_SOURCE_KEY;



	return sprctl;

}



static void

ivb_update_plane(struct drm_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;

	u32 sprctl, sprscale = 0;

	u32 sprsurf_offset, linear_offset;

	unsigned int rotation = plane_state->base.rotation;

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

	int crtc_x = plane_state->base.dst.x1;

	int crtc_y = plane_state->base.dst.y1;

	uint32_t crtc_w = drm_rect_width(&plane_state->base.dst);

	uint32_t crtc_h = drm_rect_height(&plane_state->base.dst);

	uint32_t x = plane_state->base.src.x1 >> 16;

	uint32_t y = plane_state->base.src.y1 >> 16;

	uint32_t src_w = drm_rect_width(&plane_state->base.src) >> 16;

	uint32_t src_h = drm_rect_height(&plane_state->base.src) >> 16;

	unsigned long irqflags;



	sprctl = ivb_sprite_ctl(crtc_state, plane_state);



	/* Sizes are 0 based */

	src_w--;

	src_h--;