Add code to support dvo for mt8196.
Signed-off-by: Bincai Liu <bincai.liu@mediatek.com>
---
drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 5 +-
drivers/gpu/drm/mediatek/mtk_ddp_comp.h | 1 +
drivers/gpu/drm/mediatek/mtk_dpi.c | 240 ++++++++++++++++++++----
drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 66 +++++++
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +-
drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 +
6 files changed, 284 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
index edc6417639e6..7fbb9509fb0e 100644
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c
@@ -445,6 +445,7 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = {
[MTK_DP_INTF] = "dp-intf",
[MTK_DPI] = "dpi",
[MTK_DSI] = "dsi",
+ [MTK_DVO] = "dvo",
};
struct mtk_ddp_comp_match {
@@ -472,6 +473,7 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX]
[DDP_COMPONENT_DSI1] = { MTK_DSI, 1, &ddp_dsi },
[DDP_COMPONENT_DSI2] = { MTK_DSI, 2, &ddp_dsi },
[DDP_COMPONENT_DSI3] = { MTK_DSI, 3, &ddp_dsi },
+ [DDP_COMPONENT_DVO0] = { MTK_DVO, 0, &ddp_dpi },
[DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, &ddp_gamma },
[DDP_COMPONENT_MERGE0] = { MTK_DISP_MERGE, 0, &ddp_merge },
[DDP_COMPONENT_MERGE1] = { MTK_DISP_MERGE, 1, &ddp_merge },
@@ -662,7 +664,8 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
type == MTK_DISP_RDMA ||
type == MTK_DPI ||
type == MTK_DP_INTF ||
- type == MTK_DSI)
+ type == MTK_DSI ||
+ type == MTK_DVO)
return 0;
priv = devm_kzalloc(comp->dev, sizeof(*priv), GFP_KERNEL);
diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
index 39720b27f4e9..daa98a594acb 100644
--- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
+++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h
@@ -43,6 +43,7 @@ enum mtk_ddp_comp_type {
MTK_DPI,
MTK_DP_INTF,
MTK_DSI,
+ MTK_DVO,
MTK_DDP_COMP_TYPE_MAX,
};
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 0f3b1ef8e497..98d385905a0e 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -62,6 +62,29 @@ enum mtk_dpi_out_color_format {
MTK_DPI_COLOR_FORMAT_YCBCR_422
};
+enum mtk_dpi_golden_setting_level {
+ MTK_DPI_FHD_60FPS_1920 = 0,
+ MTK_DPI_FHD_60FPS_2180,
+ MTK_DPI_FHD_60FPS_2400,
+ MTK_DPI_FHD_60FPS_2520,
+ MTK_DPI_FHD_90FPS,
+ MTK_DPI_FHD_120FPS,
+ MTK_DPI_WQHD_60FPS,
+ MTK_DPI_WQHD_120FPS,
+ MTK_DPI_8K_30FPS,
+ MTK_DPI_GSL_MAX,
+};
+
+enum mtk_dpi_type {
+ MTK_DISP_DPI = 0,
+ MTK_DSIP_DVO,
+};
+
+struct mtk_dpi_gs_info {
+ u32 dpi_buf_sodi_high;
+ u32 dpi_buf_sodi_low;
+};
+
struct mtk_dpi {
struct drm_encoder encoder;
struct drm_bridge bridge;
@@ -73,6 +96,7 @@ struct mtk_dpi {
struct clk *engine_clk;
struct clk *pixel_clk;
struct clk *tvd_clk;
+ struct clk *hf_fdpi_clk;
int irq;
struct drm_display_mode mode;
const struct mtk_dpi_conf *conf;
@@ -85,6 +109,7 @@ struct mtk_dpi {
struct pinctrl_state *pins_dpi;
u32 output_fmt;
int refcount;
+ enum mtk_dpi_golden_setting_level gs_level;
};
static inline struct mtk_dpi *bridge_to_dpi(struct drm_bridge *b)
@@ -171,6 +196,13 @@ struct mtk_dpi_conf {
bool edge_cfg_in_mmsys;
bool clocked_by_hdmi;
bool output_1pixel;
+ u32 out_np_sel;
+ u8 dpi_ver;
+};
+
+static struct mtk_dpi_gs_info mtk_dpi_gs[MTK_DPI_GSL_MAX] = {
+ [MTK_DPI_FHD_60FPS_1920] = {6880, 511},
+ [MTK_DPI_8K_30FPS] = {5255, 3899},
};
static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask)
@@ -208,6 +240,86 @@ static void mtk_dpi_disable(struct mtk_dpi *dpi)
mtk_dpi_mask(dpi, DPI_EN, 0, EN);
}
+static void mtk_dpi_irq_enable(struct mtk_dpi *dpi)
+{
+ mtk_dpi_mask(dpi, DPI_INTEN, INT_VDE_END_EN, INT_VDE_END_EN);
+}
+
+static void mtk_dpi_info_queue_start(struct mtk_dpi *dpi)
+{
+ mtk_dpi_mask(dpi, DPI_TGEN_INFOQ_LATENCY, 0,
+ INFOQ_START_LATENCY_MASK | INFOQ_END_LATENCY_MASK);
+}
+
+static void mtk_dpi_buffer_ctrl(struct mtk_dpi *dpi)
+{
+ mtk_dpi_mask(dpi, DPI_BUF_CON0, DISP_BUF_EN, DISP_BUF_EN);
+ mtk_dpi_mask(dpi, DPI_BUF_CON0, FIFO_UNDERFLOW_DONE_BLOCK, FIFO_UNDERFLOW_DONE_BLOCK);
+}
+
+static void mtk_dpi_trailing_blank_setting(struct mtk_dpi *dpi)
+{
+ mtk_dpi_mask(dpi, DPI_TGEN_V_LAST_TRAILING_BLANK, 0x20, V_LAST_TRAILING_BLANK_MASK);
+ mtk_dpi_mask(dpi, DPI_TGEN_OUTPUT_DELAY_LINE, 0x20, EXT_TG_DLY_LINE_MASK);
+}
+
+static void mtk_dpi_get_gs_level(struct mtk_dpi *dpi)
+{
+ struct drm_display_mode *mode = &dpi->mode;
+ enum mtk_dpi_golden_setting_level *gsl = &dpi->gs_level;
+
+ if (mode->hdisplay == 1920 && mode->vdisplay == 1080)
+ *gsl = MTK_DPI_FHD_60FPS_1920;
+ else
+ *gsl = MTK_DPI_8K_30FPS;
+}
+
+static void mtk_dpi_golden_setting(struct mtk_dpi *dpi)
+{
+ struct mtk_dpi_gs_info *gs_info = NULL;
+
+ if (dpi->gs_level >= MTK_DPI_GSL_MAX) {
+ dev_info(dpi->dev, "%s invalid gs_level %d\n",
+ __func__, dpi->gs_level);
+ return;
+ }
+
+ gs_info = &mtk_dpi_gs[dpi->gs_level];
+
+ mtk_dpi_mask(dpi, DPI_BUF_SODI_HIGHT, gs_info->dpi_buf_sodi_high, GENMASK(31, 0));
+ mtk_dpi_mask(dpi, DPI_BUF_SODI_LOW, gs_info->dpi_buf_sodi_low, GENMASK(31, 0));
+}
+
+static void mtk_dpi_shadow_ctrl(struct mtk_dpi *dpi)
+{
+ mtk_dpi_mask(dpi, DPI_SHADOW_CTRL, 0, BYPASS_SHADOW);
+ mtk_dpi_mask(dpi, DPI_SHADOW_CTRL, FORCE_COMMIT, FORCE_COMMIT);
+}
+
+static void mtk_dpi_config_timing(struct mtk_dpi *dpi,
+ struct mtk_dpi_sync_param *hsync,
+ struct mtk_dpi_sync_param *vsync)
+{
+ mtk_dpi_mask(dpi, DPI_TGEN_H0,
+ hsync->sync_width << HSYNC,
+ dpi->conf->dimension_mask << HSYNC);
+ mtk_dpi_mask(dpi, DPI_TGEN_H0,
+ hsync->front_porch << DPI_HFP,
+ dpi->conf->dimension_mask << DPI_HFP);
+ mtk_dpi_mask(dpi, DPI_TGEN_H1,
+ (hsync->back_porch + hsync->sync_width) << HSYNC2ACT,
+ dpi->conf->dimension_mask << HSYNC2ACT);
+ mtk_dpi_mask(dpi, DPI_TGEN_V0,
+ vsync->sync_width << VSYNC,
+ dpi->conf->dimension_mask << VSYNC);
+ mtk_dpi_mask(dpi, DPI_TGEN_V0,
+ vsync->front_porch << VFP,
+ dpi->conf->dimension_mask << VFP);
+ mtk_dpi_mask(dpi, DPI_TGEN_V1,
+ (vsync->back_porch + vsync->sync_width) << VSYNC2ACT,
+ dpi->conf->dimension_mask << VSYNC2ACT);
+}
+
static void mtk_dpi_config_hsync(struct mtk_dpi *dpi,
struct mtk_dpi_sync_param *sync)
{
@@ -296,10 +408,27 @@ static void mtk_dpi_config_interface(struct mtk_dpi *dpi, bool inter)
static void mtk_dpi_config_fb_size(struct mtk_dpi *dpi, u32 width, u32 height)
{
- mtk_dpi_mask(dpi, DPI_SIZE, width << HSIZE,
- dpi->conf->hvsize_mask << HSIZE);
- mtk_dpi_mask(dpi, DPI_SIZE, height << VSIZE,
- dpi->conf->hvsize_mask << VSIZE);
+ if (dpi->conf->dpi_ver == MTK_DSIP_DVO) {
+ mtk_dpi_mask(dpi, DPI_SRC_SIZE, width << SRC_HSIZE,
+ dpi->conf->hvsize_mask << SRC_HSIZE);
+ mtk_dpi_mask(dpi, DPI_SRC_SIZE, height << SRC_VSIZE,
+ dpi->conf->hvsize_mask << SRC_VSIZE);
+
+ mtk_dpi_mask(dpi, DPI_PIC_SIZE, width << PIC_HSIZE,
+ dpi->conf->hvsize_mask << PIC_HSIZE);
+ mtk_dpi_mask(dpi, DPI_PIC_SIZE, height << PIC_VSIZE,
+ dpi->conf->hvsize_mask << PIC_VSIZE);
+
+ mtk_dpi_mask(dpi, DPI_TGEN_H1, (width / dpi->conf->pixels_per_iter) << HACT,
+ dpi->conf->hvsize_mask << HACT);
+ mtk_dpi_mask(dpi, DPI_TGEN_V1, height << VACT,
+ dpi->conf->hvsize_mask << VACT);
+ } else {
+ mtk_dpi_mask(dpi, DPI_SIZE, width << HSIZE,
+ dpi->conf->hvsize_mask << HSIZE);
+ mtk_dpi_mask(dpi, DPI_SIZE, height << VSIZE,
+ dpi->conf->hvsize_mask << VSIZE);
+ }
}
static void mtk_dpi_config_channel_limit(struct mtk_dpi *dpi)
@@ -501,6 +630,7 @@ static void mtk_dpi_power_off(struct mtk_dpi *dpi)
clk_disable_unprepare(dpi->pixel_clk);
clk_disable_unprepare(dpi->tvd_clk);
clk_disable_unprepare(dpi->engine_clk);
+ clk_disable_unprepare(dpi->hf_fdpi_clk);
}
static int mtk_dpi_power_on(struct mtk_dpi *dpi)
@@ -528,8 +658,16 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi)
goto err_pixel;
}
+ ret = clk_prepare_enable(dpi->hf_fdpi_clk);
+ if (ret) {
+ dev_err(dpi->dev, "Failed to enable hf_fdpi_clk clock: %d\n", ret);
+ goto err_hf_fdpi_clk;
+ }
+
return 0;
+err_hf_fdpi_clk:
+ clk_disable_unprepare(dpi->hf_fdpi_clk);
err_pixel:
clk_disable_unprepare(dpi->tvd_clk);
err_engine:
@@ -610,7 +748,6 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,
MTK_DPI_POLARITY_FALLING : MTK_DPI_POLARITY_RISING;
dpi_pol.vsync_pol = vm.flags & DISPLAY_FLAGS_VSYNC_HIGH ?
MTK_DPI_POLARITY_FALLING : MTK_DPI_POLARITY_RISING;
-
/*
* Depending on the IP version, we may output a different amount of
* pixels for each iteration: divide the clock by this number and
@@ -643,14 +780,18 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,
}
mtk_dpi_sw_reset(dpi, true);
mtk_dpi_config_pol(dpi, &dpi_pol);
+ if (dpi->conf->dpi_ver == MTK_DSIP_DVO) {
+ mtk_dpi_irq_enable(dpi);
+ mtk_dpi_config_timing(dpi, &hsync, &vsync_lodd);
+ } else {
+ mtk_dpi_config_hsync(dpi, &hsync);
+ mtk_dpi_config_vsync_lodd(dpi, &vsync_lodd);
+ mtk_dpi_config_vsync_rodd(dpi, &vsync_rodd);
+ mtk_dpi_config_vsync_leven(dpi, &vsync_leven);
+ mtk_dpi_config_vsync_reven(dpi, &vsync_reven);
+ mtk_dpi_config_3d(dpi, !!(mode->flags & DRM_MODE_FLAG_3D_MASK));
+ }
- mtk_dpi_config_hsync(dpi, &hsync);
- mtk_dpi_config_vsync_lodd(dpi, &vsync_lodd);
- mtk_dpi_config_vsync_rodd(dpi, &vsync_rodd);
- mtk_dpi_config_vsync_leven(dpi, &vsync_leven);
- mtk_dpi_config_vsync_reven(dpi, &vsync_reven);
-
- mtk_dpi_config_3d(dpi, !!(mode->flags & DRM_MODE_FLAG_3D_MASK));
mtk_dpi_config_interface(dpi, !!(vm.flags &
DISPLAY_FLAGS_INTERLACED));
if (vm.flags & DISPLAY_FLAGS_INTERLACED)
@@ -658,26 +799,41 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,
else
mtk_dpi_config_fb_size(dpi, vm.hactive, vm.vactive);
- mtk_dpi_config_channel_limit(dpi);
- mtk_dpi_config_bit_num(dpi, dpi->bit_num);
- mtk_dpi_config_channel_swap(dpi, dpi->channel_swap);
- mtk_dpi_config_color_format(dpi, dpi->color_format);
- if (dpi->conf->support_direct_pin) {
- mtk_dpi_config_yc_map(dpi, dpi->yc_map);
- mtk_dpi_config_2n_h_fre(dpi);
-
- /* DPI can connect to either an external bridge or the internal HDMI encoder */
- if (dpi->conf->output_1pixel)
- mtk_dpi_mask(dpi, DPI_CON, DPI_OUTPUT_1T1P_EN, DPI_OUTPUT_1T1P_EN);
- else
- mtk_dpi_dual_edge(dpi);
-
- mtk_dpi_config_disable_edge(dpi);
- }
- if (dpi->conf->input_2p_en_bit) {
- mtk_dpi_mask(dpi, DPI_CON, dpi->conf->input_2p_en_bit,
- dpi->conf->input_2p_en_bit);
+ if (dpi->conf->dpi_ver == MTK_DSIP_DVO) {
+ mtk_dpi_info_queue_start(dpi);
+ mtk_dpi_buffer_ctrl(dpi);
+ mtk_dpi_trailing_blank_setting(dpi);
+ mtk_dpi_get_gs_level(dpi);
+ mtk_dpi_golden_setting(dpi);
+ mtk_dpi_shadow_ctrl(dpi);
+ mtk_dpi_mask(dpi, DPI_OUTPUT_SET, dpi->conf->out_np_sel, OUT_NP_SEL);
+ } else {
+ mtk_dpi_config_channel_limit(dpi);
+ mtk_dpi_config_bit_num(dpi, dpi->bit_num);
+ mtk_dpi_config_channel_swap(dpi, dpi->channel_swap);
+ mtk_dpi_config_color_format(dpi, dpi->color_format);
+ if (dpi->conf->support_direct_pin) {
+ mtk_dpi_config_yc_map(dpi, dpi->yc_map);
+ mtk_dpi_config_2n_h_fre(dpi);
+
+ /*
+ * DPI can connect to either an external bridge
+ * or the internal HDMI encoder
+ */
+ if (dpi->conf->output_1pixel)
+ mtk_dpi_mask(dpi, DPI_CON,
+ DPI_OUTPUT_1T1P_EN, DPI_OUTPUT_1T1P_EN);
+ else
+ mtk_dpi_dual_edge(dpi);
+
+ mtk_dpi_config_disable_edge(dpi);
+ }
+ if (dpi->conf->input_2p_en_bit) {
+ mtk_dpi_mask(dpi, DPI_CON, dpi->conf->input_2p_en_bit,
+ dpi->conf->input_2p_en_bit);
+ }
}
+
mtk_dpi_sw_reset(dpi, false);
return 0;
@@ -700,7 +856,7 @@ static u32 *mtk_dpi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
}
output_fmts = kcalloc(dpi->conf->num_output_fmts, sizeof(*output_fmts),
- GFP_KERNEL);
+ GFP_KERNEL);
if (!output_fmts)
return NULL;
@@ -1173,6 +1329,20 @@ static const struct mtk_dpi_conf mt8195_dpintf_conf = {
.input_2p_en_bit = DPINTF_INPUT_2P_EN,
};
+static const struct mtk_dpi_conf mt8196_conf = {
+ .dpi_factor = dpi_factor_mt8195_dp_intf,
+ .num_dpi_factor = ARRAY_SIZE(dpi_factor_mt8195_dp_intf),
+ .out_np_sel = 0x2,
+ .reg_h_fre_con = 0xb0,
+ .max_clock_khz = 1330000,
+ .output_fmts = mt8195_output_fmts,
+ .num_output_fmts = ARRAY_SIZE(mt8195_output_fmts),
+ .pixels_per_iter = 4,
+ .dimension_mask = DPINTF_HPW_MASK,
+ .hvsize_mask = PIC_HSIZE_MASK,
+ .dpi_ver = MTK_DSIP_DVO,
+};
+
static int mtk_dpi_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -1227,6 +1397,11 @@ static int mtk_dpi_probe(struct platform_device *pdev)
return dev_err_probe(dev, PTR_ERR(dpi->tvd_clk),
"Failed to get tvdpll clock\n");
+ dpi->hf_fdpi_clk = devm_clk_get_optional(dev, "hf_fdvo_clk");
+ if (IS_ERR(dpi->hf_fdpi_clk))
+ return dev_err_probe(dev, PTR_ERR(dpi->hf_fdpi_clk),
+ "Failed to get hf_fdpi_clk clock\n");
+
dpi->irq = platform_get_irq(pdev, 0);
if (dpi->irq < 0)
return dpi->irq;
@@ -1262,6 +1437,7 @@ static const struct of_device_id mtk_dpi_of_ids[] = {
{ .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf },
{ .compatible = "mediatek,mt8195-dp-intf", .data = &mt8195_dpintf_conf },
{ .compatible = "mediatek,mt8195-dpi", .data = &mt8195_conf },
+ { .compatible = "mediatek,mt8196-edp-dvo", .data = &mt8196_conf },
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
index 23eeefce8fd2..3e2a64c2bca0 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
+++ b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
@@ -16,6 +16,7 @@
#define INT_VSYNC_EN BIT(0)
#define INT_VDE_EN BIT(1)
#define INT_UNDERFLOW_EN BIT(2)
+#define INT_VDE_END_EN BIT(4)
#define DPI_INTSTA 0x0C
#define INT_VSYNC_STA BIT(0)
@@ -240,6 +241,71 @@
#define MATRIX_SEL_RGB_TO_JPEG 0
#define MATRIX_SEL_RGB_TO_BT601 2
+#define DPI_TGEN_INFOQ_LATENCY 0x80
+#define INFOQ_START_LATENCY 0
+#define INFOQ_START_LATENCY_MASK (0xffff << 0)
+#define INFOQ_END_LATENCY 16
+#define INFOQ_END_LATENCY_MASK (0xffff << 16)
+
+#define DPI_BUF_CON0 0x220
+#define DISP_BUF_EN BIT(0)
+#define FIFO_UNDERFLOW_DONE_BLOCK BIT(4)
+
+#define DPI_TGEN_V_LAST_TRAILING_BLANK 0x6c
+#define V_LAST_TRAILING_BLANK 0
+#define V_LAST_TRAILING_BLANK_MASK (0xffff << 0)
+
+#define DPI_TGEN_OUTPUT_DELAY_LINE 0x7c
+#define EXT_TG_DLY_LINE 0
+#define EXT_TG_DLY_LINE_MASK (0xffff << 0)
+
+#define DPI_SHADOW_CTRL 0x190
+#define FORCE_COMMIT BIT(0)
+#define BYPASS_SHADOW BIT(1)
+#define READ_WRK_REG BIT(2)
+
+#define DPI_BUF_SODI_HIGHT 0x230
+#define DPI_BUF_SODI_LOW 0x234
+
+#define DPI_OUTPUT_SET 0x18
+#define OUT_NP_SEL (0x3 << 0)
+
+#define DPI_SRC_SIZE 0x20
+#define SRC_HSIZE 0
+#define SRC_HSIZE_MASK (0xffff << 0)
+#define SRC_VSIZE 16
+#define SRC_VSIZE_MASK (0xffff << 16)
+
+#define DPI_PIC_SIZE 0x24
+#define PIC_HSIZE 0
+#define PIC_HSIZE_MASK (0xffff << 0)
+#define PIC_VSIZE 16
+#define PIC_VSIZE_MASK (0xffff << 16)
+
+#define DPI_TGEN_H0 0x50
+#define DPI_HFP 0
+#define DPI_HFP_MASK (0xffff << 0)
+#define HSYNC 16
+#define HSYNC_MASK (0xffff << 16)
+
+#define DPI_TGEN_H1 0x54
+#define HSYNC2ACT 0
+#define HSYNC2ACT_MASK (0xffff << 0)
+#define HACT 16
+#define HACT_MASK (0xffff << 16)
+
+#define DPI_TGEN_V0 0x58
+#define VFP 0
+#define VFP_MASK (0xffff << 0)
+#define VSYNC 16
+#define VSYNC_MASK (0xffff << 16)
+
+#define DPI_TGEN_V1 0x5c
+#define VSYNC2ACT 0
+#define VSYNC2ACT_MASK (0xffff << 0)
+#define VACT 16
+#define VACT_MASK (0xffff << 16)
+
#define DPI_PATTERN0 0xf00
#define DPI_PAT_EN BIT(0)
#define DPI_PAT_SEL GENMASK(6, 4)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index 74158b9d6503..870d97c023ed 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -830,6 +830,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = {
.data = (void *)MTK_DSI },
{ .compatible = "mediatek,mt8188-dsi",
.data = (void *)MTK_DSI },
+ { .compatible = "mediatek,mt8196-edp-dvo",
+ .data = (void *)MTK_DVO },
{ }
};
@@ -1176,7 +1178,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
comp_type == MTK_DISP_RDMA ||
comp_type == MTK_DP_INTF ||
comp_type == MTK_DPI ||
- comp_type == MTK_DSI) {
+ comp_type == MTK_DSI ||
+ comp_type == MTK_DVO) {
dev_info(dev, "Adding component match for %pOF\n",
node);
drm_of_component_match_add(dev, &match, component_compare_of,
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
index 675cdc90a440..6d2796148813 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
@@ -79,6 +79,7 @@ extern struct platform_driver mtk_disp_ovl_driver;
extern struct platform_driver mtk_disp_rdma_driver;
extern struct platform_driver mtk_dpi_driver;
extern struct platform_driver mtk_dsi_driver;
+extern struct platform_driver mtk_dvo_driver;
extern struct platform_driver mtk_ethdr_driver;
extern struct platform_driver mtk_mdp_rdma_driver;
extern struct platform_driver mtk_padding_driver;
--
2.45.2On Fri, 2025-04-18 at 14:52 +0800, Bincai Liu wrote:
> Add code to support dvo for mt8196.
Say something about dvo.
I don't know what is dvo.
>
> Signed-off-by: Bincai Liu <bincai.liu@mediatek.com>
> ---
[snip]
>
> +enum mtk_dpi_golden_setting_level {
> + MTK_DPI_FHD_60FPS_1920 = 0,
> + MTK_DPI_FHD_60FPS_2180,
> + MTK_DPI_FHD_60FPS_2400,
> + MTK_DPI_FHD_60FPS_2520,
> + MTK_DPI_FHD_90FPS,
> + MTK_DPI_FHD_120FPS,
> + MTK_DPI_WQHD_60FPS,
> + MTK_DPI_WQHD_120FPS,
> + MTK_DPI_8K_30FPS,
> + MTK_DPI_GSL_MAX,
> +};
> +
> +enum mtk_dpi_type {
> + MTK_DISP_DPI = 0,
> + MTK_DSIP_DVO,
> +};
> +
> +struct mtk_dpi_gs_info {
> + u32 dpi_buf_sodi_high;
> + u32 dpi_buf_sodi_low;
> +};
> +
> struct mtk_dpi {
> struct drm_encoder encoder;
> struct drm_bridge bridge;
> @@ -73,6 +96,7 @@ struct mtk_dpi {
> struct clk *engine_clk;
> struct clk *pixel_clk;
> struct clk *tvd_clk;
> + struct clk *hf_fdpi_clk;
> int irq;
> struct drm_display_mode mode;
> const struct mtk_dpi_conf *conf;
> @@ -85,6 +109,7 @@ struct mtk_dpi {
> struct pinctrl_state *pins_dpi;
> u32 output_fmt;
> int refcount;
> + enum mtk_dpi_golden_setting_level gs_level;
Drop this.
> };
>
> static inline struct mtk_dpi *bridge_to_dpi(struct drm_bridge *b)
> @@ -171,6 +196,13 @@ struct mtk_dpi_conf {
> bool edge_cfg_in_mmsys;
> bool clocked_by_hdmi;
> bool output_1pixel;
> + u32 out_np_sel;
Drop this.
> + u8 dpi_ver;
> +};
> +
> +static struct mtk_dpi_gs_info mtk_dpi_gs[MTK_DPI_GSL_MAX] = {
> + [MTK_DPI_FHD_60FPS_1920] = {6880, 511},
> + [MTK_DPI_8K_30FPS] = {5255, 3899},
> };
Drop this.
>
> static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask)
> @@ -208,6 +240,86 @@ static void mtk_dpi_disable(struct mtk_dpi *dpi)
> mtk_dpi_mask(dpi, DPI_EN, 0, EN);
> }
>
> +static void mtk_dpi_irq_enable(struct mtk_dpi *dpi)
> +{
> + mtk_dpi_mask(dpi, DPI_INTEN, INT_VDE_END_EN, INT_VDE_END_EN);
> +}
> +
> +static void mtk_dpi_info_queue_start(struct mtk_dpi *dpi)
> +{
> + mtk_dpi_mask(dpi, DPI_TGEN_INFOQ_LATENCY, 0,
> + INFOQ_START_LATENCY_MASK | INFOQ_END_LATENCY_MASK);
> +}
> +
> +static void mtk_dpi_buffer_ctrl(struct mtk_dpi *dpi)
> +{
> + mtk_dpi_mask(dpi, DPI_BUF_CON0, DISP_BUF_EN, DISP_BUF_EN);
> + mtk_dpi_mask(dpi, DPI_BUF_CON0, FIFO_UNDERFLOW_DONE_BLOCK, FIFO_UNDERFLOW_DONE_BLOCK);
> +}
> +
> +static void mtk_dpi_trailing_blank_setting(struct mtk_dpi *dpi)
> +{
> + mtk_dpi_mask(dpi, DPI_TGEN_V_LAST_TRAILING_BLANK, 0x20, V_LAST_TRAILING_BLANK_MASK);
> + mtk_dpi_mask(dpi, DPI_TGEN_OUTPUT_DELAY_LINE, 0x20, EXT_TG_DLY_LINE_MASK);
> +}
> +
> +static void mtk_dpi_get_gs_level(struct mtk_dpi *dpi)
> +{
> + struct drm_display_mode *mode = &dpi->mode;
> + enum mtk_dpi_golden_setting_level *gsl = &dpi->gs_level;
> +
> + if (mode->hdisplay == 1920 && mode->vdisplay == 1080)
> + *gsl = MTK_DPI_FHD_60FPS_1920;
> + else
> + *gsl = MTK_DPI_8K_30FPS;
> +}
Drop this function.
> +
> +static void mtk_dpi_golden_setting(struct mtk_dpi *dpi)
Change the function name to mtk_dpi_sod()
> +{
> + struct mtk_dpi_gs_info *gs_info = NULL;
> +
> + if (dpi->gs_level >= MTK_DPI_GSL_MAX) {
> + dev_info(dpi->dev, "%s invalid gs_level %d\n",
> + __func__, dpi->gs_level);
> + return;
> + }
> +
> + gs_info = &mtk_dpi_gs[dpi->gs_level];
> +
> + mtk_dpi_mask(dpi, DPI_BUF_SODI_HIGHT, gs_info->dpi_buf_sodi_high, GENMASK(31, 0));
> + mtk_dpi_mask(dpi, DPI_BUF_SODI_LOW, gs_info->dpi_buf_sodi_low, GENMASK(31, 0));
The golden setting has only two case, so drop the golden setting array.
struct drm_display_mode *mode = &dpi->mode;
if (mode->hdisplay == 1920 && mode->vdisplay == 1080) {
mtk_dpi_mask(dpi, DPI_BUF_SODI_HIGHT, 6880, GENMASK(31, 0));
mtk_dpi_mask(dpi, DPI_BUF_SODI_LOW, 511, GENMASK(31, 0));
} else {
mtk_dpi_mask(dpi, DPI_BUF_SODI_HIGHT, 5255, GENMASK(31, 0));
mtk_dpi_mask(dpi, DPI_BUF_SODI_LOW, 3899, GENMASK(31, 0));
}
> +}
> +
> +static void mtk_dpi_shadow_ctrl(struct mtk_dpi *dpi)
> +{
> + mtk_dpi_mask(dpi, DPI_SHADOW_CTRL, 0, BYPASS_SHADOW);
> + mtk_dpi_mask(dpi, DPI_SHADOW_CTRL, FORCE_COMMIT, FORCE_COMMIT);
> +}
> +
> +static void mtk_dpi_config_timing(struct mtk_dpi *dpi,
> + struct mtk_dpi_sync_param *hsync,
> + struct mtk_dpi_sync_param *vsync)
> +{
> + mtk_dpi_mask(dpi, DPI_TGEN_H0,
> + hsync->sync_width << HSYNC,
> + dpi->conf->dimension_mask << HSYNC);
> + mtk_dpi_mask(dpi, DPI_TGEN_H0,
> + hsync->front_porch << DPI_HFP,
> + dpi->conf->dimension_mask << DPI_HFP);
> + mtk_dpi_mask(dpi, DPI_TGEN_H1,
> + (hsync->back_porch + hsync->sync_width) << HSYNC2ACT,
> + dpi->conf->dimension_mask << HSYNC2ACT);
> + mtk_dpi_mask(dpi, DPI_TGEN_V0,
> + vsync->sync_width << VSYNC,
> + dpi->conf->dimension_mask << VSYNC);
> + mtk_dpi_mask(dpi, DPI_TGEN_V0,
> + vsync->front_porch << VFP,
> + dpi->conf->dimension_mask << VFP);
> + mtk_dpi_mask(dpi, DPI_TGEN_V1,
> + (vsync->back_porch + vsync->sync_width) << VSYNC2ACT,
> + dpi->conf->dimension_mask << VSYNC2ACT);
> +}
> +
> static void mtk_dpi_config_hsync(struct mtk_dpi *dpi,
> struct mtk_dpi_sync_param *sync)
> {
> @@ -296,10 +408,27 @@ static void mtk_dpi_config_interface(struct mtk_dpi *dpi, bool inter)
>
> static void mtk_dpi_config_fb_size(struct mtk_dpi *dpi, u32 width, u32 height)
> {
> - mtk_dpi_mask(dpi, DPI_SIZE, width << HSIZE,
> - dpi->conf->hvsize_mask << HSIZE);
> - mtk_dpi_mask(dpi, DPI_SIZE, height << VSIZE,
> - dpi->conf->hvsize_mask << VSIZE);
> + if (dpi->conf->dpi_ver == MTK_DSIP_DVO) {
> + mtk_dpi_mask(dpi, DPI_SRC_SIZE, width << SRC_HSIZE,
> + dpi->conf->hvsize_mask << SRC_HSIZE);
> + mtk_dpi_mask(dpi, DPI_SRC_SIZE, height << SRC_VSIZE,
> + dpi->conf->hvsize_mask << SRC_VSIZE);
> +
> + mtk_dpi_mask(dpi, DPI_PIC_SIZE, width << PIC_HSIZE,
> + dpi->conf->hvsize_mask << PIC_HSIZE);
> + mtk_dpi_mask(dpi, DPI_PIC_SIZE, height << PIC_VSIZE,
> + dpi->conf->hvsize_mask << PIC_VSIZE);
> +
> + mtk_dpi_mask(dpi, DPI_TGEN_H1, (width / dpi->conf->pixels_per_iter) << HACT,
> + dpi->conf->hvsize_mask << HACT);
> + mtk_dpi_mask(dpi, DPI_TGEN_V1, height << VACT,
> + dpi->conf->hvsize_mask << VACT);
> + } else {
> + mtk_dpi_mask(dpi, DPI_SIZE, width << HSIZE,
> + dpi->conf->hvsize_mask << HSIZE);
> + mtk_dpi_mask(dpi, DPI_SIZE, height << VSIZE,
> + dpi->conf->hvsize_mask << VSIZE);
> + }
> }
>
> static void mtk_dpi_config_channel_limit(struct mtk_dpi *dpi)
> @@ -501,6 +630,7 @@ static void mtk_dpi_power_off(struct mtk_dpi *dpi)
> clk_disable_unprepare(dpi->pixel_clk);
> clk_disable_unprepare(dpi->tvd_clk);
> clk_disable_unprepare(dpi->engine_clk);
> + clk_disable_unprepare(dpi->hf_fdpi_clk);
> }
>
> static int mtk_dpi_power_on(struct mtk_dpi *dpi)
> @@ -528,8 +658,16 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi)
> goto err_pixel;
> }
>
> + ret = clk_prepare_enable(dpi->hf_fdpi_clk);
> + if (ret) {
> + dev_err(dpi->dev, "Failed to enable hf_fdpi_clk clock: %d\n", ret);
> + goto err_hf_fdpi_clk;
> + }
> +
> return 0;
>
> +err_hf_fdpi_clk:
> + clk_disable_unprepare(dpi->hf_fdpi_clk);
You fail to prepare enable dpi->hf_fdpi_clk,
so you don't need to disable unprepare it.
clk_disable_unprepare(dpi->pixel_clk);
> err_pixel:
> clk_disable_unprepare(dpi->tvd_clk);
> err_engine:
> @@ -610,7 +748,6 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,
> MTK_DPI_POLARITY_FALLING : MTK_DPI_POLARITY_RISING;
> dpi_pol.vsync_pol = vm.flags & DISPLAY_FLAGS_VSYNC_HIGH ?
> MTK_DPI_POLARITY_FALLING : MTK_DPI_POLARITY_RISING;
> -
> /*
> * Depending on the IP version, we may output a different amount of
> * pixels for each iteration: divide the clock by this number and
> @@ -643,14 +780,18 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,
> }
> mtk_dpi_sw_reset(dpi, true);
> mtk_dpi_config_pol(dpi, &dpi_pol);
> + if (dpi->conf->dpi_ver == MTK_DSIP_DVO) {
> + mtk_dpi_irq_enable(dpi);
This driver has no irq handler, so drop this.
> + mtk_dpi_config_timing(dpi, &hsync, &vsync_lodd);
> + } else {
> + mtk_dpi_config_hsync(dpi, &hsync);
> + mtk_dpi_config_vsync_lodd(dpi, &vsync_lodd);
> + mtk_dpi_config_vsync_rodd(dpi, &vsync_rodd);
> + mtk_dpi_config_vsync_leven(dpi, &vsync_leven);
> + mtk_dpi_config_vsync_reven(dpi, &vsync_reven);
> + mtk_dpi_config_3d(dpi, !!(mode->flags & DRM_MODE_FLAG_3D_MASK));
> + }
>
> - mtk_dpi_config_hsync(dpi, &hsync);
> - mtk_dpi_config_vsync_lodd(dpi, &vsync_lodd);
> - mtk_dpi_config_vsync_rodd(dpi, &vsync_rodd);
> - mtk_dpi_config_vsync_leven(dpi, &vsync_leven);
> - mtk_dpi_config_vsync_reven(dpi, &vsync_reven);
> -
> - mtk_dpi_config_3d(dpi, !!(mode->flags & DRM_MODE_FLAG_3D_MASK));
> mtk_dpi_config_interface(dpi, !!(vm.flags &
> DISPLAY_FLAGS_INTERLACED));
> if (vm.flags & DISPLAY_FLAGS_INTERLACED)
> @@ -658,26 +799,41 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,
> else
> mtk_dpi_config_fb_size(dpi, vm.hactive, vm.vactive);
>
> - mtk_dpi_config_channel_limit(dpi);
> - mtk_dpi_config_bit_num(dpi, dpi->bit_num);
> - mtk_dpi_config_channel_swap(dpi, dpi->channel_swap);
> - mtk_dpi_config_color_format(dpi, dpi->color_format);
> - if (dpi->conf->support_direct_pin) {
> - mtk_dpi_config_yc_map(dpi, dpi->yc_map);
> - mtk_dpi_config_2n_h_fre(dpi);
> -
> - /* DPI can connect to either an external bridge or the internal HDMI encoder */
> - if (dpi->conf->output_1pixel)
> - mtk_dpi_mask(dpi, DPI_CON, DPI_OUTPUT_1T1P_EN, DPI_OUTPUT_1T1P_EN);
> - else
> - mtk_dpi_dual_edge(dpi);
> -
> - mtk_dpi_config_disable_edge(dpi);
> - }
> - if (dpi->conf->input_2p_en_bit) {
> - mtk_dpi_mask(dpi, DPI_CON, dpi->conf->input_2p_en_bit,
> - dpi->conf->input_2p_en_bit);
> + if (dpi->conf->dpi_ver == MTK_DSIP_DVO) {
> + mtk_dpi_info_queue_start(dpi);
> + mtk_dpi_buffer_ctrl(dpi);
> + mtk_dpi_trailing_blank_setting(dpi);
> + mtk_dpi_get_gs_level(dpi);
> + mtk_dpi_golden_setting(dpi);
> + mtk_dpi_shadow_ctrl(dpi);
> + mtk_dpi_mask(dpi, DPI_OUTPUT_SET, dpi->conf->out_np_sel, OUT_NP_SEL);
Up to now, only mt8196 dvo set DPI_OUTPUT_SET, so it's not necessary to have a private data to store out_np_sel.
#define DPI_OUTPUT_SET 0x18
#define DPI_OUTPUT_SET_XXX 2
#define OUT_NP_SEL GENMASK(1, 0)
mtk_dpi_mask(dpi, DPI_OUTPUT_SET, DPI_OUTPUT_SET_XXX, OUT_NP_SEL);
> + } else {
> + mtk_dpi_config_channel_limit(dpi);
> + mtk_dpi_config_bit_num(dpi, dpi->bit_num);
> + mtk_dpi_config_channel_swap(dpi, dpi->channel_swap);
> + mtk_dpi_config_color_format(dpi, dpi->color_format);
> + if (dpi->conf->support_direct_pin) {
> + mtk_dpi_config_yc_map(dpi, dpi->yc_map);
> + mtk_dpi_config_2n_h_fre(dpi);
> +
> + /*
> + * DPI can connect to either an external bridge
> + * or the internal HDMI encoder
> + */
> + if (dpi->conf->output_1pixel)
> + mtk_dpi_mask(dpi, DPI_CON,
> + DPI_OUTPUT_1T1P_EN, DPI_OUTPUT_1T1P_EN);
> + else
> + mtk_dpi_dual_edge(dpi);
> +
> + mtk_dpi_config_disable_edge(dpi);
> + }
> + if (dpi->conf->input_2p_en_bit) {
> + mtk_dpi_mask(dpi, DPI_CON, dpi->conf->input_2p_en_bit,
> + dpi->conf->input_2p_en_bit);
> + }
> }
> +
> mtk_dpi_sw_reset(dpi, false);
>
> return 0;
> @@ -700,7 +856,7 @@ static u32 *mtk_dpi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
> }
>
> output_fmts = kcalloc(dpi->conf->num_output_fmts, sizeof(*output_fmts),
> - GFP_KERNEL);
> + GFP_KERNEL);
This is not related to the title. Separate this to a refinement patch.
> if (!output_fmts)
> return NULL;
>
> @@ -1173,6 +1329,20 @@ static const struct mtk_dpi_conf mt8195_dpintf_conf = {
> .input_2p_en_bit = DPINTF_INPUT_2P_EN,
> };
>
> +static const struct mtk_dpi_conf mt8196_conf = {
> + .dpi_factor = dpi_factor_mt8195_dp_intf,
> + .num_dpi_factor = ARRAY_SIZE(dpi_factor_mt8195_dp_intf),
> + .out_np_sel = 0x2,
> + .reg_h_fre_con = 0xb0,
> + .max_clock_khz = 1330000,
> + .output_fmts = mt8195_output_fmts,
> + .num_output_fmts = ARRAY_SIZE(mt8195_output_fmts),
> + .pixels_per_iter = 4,
> + .dimension_mask = DPINTF_HPW_MASK,
> + .hvsize_mask = PIC_HSIZE_MASK,
> + .dpi_ver = MTK_DSIP_DVO,
> +};
> +
> static int mtk_dpi_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -1227,6 +1397,11 @@ static int mtk_dpi_probe(struct platform_device *pdev)
> return dev_err_probe(dev, PTR_ERR(dpi->tvd_clk),
> "Failed to get tvdpll clock\n");
>
> + dpi->hf_fdpi_clk = devm_clk_get_optional(dev, "hf_fdvo_clk");
> + if (IS_ERR(dpi->hf_fdpi_clk))
> + return dev_err_probe(dev, PTR_ERR(dpi->hf_fdpi_clk),
> + "Failed to get hf_fdpi_clk clock\n");
> +
> dpi->irq = platform_get_irq(pdev, 0);
> if (dpi->irq < 0)
> return dpi->irq;
> @@ -1262,6 +1437,7 @@ static const struct of_device_id mtk_dpi_of_ids[] = {
> { .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf },
> { .compatible = "mediatek,mt8195-dp-intf", .data = &mt8195_dpintf_conf },
> { .compatible = "mediatek,mt8195-dpi", .data = &mt8195_conf },
> + { .compatible = "mediatek,mt8196-edp-dvo", .data = &mt8196_conf },
> { /* sentinel */ },
> };
> MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
> index 23eeefce8fd2..3e2a64c2bca0 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi_regs.h
> @@ -16,6 +16,7 @@
> #define INT_VSYNC_EN BIT(0)
> #define INT_VDE_EN BIT(1)
> #define INT_UNDERFLOW_EN BIT(2)
> +#define INT_VDE_END_EN BIT(4)
>
> #define DPI_INTSTA 0x0C
> #define INT_VSYNC_STA BIT(0)
> @@ -240,6 +241,71 @@
> #define MATRIX_SEL_RGB_TO_JPEG 0
> #define MATRIX_SEL_RGB_TO_BT601 2
>
> +#define DPI_TGEN_INFOQ_LATENCY 0x80
> +#define INFOQ_START_LATENCY 0
> +#define INFOQ_START_LATENCY_MASK (0xffff << 0)
> +#define INFOQ_END_LATENCY 16
> +#define INFOQ_END_LATENCY_MASK (0xffff << 16)
> +
> +#define DPI_BUF_CON0 0x220
> +#define DISP_BUF_EN BIT(0)
> +#define FIFO_UNDERFLOW_DONE_BLOCK BIT(4)
> +
> +#define DPI_TGEN_V_LAST_TRAILING_BLANK 0x6c
> +#define V_LAST_TRAILING_BLANK 0
> +#define V_LAST_TRAILING_BLANK_MASK (0xffff << 0)
> +
> +#define DPI_TGEN_OUTPUT_DELAY_LINE 0x7c
> +#define EXT_TG_DLY_LINE 0
> +#define EXT_TG_DLY_LINE_MASK (0xffff << 0)
> +
> +#define DPI_SHADOW_CTRL 0x190
> +#define FORCE_COMMIT BIT(0)
> +#define BYPASS_SHADOW BIT(1)
> +#define READ_WRK_REG BIT(2)
> +
> +#define DPI_BUF_SODI_HIGHT 0x230
> +#define DPI_BUF_SODI_LOW 0x234
> +
> +#define DPI_OUTPUT_SET 0x18
> +#define OUT_NP_SEL (0x3 << 0)
> +
> +#define DPI_SRC_SIZE 0x20
> +#define SRC_HSIZE 0
> +#define SRC_HSIZE_MASK (0xffff << 0)
> +#define SRC_VSIZE 16
> +#define SRC_VSIZE_MASK (0xffff << 16)
> +
> +#define DPI_PIC_SIZE 0x24
> +#define PIC_HSIZE 0
> +#define PIC_HSIZE_MASK (0xffff << 0)
> +#define PIC_VSIZE 16
> +#define PIC_VSIZE_MASK (0xffff << 16)
> +
> +#define DPI_TGEN_H0 0x50
> +#define DPI_HFP 0
> +#define DPI_HFP_MASK (0xffff << 0)
> +#define HSYNC 16
> +#define HSYNC_MASK (0xffff << 16)
> +
> +#define DPI_TGEN_H1 0x54
> +#define HSYNC2ACT 0
> +#define HSYNC2ACT_MASK (0xffff << 0)
> +#define HACT 16
> +#define HACT_MASK (0xffff << 16)
> +
> +#define DPI_TGEN_V0 0x58
> +#define VFP 0
> +#define VFP_MASK (0xffff << 0)
> +#define VSYNC 16
> +#define VSYNC_MASK (0xffff << 16)
> +
> +#define DPI_TGEN_V1 0x5c
> +#define VSYNC2ACT 0
> +#define VSYNC2ACT_MASK (0xffff << 0)
> +#define VACT 16
> +#define VACT_MASK (0xffff << 16)
> +
> #define DPI_PATTERN0 0xf00
> #define DPI_PAT_EN BIT(0)
> #define DPI_PAT_SEL GENMASK(6, 4)
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 74158b9d6503..870d97c023ed 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -830,6 +830,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = {
> .data = (void *)MTK_DSI },
> { .compatible = "mediatek,mt8188-dsi",
> .data = (void *)MTK_DSI },
> + { .compatible = "mediatek,mt8196-edp-dvo",
> + .data = (void *)MTK_DVO },
> { }
> };
>
> @@ -1176,7 +1178,8 @@ static int mtk_drm_probe(struct platform_device *pdev)
> comp_type == MTK_DISP_RDMA ||
> comp_type == MTK_DP_INTF ||
> comp_type == MTK_DPI ||
> - comp_type == MTK_DSI) {
> + comp_type == MTK_DSI ||
> + comp_type == MTK_DVO) {
DVO is a kind of DPI, so why not reuse DPI and drop DVO?
Regards,
CK
> dev_info(dev, "Adding component match for %pOF\n",
> node);
> drm_of_component_match_add(dev, &match, component_compare_of,
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> index 675cdc90a440..6d2796148813 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> @@ -79,6 +79,7 @@ extern struct platform_driver mtk_disp_ovl_driver;
> extern struct platform_driver mtk_disp_rdma_driver;
> extern struct platform_driver mtk_dpi_driver;
> extern struct platform_driver mtk_dsi_driver;
> +extern struct platform_driver mtk_dvo_driver;
> extern struct platform_driver mtk_ethdr_driver;
> extern struct platform_driver mtk_mdp_rdma_driver;
> extern struct platform_driver mtk_padding_driver;
Hi Bincai,
kernel test robot noticed the following build errors:
[auto build test ERROR on robh/for-next]
[also build test ERROR on pza/reset/next linus/master v6.15-rc2 next-20250417]
[cannot apply to pza/imx-drm/next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Bincai-Liu/dt-bindings-eDP-mediatek-add-eDP-yaml-for-mt8196/20250418-145911
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link: https://lore.kernel.org/r/20250418065313.8972-4-bincai.liu%40mediatek.com
patch subject: [PATCH 3/5] drm/mediatek: Add dvo driver for mt8196
config: i386-buildonly-randconfig-001-20250419 (https://download.01.org/0day-ci/archive/20250419/202504191549.ufJBsMvZ-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250419/202504191549.ufJBsMvZ-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202504191549.ufJBsMvZ-lkp@intel.com/
All error/warnings (new ones prefixed by >>):
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.c:476:10: error: 'DDP_COMPONENT_DVO0' undeclared here (not in a function); did you mean 'DDP_COMPONENT_OVL0'?
476 | [DDP_COMPONENT_DVO0] = { MTK_DVO, 0, &ddp_dpi },
| ^~~~~~~~~~~~~~~~~~
| DDP_COMPONENT_OVL0
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.c:476:10: error: array index in initializer not of integer type
drivers/gpu/drm/mediatek/mtk_ddp_comp.c:476:10: note: (near initialization for 'mtk_ddp_matches')
--
>> drivers/gpu/drm/mediatek/mtk_dpi.c:201: warning: Function parameter or struct member 'out_np_sel' not described in 'mtk_dpi_conf'
>> drivers/gpu/drm/mediatek/mtk_dpi.c:201: warning: Function parameter or struct member 'dpi_ver' not described in 'mtk_dpi_conf'
vim +476 drivers/gpu/drm/mediatek/mtk_ddp_comp.c
456
457 static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX] = {
458 [DDP_COMPONENT_AAL0] = { MTK_DISP_AAL, 0, &ddp_aal },
459 [DDP_COMPONENT_AAL1] = { MTK_DISP_AAL, 1, &ddp_aal },
460 [DDP_COMPONENT_BLS] = { MTK_DISP_BLS, 0, NULL },
461 [DDP_COMPONENT_CCORR] = { MTK_DISP_CCORR, 0, &ddp_ccorr },
462 [DDP_COMPONENT_COLOR0] = { MTK_DISP_COLOR, 0, &ddp_color },
463 [DDP_COMPONENT_COLOR1] = { MTK_DISP_COLOR, 1, &ddp_color },
464 [DDP_COMPONENT_DITHER0] = { MTK_DISP_DITHER, 0, &ddp_dither },
465 [DDP_COMPONENT_DP_INTF0] = { MTK_DP_INTF, 0, &ddp_dpi },
466 [DDP_COMPONENT_DP_INTF1] = { MTK_DP_INTF, 1, &ddp_dpi },
467 [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, &ddp_dpi },
468 [DDP_COMPONENT_DPI1] = { MTK_DPI, 1, &ddp_dpi },
469 [DDP_COMPONENT_DRM_OVL_ADAPTOR] = { MTK_DISP_OVL_ADAPTOR, 0, &ddp_ovl_adaptor },
470 [DDP_COMPONENT_DSC0] = { MTK_DISP_DSC, 0, &ddp_dsc },
471 [DDP_COMPONENT_DSC1] = { MTK_DISP_DSC, 1, &ddp_dsc },
472 [DDP_COMPONENT_DSI0] = { MTK_DSI, 0, &ddp_dsi },
473 [DDP_COMPONENT_DSI1] = { MTK_DSI, 1, &ddp_dsi },
474 [DDP_COMPONENT_DSI2] = { MTK_DSI, 2, &ddp_dsi },
475 [DDP_COMPONENT_DSI3] = { MTK_DSI, 3, &ddp_dsi },
> 476 [DDP_COMPONENT_DVO0] = { MTK_DVO, 0, &ddp_dpi },
477 [DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, &ddp_gamma },
478 [DDP_COMPONENT_MERGE0] = { MTK_DISP_MERGE, 0, &ddp_merge },
479 [DDP_COMPONENT_MERGE1] = { MTK_DISP_MERGE, 1, &ddp_merge },
480 [DDP_COMPONENT_MERGE2] = { MTK_DISP_MERGE, 2, &ddp_merge },
481 [DDP_COMPONENT_MERGE3] = { MTK_DISP_MERGE, 3, &ddp_merge },
482 [DDP_COMPONENT_MERGE4] = { MTK_DISP_MERGE, 4, &ddp_merge },
483 [DDP_COMPONENT_MERGE5] = { MTK_DISP_MERGE, 5, &ddp_merge },
484 [DDP_COMPONENT_OD0] = { MTK_DISP_OD, 0, &ddp_od },
485 [DDP_COMPONENT_OD1] = { MTK_DISP_OD, 1, &ddp_od },
486 [DDP_COMPONENT_OVL0] = { MTK_DISP_OVL, 0, &ddp_ovl },
487 [DDP_COMPONENT_OVL1] = { MTK_DISP_OVL, 1, &ddp_ovl },
488 [DDP_COMPONENT_OVL_2L0] = { MTK_DISP_OVL_2L, 0, &ddp_ovl },
489 [DDP_COMPONENT_OVL_2L1] = { MTK_DISP_OVL_2L, 1, &ddp_ovl },
490 [DDP_COMPONENT_OVL_2L2] = { MTK_DISP_OVL_2L, 2, &ddp_ovl },
491 [DDP_COMPONENT_POSTMASK0] = { MTK_DISP_POSTMASK, 0, &ddp_postmask },
492 [DDP_COMPONENT_PWM0] = { MTK_DISP_PWM, 0, NULL },
493 [DDP_COMPONENT_PWM1] = { MTK_DISP_PWM, 1, NULL },
494 [DDP_COMPONENT_PWM2] = { MTK_DISP_PWM, 2, NULL },
495 [DDP_COMPONENT_RDMA0] = { MTK_DISP_RDMA, 0, &ddp_rdma },
496 [DDP_COMPONENT_RDMA1] = { MTK_DISP_RDMA, 1, &ddp_rdma },
497 [DDP_COMPONENT_RDMA2] = { MTK_DISP_RDMA, 2, &ddp_rdma },
498 [DDP_COMPONENT_RDMA4] = { MTK_DISP_RDMA, 4, &ddp_rdma },
499 [DDP_COMPONENT_UFOE] = { MTK_DISP_UFOE, 0, &ddp_ufoe },
500 [DDP_COMPONENT_WDMA0] = { MTK_DISP_WDMA, 0, NULL },
501 [DDP_COMPONENT_WDMA1] = { MTK_DISP_WDMA, 1, NULL },
502 };
503
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Bincai,
kernel test robot noticed the following build errors:
[auto build test ERROR on robh/for-next]
[also build test ERROR on pza/reset/next linus/master v6.15-rc2 next-20250417]
[cannot apply to pza/imx-drm/next drm-misc/drm-misc-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Bincai-Liu/dt-bindings-eDP-mediatek-add-eDP-yaml-for-mt8196/20250418-145911
base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link: https://lore.kernel.org/r/20250418065313.8972-4-bincai.liu%40mediatek.com
patch subject: [PATCH 3/5] drm/mediatek: Add dvo driver for mt8196
config: i386-buildonly-randconfig-006-20250419 (https://download.01.org/0day-ci/archive/20250419/202504191551.u0FJoQ3O-lkp@intel.com/config)
compiler: clang version 20.1.2 (https://github.com/llvm/llvm-project 58df0ef89dd64126512e4ee27b4ac3fd8ddf6247)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250419/202504191551.u0FJoQ3O-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202504191551.u0FJoQ3O-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/mediatek/mtk_ddp_comp.c:476:3: error: use of undeclared identifier 'DDP_COMPONENT_DVO0'
476 | [DDP_COMPONENT_DVO0] = { MTK_DVO, 0, &ddp_dpi },
| ^
1 error generated.
vim +/DDP_COMPONENT_DVO0 +476 drivers/gpu/drm/mediatek/mtk_ddp_comp.c
456
457 static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX] = {
458 [DDP_COMPONENT_AAL0] = { MTK_DISP_AAL, 0, &ddp_aal },
459 [DDP_COMPONENT_AAL1] = { MTK_DISP_AAL, 1, &ddp_aal },
460 [DDP_COMPONENT_BLS] = { MTK_DISP_BLS, 0, NULL },
461 [DDP_COMPONENT_CCORR] = { MTK_DISP_CCORR, 0, &ddp_ccorr },
462 [DDP_COMPONENT_COLOR0] = { MTK_DISP_COLOR, 0, &ddp_color },
463 [DDP_COMPONENT_COLOR1] = { MTK_DISP_COLOR, 1, &ddp_color },
464 [DDP_COMPONENT_DITHER0] = { MTK_DISP_DITHER, 0, &ddp_dither },
465 [DDP_COMPONENT_DP_INTF0] = { MTK_DP_INTF, 0, &ddp_dpi },
466 [DDP_COMPONENT_DP_INTF1] = { MTK_DP_INTF, 1, &ddp_dpi },
467 [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, &ddp_dpi },
468 [DDP_COMPONENT_DPI1] = { MTK_DPI, 1, &ddp_dpi },
469 [DDP_COMPONENT_DRM_OVL_ADAPTOR] = { MTK_DISP_OVL_ADAPTOR, 0, &ddp_ovl_adaptor },
470 [DDP_COMPONENT_DSC0] = { MTK_DISP_DSC, 0, &ddp_dsc },
471 [DDP_COMPONENT_DSC1] = { MTK_DISP_DSC, 1, &ddp_dsc },
472 [DDP_COMPONENT_DSI0] = { MTK_DSI, 0, &ddp_dsi },
473 [DDP_COMPONENT_DSI1] = { MTK_DSI, 1, &ddp_dsi },
474 [DDP_COMPONENT_DSI2] = { MTK_DSI, 2, &ddp_dsi },
475 [DDP_COMPONENT_DSI3] = { MTK_DSI, 3, &ddp_dsi },
> 476 [DDP_COMPONENT_DVO0] = { MTK_DVO, 0, &ddp_dpi },
477 [DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, &ddp_gamma },
478 [DDP_COMPONENT_MERGE0] = { MTK_DISP_MERGE, 0, &ddp_merge },
479 [DDP_COMPONENT_MERGE1] = { MTK_DISP_MERGE, 1, &ddp_merge },
480 [DDP_COMPONENT_MERGE2] = { MTK_DISP_MERGE, 2, &ddp_merge },
481 [DDP_COMPONENT_MERGE3] = { MTK_DISP_MERGE, 3, &ddp_merge },
482 [DDP_COMPONENT_MERGE4] = { MTK_DISP_MERGE, 4, &ddp_merge },
483 [DDP_COMPONENT_MERGE5] = { MTK_DISP_MERGE, 5, &ddp_merge },
484 [DDP_COMPONENT_OD0] = { MTK_DISP_OD, 0, &ddp_od },
485 [DDP_COMPONENT_OD1] = { MTK_DISP_OD, 1, &ddp_od },
486 [DDP_COMPONENT_OVL0] = { MTK_DISP_OVL, 0, &ddp_ovl },
487 [DDP_COMPONENT_OVL1] = { MTK_DISP_OVL, 1, &ddp_ovl },
488 [DDP_COMPONENT_OVL_2L0] = { MTK_DISP_OVL_2L, 0, &ddp_ovl },
489 [DDP_COMPONENT_OVL_2L1] = { MTK_DISP_OVL_2L, 1, &ddp_ovl },
490 [DDP_COMPONENT_OVL_2L2] = { MTK_DISP_OVL_2L, 2, &ddp_ovl },
491 [DDP_COMPONENT_POSTMASK0] = { MTK_DISP_POSTMASK, 0, &ddp_postmask },
492 [DDP_COMPONENT_PWM0] = { MTK_DISP_PWM, 0, NULL },
493 [DDP_COMPONENT_PWM1] = { MTK_DISP_PWM, 1, NULL },
494 [DDP_COMPONENT_PWM2] = { MTK_DISP_PWM, 2, NULL },
495 [DDP_COMPONENT_RDMA0] = { MTK_DISP_RDMA, 0, &ddp_rdma },
496 [DDP_COMPONENT_RDMA1] = { MTK_DISP_RDMA, 1, &ddp_rdma },
497 [DDP_COMPONENT_RDMA2] = { MTK_DISP_RDMA, 2, &ddp_rdma },
498 [DDP_COMPONENT_RDMA4] = { MTK_DISP_RDMA, 4, &ddp_rdma },
499 [DDP_COMPONENT_UFOE] = { MTK_DISP_UFOE, 0, &ddp_ufoe },
500 [DDP_COMPONENT_WDMA0] = { MTK_DISP_WDMA, 0, NULL },
501 [DDP_COMPONENT_WDMA1] = { MTK_DISP_WDMA, 1, NULL },
502 };
503
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2025 Red Hat, Inc.