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

Unverified Commit c89e1d27 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/atmel-exynos: Use the alpha format field in drm_format_info 



Now that the drm_format_info has a alpha field to tell if a format embeds
an alpha component in it, let's use it.

Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: default avatarInki Dae <inki.dae@samsung.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/cb1bdfbb481419a17cc4f6c8a1f07930136ac13f.1516617243.git-series.maxime.ripard@free-electrons.com
parent e2e287fa

drivers/gpu/drm/exynos/exynos_mixer.c

+1 −13
Original line number Diff line number Diff line
@@ -179,18 +179,6 @@ static const u8 filter_cr_horiz_tap4[] = { 
	70,	59,	48,	37,	27,	19,	11,	5,

};



static inline bool is_alpha_format(unsigned int pixel_format)

{

	switch (pixel_format) {

	case DRM_FORMAT_ARGB8888:

	case DRM_FORMAT_ARGB1555:

	case DRM_FORMAT_ARGB4444:

		return true;

	default:

		return false;

	}

}



static inline u32 vp_reg_read(struct mixer_context *ctx, u32 reg_id)

{

	return readl(ctx->vp_regs + reg_id);
@@ -625,7 +613,7 @@ static void mixer_graph_buffer(struct mixer_context *ctx, 
	mixer_reg_write(ctx, MXR_GRAPHIC_BASE(win), dma_addr);



	mixer_cfg_layer(ctx, win, priority, true);

	mixer_cfg_gfx_blend(ctx, win, is_alpha_format(fb->format->format));

	mixer_cfg_gfx_blend(ctx, win, fb->format->has_alpha);



	/* layer update mandatory for mixer 16.0.33.0 */

	if (ctx->mxr_ver == MXR_VER_16_0_33_0 ||