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

Commit 5b1f8367 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Maxime Ripard
Browse files

drm/sun4i: Add scaler configuration to DE2 mixers 



No all SoCs support scaling on all channels. For example, V3s support
scaling only on VI channels. Because of that, add additional
configuration bitmask which tells which channel support scaler.

Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171201060550.10392-21-jernej.skrabec@siol.net
parent 7480ba4d

drivers/gpu/drm/sun4i/sun8i_mixer.c

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static int sun8i_mixer_remove(struct platform_device *pdev) 
static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {

	.vi_num = 2,

	.ui_num = 1,

	.scaler_mask = 0x3,

};



static const struct of_device_id sun8i_mixer_of_table[] = {

drivers/gpu/drm/sun4i/sun8i_mixer.h

+10 −0
Original line number Diff line number Diff line
@@ -94,9 +94,19 @@ struct de2_fmt_info { 
	u32 de2_fmt;

};



/**

 * struct sun8i_mixer_cfg - mixer HW configuration

 * @vi_num: number of VI channels

 * @ui_num: number of UI channels

 * @scaler_mask: bitmask which tells which channel supports scaling

 *	First, scaler supports for VI channels is defined and after that, scaler

 *	support for UI channels. For example, if mixer has 2 VI channels without

 *	scaler and 2 UI channels with scaler, bitmask would be 0xC.

 */

struct sun8i_mixer_cfg {

	int		vi_num;

	int		ui_num;

	int		scaler_mask;

};



struct sun8i_mixer {