Commit 11354dd5 authored by Archit Taneja's avatar Archit Taneja Committed by Tomi Valkeinen
Browse files

OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting 



On OMAP3, in order to enable alpha blending for LCD and TV managers, we needed
to set LCDALPHABLENDERENABLE/TVALPHABLENDERENABLE bits in DISPC_CONFIG. On
OMAP4, alpha blending is always enabled by default, if the above bits are set,
we switch to an OMAP3 compatibility mode where the zorder values in the pipeline
attribute registers are ignored and a fixed priority is configured.

Rename the manager_info member "alpha_enabled" to "partial_alpha_enabled" for
more clarity. Introduce two dss_features FEAT_ALPHA_FIXED_ZORDER and
FEAT_ALPHA_FREE_ZORDER which represent OMAP3-alpha compatibility mode and OMAP4
alpha mode respectively. Introduce an overlay cap for ZORDER. The DSS2 user is
expected to check for the ZORDER cap, if an overlay doesn't have this cap, the
user is expected to set the parameter partial_alpha_enabled. If the overlay has
ZORDER cap, the DSS2 user can assume that alpha blending is already enabled.

Don't support OMAP3 compatibility mode for now. Trying to read/write to
alpha_blending_enabled sysfs attribute issues a warning for OMAP4 and does not
set the LCDALPHABLENDERENABLE/TVALPHABLENDERENABLE bits.

Change alpha_enabled to partial_alpha_enabled in the omap_vout driver. Use
overlay cap "OMAP_DSS_OVL_CAP_GLOBAL_ALPHA" to check if overlay supports alpha
blending or not. Replace this with checks for VIDEO1 pipeline.

Cc: linux-media@vger.kernel.org
Cc: Lajos Molnar <molnar@ti.com>
Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Acked-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 28748782

drivers/media/video/omap/omap_vout.c

+12 −5
Original line number Diff line number Diff line
@@ -1164,12 +1164,17 @@ static int vidioc_try_fmt_vid_overlay(struct file *file, void *fh, 
{

	int ret = 0;

	struct omap_vout_device *vout = fh;

	struct omap_overlay *ovl;

	struct omapvideo_info *ovid;

	struct v4l2_window *win = &f->fmt.win;



	ovid = &vout->vid_info;

	ovl = ovid->overlays[0];



	ret = omap_vout_try_window(&vout->fbuf, win);



	if (!ret) {

		if (vout->vid == OMAP_VIDEO1)

		if ((ovl->caps & OMAP_DSS_OVL_CAP_GLOBAL_ALPHA) == 0)

			win->global_alpha = 255;

		else

			win->global_alpha = f->fmt.win.global_alpha;
@@ -1193,8 +1198,8 @@ static int vidioc_s_fmt_vid_overlay(struct file *file, void *fh, 


	ret = omap_vout_new_window(&vout->crop, &vout->win, &vout->fbuf, win);

	if (!ret) {

		/* Video1 plane does not support global alpha */

		if (ovl->id == OMAP_DSS_VIDEO1)

		/* Video1 plane does not support global alpha on OMAP3 */

		if ((ovl->caps & OMAP_DSS_OVL_CAP_GLOBAL_ALPHA) == 0)

			vout->win.global_alpha = 255;

		else

			vout->win.global_alpha = f->fmt.win.global_alpha;
@@ -1787,7 +1792,9 @@ static int vidioc_s_fbuf(struct file *file, void *fh, 
	if (ovl->manager && ovl->manager->get_manager_info &&

			ovl->manager->set_manager_info) {

		ovl->manager->get_manager_info(ovl->manager, &info);

		info.alpha_enabled = enable;

		/* enable this only if there is no zorder cap */

		if ((ovl->caps & OMAP_DSS_OVL_CAP_ZORDER) == 0)

			info.partial_alpha_enabled = enable;

		if (ovl->manager->set_manager_info(ovl->manager, &info))

			return -EINVAL;

	}
@@ -1819,7 +1826,7 @@ static int vidioc_g_fbuf(struct file *file, void *fh, 
	}

	if (ovl->manager && ovl->manager->get_manager_info) {

		ovl->manager->get_manager_info(ovl->manager, &info);

		if (info.alpha_enabled)

		if (info.partial_alpha_enabled)

			a->flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA;

	}

drivers/video/omap2/dss/dispc.c

+12 −12
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ static void dispc_save_context(void) 
	SR(CONTROL);

	SR(CONFIG);

	SR(LINE_NUMBER);

	if (dss_has_feature(FEAT_GLOBAL_ALPHA))

	if (dss_has_feature(FEAT_ALPHA_FIXED_ZORDER) ||

			dss_has_feature(FEAT_ALPHA_FREE_ZORDER))

		SR(GLOBAL_ALPHA);

	if (dss_has_feature(FEAT_MGR_LCD2)) {

		SR(CONTROL2);
@@ -293,7 +294,8 @@ static void dispc_restore_context(void) 
	/*RR(CONTROL);*/

	RR(CONFIG);

	RR(LINE_NUMBER);

	if (dss_has_feature(FEAT_GLOBAL_ALPHA))

	if (dss_has_feature(FEAT_ALPHA_FIXED_ZORDER) ||

			dss_has_feature(FEAT_ALPHA_FREE_ZORDER))

		RR(GLOBAL_ALPHA);

	if (dss_has_feature(FEAT_MGR_LCD2))

		RR(CONFIG2);
@@ -2159,38 +2161,35 @@ void dispc_mgr_enable_trans_key(enum omap_channel ch, bool enable) 
	else /* OMAP_DSS_CHANNEL_LCD2 */

		REG_FLD_MOD(DISPC_CONFIG2, enable, 10, 10);

}

void dispc_mgr_enable_alpha_blending(enum omap_channel ch, bool enable)



void dispc_mgr_enable_alpha_fixed_zorder(enum omap_channel ch, bool enable)

{

	if (!dss_has_feature(FEAT_GLOBAL_ALPHA))

	if (!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER))

		return;



	if (ch == OMAP_DSS_CHANNEL_LCD)

		REG_FLD_MOD(DISPC_CONFIG, enable, 18, 18);

	else if (ch == OMAP_DSS_CHANNEL_DIGIT)

		REG_FLD_MOD(DISPC_CONFIG, enable, 19, 19);

	else /* OMAP_DSS_CHANNEL_LCD2 */

		REG_FLD_MOD(DISPC_CONFIG2, enable, 18, 18);

}

bool dispc_mgr_alpha_blending_enabled(enum omap_channel ch)



bool dispc_mgr_alpha_fixed_zorder_enabled(enum omap_channel ch)

{

	bool enabled;



	if (!dss_has_feature(FEAT_GLOBAL_ALPHA))

	if (!dss_has_feature(FEAT_ALPHA_FIXED_ZORDER))

		return false;



	if (ch == OMAP_DSS_CHANNEL_LCD)

		enabled = REG_GET(DISPC_CONFIG, 18, 18);

	else if (ch == OMAP_DSS_CHANNEL_DIGIT)

		enabled = REG_GET(DISPC_CONFIG, 19, 19);

	else if (ch == OMAP_DSS_CHANNEL_LCD2)

		enabled = REG_GET(DISPC_CONFIG2, 18, 18);

	else

		BUG();



	return enabled;

}





bool dispc_mgr_trans_key_enabled(enum omap_channel ch)

{

	bool enabled;
@@ -2603,7 +2602,8 @@ void dispc_dump_regs(struct seq_file *s) 
	DUMPREG(DISPC_CAPABLE);

	DUMPREG(DISPC_LINE_STATUS);

	DUMPREG(DISPC_LINE_NUMBER);

	if (dss_has_feature(FEAT_GLOBAL_ALPHA))

	if (dss_has_feature(FEAT_ALPHA_FIXED_ZORDER) ||

			dss_has_feature(FEAT_ALPHA_FREE_ZORDER))

		DUMPREG(DISPC_GLOBAL_ALPHA);

	if (dss_has_feature(FEAT_MGR_LCD2)) {

		DUMPREG(DISPC_CONTROL2);

drivers/video/omap2/dss/dss.h

+2 −2
Original line number Diff line number Diff line
@@ -430,9 +430,9 @@ void dispc_mgr_get_trans_key(enum omap_channel ch, 
		enum omap_dss_trans_key_type *type,

		u32 *trans_key);

void dispc_mgr_enable_trans_key(enum omap_channel ch, bool enable);

void dispc_mgr_enable_alpha_blending(enum omap_channel ch, bool enable);

void dispc_mgr_enable_alpha_fixed_zorder(enum omap_channel ch, bool enable);

bool dispc_mgr_trans_key_enabled(enum omap_channel ch);

bool dispc_mgr_alpha_blending_enabled(enum omap_channel ch);

bool dispc_mgr_alpha_fixed_zorder_enabled(enum omap_channel ch);

void dispc_mgr_set_lcd_timings(enum omap_channel channel,

		struct omap_video_timings *timings);

void dispc_mgr_set_pol_freq(enum omap_channel channel,

drivers/video/omap2/dss/dss_features.c

+11 −11
Original line number Diff line number Diff line
@@ -248,15 +248,16 @@ static const enum omap_overlay_caps omap3630_dss_overlay_caps[] = { 


static const enum omap_overlay_caps omap4_dss_overlay_caps[] = {

	/* OMAP_DSS_GFX */

	OMAP_DSS_OVL_CAP_GLOBAL_ALPHA | OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA,

	OMAP_DSS_OVL_CAP_GLOBAL_ALPHA | OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA |

		OMAP_DSS_OVL_CAP_ZORDER,



	/* OMAP_DSS_VIDEO1 */

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA |

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA,

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA | OMAP_DSS_OVL_CAP_ZORDER,



	/* OMAP_DSS_VIDEO2 */

	OMAP_DSS_OVL_CAP_SCALE | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA |

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA,

		OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA | OMAP_DSS_OVL_CAP_ZORDER,

};



static const char * const omap2_dss_clk_source_names[] = {
@@ -342,13 +343,13 @@ static const struct omap_dss_features omap3430_dss_features = { 
	.num_reg_fields = ARRAY_SIZE(omap3_dss_reg_fields),



	.has_feature	=

		FEAT_GLOBAL_ALPHA | FEAT_LCDENABLEPOL |

		FEAT_LCDENABLEPOL |

		FEAT_LCDENABLESIGNAL | FEAT_PCKFREEENABLE |

		FEAT_FUNCGATED | FEAT_ROWREPEATENABLE |

		FEAT_LINEBUFFERSPLIT | FEAT_RESIZECONF |

		FEAT_DSI_PLL_FREQSEL | FEAT_DSI_REVERSE_TXCLKESC |

		FEAT_VENC_REQUIRES_TV_DAC_CLK | FEAT_CPR | FEAT_PRELOAD |

		FEAT_FIR_COEF_V,

		FEAT_FIR_COEF_V | FEAT_ALPHA_FIXED_ZORDER,



	.num_mgrs = 2,

	.num_ovls = 3,
@@ -366,13 +367,13 @@ static const struct omap_dss_features omap3630_dss_features = { 
	.num_reg_fields = ARRAY_SIZE(omap3_dss_reg_fields),



	.has_feature    =

		FEAT_GLOBAL_ALPHA | FEAT_LCDENABLEPOL |

		FEAT_LCDENABLEPOL |

		FEAT_LCDENABLESIGNAL | FEAT_PCKFREEENABLE |

		FEAT_FUNCGATED |

		FEAT_ROWREPEATENABLE | FEAT_LINEBUFFERSPLIT |

		FEAT_RESIZECONF | FEAT_DSI_PLL_PWR_BUG |

		FEAT_DSI_PLL_FREQSEL | FEAT_CPR | FEAT_PRELOAD |

		FEAT_FIR_COEF_V,

		FEAT_FIR_COEF_V | FEAT_ALPHA_FIXED_ZORDER,



	.num_mgrs = 2,

	.num_ovls = 3,
@@ -392,12 +393,12 @@ static const struct omap_dss_features omap4430_es1_0_dss_features = { 
	.num_reg_fields = ARRAY_SIZE(omap4_dss_reg_fields),



	.has_feature	=

		FEAT_GLOBAL_ALPHA |

		FEAT_MGR_LCD2 |

		FEAT_CORE_CLK_DIV | FEAT_LCD_CLK_SRC |

		FEAT_DSI_DCS_CMD_CONFIG_VC | FEAT_DSI_VC_OCP_WIDTH |

		FEAT_DSI_GNQ | FEAT_HANDLE_UV_SEPARATE | FEAT_ATTR2 |

		FEAT_CPR | FEAT_PRELOAD | FEAT_FIR_COEF_V,

		FEAT_CPR | FEAT_PRELOAD | FEAT_FIR_COEF_V |

		FEAT_ALPHA_FREE_ZORDER,



	.num_mgrs = 3,

	.num_ovls = 3,
@@ -416,13 +417,12 @@ static const struct omap_dss_features omap4_dss_features = { 
	.num_reg_fields = ARRAY_SIZE(omap4_dss_reg_fields),



	.has_feature	=

		FEAT_GLOBAL_ALPHA |

		FEAT_MGR_LCD2 |

		FEAT_CORE_CLK_DIV | FEAT_LCD_CLK_SRC |

		FEAT_DSI_DCS_CMD_CONFIG_VC | FEAT_DSI_VC_OCP_WIDTH |

		FEAT_DSI_GNQ | FEAT_HDMI_CTS_SWMODE |

		FEAT_HANDLE_UV_SEPARATE | FEAT_ATTR2 | FEAT_CPR |

		FEAT_PRELOAD | FEAT_FIR_COEF_V,

		FEAT_PRELOAD | FEAT_FIR_COEF_V | FEAT_ALPHA_FREE_ZORDER,



	.num_mgrs = 3,

	.num_ovls = 3,

drivers/video/omap2/dss/dss_features.h

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


/* DSS has feature id */

enum dss_feat_id {

	FEAT_GLOBAL_ALPHA		= 1 << 0,

	FEAT_LCDENABLEPOL		= 1 << 3,

	FEAT_LCDENABLESIGNAL		= 1 << 4,

	FEAT_PCKFREEENABLE		= 1 << 5,
@@ -57,6 +56,8 @@ enum dss_feat_id { 
	FEAT_CPR			= 1 << 23,

	FEAT_PRELOAD			= 1 << 24,

	FEAT_FIR_COEF_V			= 1 << 25,

	FEAT_ALPHA_FIXED_ZORDER		= 1 << 26,

	FEAT_ALPHA_FREE_ZORDER		= 1 << 27,

};



/* DSS register field id */

CRA Git | Maintained and supported by SUSTech CRA and CCSE