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

Commit 39ccc04e authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Use primary plane->state for overlay ckey setup 



Extract the primary plane pixel format via plane state when setting up
the overlay colorkey.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1481131693-27993-10-git-send-email-ville.syrjala@linux.intel.com


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

drivers/gpu/drm/i915/intel_overlay.c

+17 −16
Original line number Diff line number Diff line
@@ -690,31 +690,32 @@ static bool update_scaling_factors(struct intel_overlay *overlay, 
static void update_colorkey(struct intel_overlay *overlay,

			    struct overlay_registers __iomem *regs)

{

	const struct intel_plane_state *state =

		to_intel_plane_state(overlay->crtc->base.primary->state);

	u32 key = overlay->color_key;

	u32 flags;

	u32 format = 0;

	u32 flags = 0;



	flags = 0;

	if (overlay->color_key_enabled)

		flags |= DST_KEY_ENABLE;



	switch (overlay->crtc->base.primary->fb->bits_per_pixel) {

	case 8:

	if (state->base.visible)

		format = state->base.fb->pixel_format;



	switch (format) {

	case DRM_FORMAT_C8:

		key = 0;

		flags |= CLK_RGB8I_MASK;

		break;



	case 16:

		if (overlay->crtc->base.primary->fb->depth == 15) {

	case DRM_FORMAT_XRGB1555:

		key = RGB15_TO_COLORKEY(key);

		flags |= CLK_RGB15_MASK;

		} else {

		break;

	case DRM_FORMAT_RGB565:

		key = RGB16_TO_COLORKEY(key);

		flags |= CLK_RGB16_MASK;

		}

		break;



	case 24:

	case 32:

	default:

		flags |= CLK_RGB24_MASK;

		break;

	}