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

Commit b85a5e3c authored by abeykun's avatar abeykun Committed by Narendra Muppalla
Browse files

drm/msm/sde: add const alpha support for msmskunk 



Add foreground and background blend layer constant alpha
programming sequence for msmskunk. Assign correct function to
the mixer HW interface based on HW revision.

Change-Id: I5af26fa56d6434adbea438ad31a1759d43b10b6d
Signed-off-by: default avatarabeykun <abeykun@codeaurora.org>
parent 83b6cbe1

drivers/gpu/drm/msm/sde/sde_hw_catalog.h

+5 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -26,7 +26,7 @@ 
		(STEP & 0xFFFF))



#define SDE_HW_MAJOR(rev)		((rev) >> 28)

#define SDE_HW_MINOR(rev)		.(((rev) >> 16) & 0xFFF)

#define SDE_HW_MINOR(rev)		(((rev) >> 16) & 0xFFF)

#define SDE_HW_STEP(rev)		((rev) & 0xFFFF)

#define SDE_HW_MAJOR_MINOR(rev)		((rev) >> 16)
@@ -37,6 +37,9 @@ 
#define SDE_HW_VER_171	SDE_HW_VER(1, 7, 1) /* 8996 v2.0 */

#define SDE_HW_VER_172	SDE_HW_VER(1, 7, 2) /* 8996 v3.0 */

#define SDE_HW_VER_300	SDE_HW_VER(3, 0, 0) /* 8998 v1.0 */

#define SDE_HW_VER_400	SDE_HW_VER(4, 0, 0) /* msmskunk v1.0 */



#define IS_MSMSKUNK_TARGET(rev) IS_SDE_MAJOR_MINOR_SAME((rev), SDE_HW_VER_400)



#define MAX_IMG_WIDTH 0x3fff

#define MAX_IMG_HEIGHT 0x3fff

drivers/gpu/drm/msm/sde/sde_hw_lm.c

+28 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -22,6 +22,7 @@ 


/* These register are offset to mixer base + stage base */

#define LM_BLEND0_OP                     0x00

#define LM_BLEND0_CONST_ALPHA            0x04

#define LM_BLEND0_FG_ALPHA               0x04

#define LM_BLEND0_BG_ALPHA               0x08
@@ -99,6 +100,25 @@ static void sde_hw_lm_setup_border_color(struct sde_hw_mixer *ctx, 
	}

}



static void sde_hw_lm_setup_blend_config_msmskunk(struct sde_hw_mixer *ctx,

	u32 stage, u32 fg_alpha, u32 bg_alpha, u32 blend_op)

{

	struct sde_hw_blk_reg_map *c = &ctx->hw;

	int stage_off;

	u32 const_alpha;



	if (stage == SDE_STAGE_BASE)

		return;



	stage_off = _stage_offset(ctx, stage);

	if (WARN_ON(stage_off < 0))

		return;



	const_alpha = (bg_alpha & 0xFF) | ((fg_alpha & 0xFF) << 16);

	SDE_REG_WRITE(c, LM_BLEND0_CONST_ALPHA + stage_off, const_alpha);

	SDE_REG_WRITE(c, LM_BLEND0_OP + stage_off, blend_op);

}



static void sde_hw_lm_setup_blend_config(struct sde_hw_mixer *ctx,

	u32 stage, u32 fg_alpha, u32 bg_alpha, u32 blend_op)

{
@@ -136,10 +156,14 @@ static void sde_hw_lm_gammacorrection(struct sde_hw_mixer *mixer, 
{

}



static void _setup_mixer_ops(struct sde_hw_lm_ops *ops,

static void _setup_mixer_ops(struct sde_mdss_cfg *m,

		struct sde_hw_lm_ops *ops,

		unsigned long cap)

{

	ops->setup_mixer_out = sde_hw_lm_setup_out;

	if (IS_MSMSKUNK_TARGET(m->hwversion))

		ops->setup_blend_config = sde_hw_lm_setup_blend_config_msmskunk;

	else

		ops->setup_blend_config = sde_hw_lm_setup_blend_config;

	ops->setup_alpha_out = sde_hw_lm_setup_color3;

	ops->setup_border_color = sde_hw_lm_setup_border_color;
@@ -166,7 +190,7 @@ struct sde_hw_mixer *sde_hw_lm_init(enum sde_lm idx, 
	/* Assign ops */

	c->idx = idx;

	c->cap = cfg;

	_setup_mixer_ops(&c->ops, c->cap->features);

	_setup_mixer_ops(m, &c->ops, c->cap->features);



	/*

	 * Perform any default initialization for the sspp blocks