Skip to content
Snippets Groups Projects
Commit 61b3b52b authored by Gianfranco Mariotti's avatar Gianfranco Mariotti
Browse files

[C26][ENV] update video overlay options

* add DP overlay option for CFG=A1
* add DP fw load on overlay option for CFG=A2
* add LVDS ChB 800x480 overlay option
* update multi-video overlay handling: instead of a single unified overlay
  for every multi-video option use multiple intercompatible video overlay
  to be used in several combinations
parent 0df57883
No related branches found
No related tags found
No related merge requests found
......@@ -109,7 +109,7 @@ video_mode_t video_mode_list_cfg_a1 [] = {
.has_fw = 0,
},
{
/* LVDS DUAL*/
/* LVDS DUAL */
.label = SECO_VIDEO_LABEL_LVDSx2,
.video = {
{ VIDEO_USED, VIDEO_LVDSx2, NO_VIDEO_ARGS },
......@@ -120,16 +120,45 @@ video_mode_t video_mode_list_cfg_a1 [] = {
.has_fw = 0,
},
{
/* LVDS 1024x768*/
.label = SECO_VIDEO_LABEL_LVDS_1024x768,
/* LVDS ChA 1024x768 */
.label = "LVDS ChA 1024x768",
.video = {
{ VIDEO_USED, VIDEO_LVDS_1024x768, NO_VIDEO_ARGS },
{ VIDEO_USED, VIDEO_LVDS, NO_VIDEO_ARGS },
},
.panel_name = "none",
.dtbo_conf_file = STR(ENV_DTBO_C26_LVDS_1024x768),
.use_bootargs = 0,
.has_fw = 0,
},
{
/* LVDS ChB 800x480 */
.label = "LVDS ChB 800x480",
.video = {
{ VIDEO_USED, VIDEO_LVDS, NO_VIDEO_ARGS },
},
.panel_name = "none",
.dtbo_conf_file = STR(ENV_DTBO_C26_LVDS_SINGLE),
.use_bootargs = 0,
.has_fw = 0,
},
{
/* DP */
.label = SECO_VIDEO_LABEL_DP,
.video = {
{ VIDEO_USED, VIDEO_DP, NO_VIDEO_ARGS },
},
.panel_name = "none",
.dtbo_conf_file = STR(ENV_DTBO_C26_DP),
.use_bootargs = 0,
.has_fw = 1,
.fw = {
[0] = {
.file_name = ENV_FW_DP_FILE,
.address = ENV_FW_HDP_ADDRESS,
.cmd_load_fw = ENV_FW_HDP_CMD_LOAD,
},
},
},
{
/* HDMI */
.label = SECO_VIDEO_LABEL_HDMI,
......@@ -149,13 +178,13 @@ video_mode_t video_mode_list_cfg_a1 [] = {
},
},
{
/* HDMI + LVDS*/
.label = SECO_VIDEO_LABEL_HDMI_LVDS,
/* HDMI + LVDS DUAL */
.label = "HDMI + LVDS dual channel",
.video = {
{ VIDEO_USED, VIDEO_HDMI_LVDS, NO_VIDEO_ARGS },
},
.panel_name = "none",
.dtbo_conf_file = STR(ENV_DTBO_C26_HDMI_LVDS_DUAL),
.dtbo_conf_file = "seco-imx8qm-c26-hdmi.dtbo seco-imx8qm-c26-lvds-dual.dtbo",
.use_bootargs = 0,
.has_fw = 1,
.fw = {
......@@ -186,8 +215,8 @@ video_mode_t video_mode_list_cfg_a2 [] = {
.has_fw = 0,
},
{
/* LVDS */
.label = SECO_VIDEO_LABEL_LVDSx1,
/* LVDS ChB 800x480 */
.label = "LVDS ChB 800x480",
.video = {
{ VIDEO_USED, VIDEO_LVDS, NO_VIDEO_ARGS },
},
......@@ -197,7 +226,7 @@ video_mode_t video_mode_list_cfg_a2 [] = {
.has_fw = 0,
},
{
/* DSI-to-eDP */
/* eDP */
.label = SECO_VIDEO_LABEL_EDP,
.video = {
{ VIDEO_USED, VIDEO_EDP, NO_VIDEO_ARGS },
......@@ -205,7 +234,14 @@ video_mode_t video_mode_list_cfg_a2 [] = {
.panel_name = "none",
.dtbo_conf_file = STR(ENV_DTBO_C26_DP),
.use_bootargs = 0,
.has_fw = 0,
.has_fw = 1,
.fw = {
[0] = {
.file_name = ENV_FW_DP_FILE,
.address = ENV_FW_HDP_ADDRESS,
.cmd_load_fw = ENV_FW_HDP_CMD_LOAD,
},
},
},
};
......
......@@ -5,10 +5,8 @@
#define ENV_DTBO_C26_DP seco-imx8qm-c26-dp.dtbo
#define ENV_DTBO_C26_LVDS_SINGLE seco-imx8qm-c26-lvds-single.dtbo
#define ENV_DTBO_C26_LVDS_DUAL seco-imx8qm-c26-lvds-dual.dtbo
#define ENV_DTBO_C26_HDMI_LVDS_DUAL seco-imx8qm-c26-hdmi-lvds.dtbo
#define ENV_DTBO_C26_DP_LVDS_SINGLE seco-imx8qm-c26-dp-lvds.dtbo
#define ENV_DTBO_C26_OV5640_CS0 seco-imx8qm-c26-ov5640-csi0.dtbo
#define ENV_DTBO_C26_OV5640_CS1 seco-imx8qm-c26-ov5640-csi1.dtbo
#define ENV_DTBO_C26_OV5640_CSI0 seco-imx8qm-c26-ov5640-csi0.dtbo
#define ENV_DTBO_C26_OV5640_CSI1 seco-imx8qm-c26-ov5640-csi1.dtbo
#define ENV_DTBO_C26_HDMIIN seco-imx8qm-c26-hdmiin.dtbo
#define ENV_DTBO_C26_LVDS_1024x768 seco-imx8qm-c26-lvds-1024x768.dtbo
......
......@@ -121,7 +121,7 @@ typedef enum {
VIDEO_HDMI,
VIDEO_LVDS,
VIDEO_LVDSx2,
VIDEO_LVDS_1024x768,
VIDEO_DP,
VIDEO_HDMI_LVDS,
VIDEO_EDP,
VIDEO_LVDS_EDP,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment