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

Commit 0a375147 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Extract ilk_sprite_ctl() 



Pull the code to calculate the ILK-SNB 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-7-ville.syrjala@linux.intel.com


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

drivers/gpu/drm/i915/intel_sprite.c

+41 −31
Original line number Diff line number Diff line
@@ -659,31 +659,20 @@ ivb_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc) 
	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);

}



static void

ilk_update_plane(struct drm_plane *plane,

		 const struct intel_crtc_state *crtc_state,

static u32 ilk_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;

	int pipe = intel_plane->pipe;

	u32 dvscntr, dvsscale;

	u32 dvssurf_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 dvscntr;



	dvscntr = DVS_ENABLE;

	dvscntr = DVS_ENABLE | DVS_GAMMA_ENABLE;



	if (IS_GEN6(dev_priv))

		dvscntr |= DVS_TRICKLE_FEED_DISABLE;



	switch (fb->format->format) {

	case DRM_FORMAT_XBGR8888:
@@ -705,29 +694,50 @@ ilk_update_plane(struct drm_plane *plane, 
		dvscntr |= DVS_FORMAT_YUV422 | DVS_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.

	 */

	dvscntr |= DVS_GAMMA_ENABLE;



	if (fb->modifier == I915_FORMAT_MOD_X_TILED)

		dvscntr |= DVS_TILED;



	if (rotation & DRM_ROTATE_180)

		dvscntr |= DVS_ROTATE_180;



	if (IS_GEN6(dev_priv))

		dvscntr |= DVS_TRICKLE_FEED_DISABLE; /* must disable */



	if (key->flags & I915_SET_COLORKEY_DESTINATION)

		dvscntr |= DVS_DEST_KEY;

	else if (key->flags & I915_SET_COLORKEY_SOURCE)

		dvscntr |= DVS_SOURCE_KEY;



	return dvscntr;

}



static void

ilk_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;

	int pipe = intel_plane->pipe;

	u32 dvscntr, dvsscale;

	u32 dvssurf_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;



	dvscntr = ilk_sprite_ctl(crtc_state, plane_state);



	/* Sizes are 0 based */

	src_w--;

	src_h--;