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

Commit 1967b34d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Add local 'fb' variables 



Add a local 'fb' variable to a few places to get rid of the
'crtc->primary->fb' stuff. Looks neater and helps me with my poor
coccinelle skills later.

While at it switch over to using the pixel format rather than
depth+bpp.

Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479498793-31021-2-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a1f761a5

drivers/gpu/drm/i915/intel_overlay.c

+12 −14
Original line number Diff line number Diff line
@@ -658,6 +658,8 @@ static bool update_scaling_factors(struct intel_overlay *overlay, 
static void update_colorkey(struct intel_overlay *overlay,

			    struct overlay_registers __iomem *regs)

{

	const struct drm_framebuffer *fb =

		overlay->crtc->base.primary->fb;

	u32 key = overlay->color_key;

	u32 flags;
@@ -665,24 +667,20 @@ static void update_colorkey(struct intel_overlay *overlay, 
	if (overlay->color_key_enabled)

		flags |= DST_KEY_ENABLE;



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

	case 8:

	switch (fb->pixel_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;

	}