[09/11] drm/i915: Use primary plane->state for overlay ckey setup

Submitted by Ville Syrjala on Dec. 7, 2016, 5:28 p.m.

Details

Message ID 1481131693-27993-10-git-send-email-ville.syrjala@linux.intel.com
State Accepted
Commit 39ccc04e7435f7348fbe28a4e375214a950645d8
Headers show
Series "drm/i915: Overlay fixes" ( rev: 5 4 3 2 1 ) in Intel GFX

Not browsing as part of any series.

Commit Message

Ville Syrjala Dec. 7, 2016, 5:28 p.m. 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

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

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_overlay.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index e4420b08f3ab..bc113ebc475f 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -689,31 +689,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) {
-			key = RGB15_TO_COLORKEY(key);
-			flags |= CLK_RGB15_MASK;
-		} else {
-			key = RGB16_TO_COLORKEY(key);
-			flags |= CLK_RGB16_MASK;
-		}
+	case DRM_FORMAT_XRGB1555:
+		key = RGB15_TO_COLORKEY(key);
+		flags |= CLK_RGB15_MASK;
 		break;
-
-	case 24:
-	case 32:
+	case DRM_FORMAT_RGB565:
+		key = RGB16_TO_COLORKEY(key);
+		flags |= CLK_RGB16_MASK;
+		break;
+	default:
 		flags |= CLK_RGB24_MASK;
 		break;
 	}

Comments

Chris Wilson Dec. 8, 2016, 8:50 a.m. 
On Wed, Dec 07, 2016 at 07:28:11PM +0200, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Extract the primary plane pixel format via plane state when setting up
> the overlay colorkey.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Minor stylistic differences aside (I would rearrange the code a bit more
to try and avoid having to initialise the locals, with the claim that it
keeps the code deciding upon the value together),
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris