Commit d41ff4dc authored by Yongqiang Niu's avatar Yongqiang Niu Committed by Chun-Kuang Hu

drm/mediatek: Enable OVL_LAYER_SMI_ID_EN for multi-layer usecase

Enable OVL_LAYER_SMI_ID_EN for multi-layer usecase, without this patch,
ovl will hang up when more than 1 layer enabled.
Signed-off-by: default avatarYongqiang Niu <yongqiang.niu@mediatek.com>
Signed-off-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 641ef9e7
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#define DISP_REG_OVL_RST 0x0014 #define DISP_REG_OVL_RST 0x0014
#define DISP_REG_OVL_ROI_SIZE 0x0020 #define DISP_REG_OVL_ROI_SIZE 0x0020
#define DISP_REG_OVL_DATAPATH_CON 0x0024 #define DISP_REG_OVL_DATAPATH_CON 0x0024
#define OVL_LAYER_SMI_ID_EN BIT(0)
#define OVL_BGCLR_SEL_IN BIT(2) #define OVL_BGCLR_SEL_IN BIT(2)
#define DISP_REG_OVL_ROI_BGCLR 0x0028 #define DISP_REG_OVL_ROI_BGCLR 0x0028
#define DISP_REG_OVL_SRC_CON 0x002c #define DISP_REG_OVL_SRC_CON 0x002c
...@@ -62,6 +63,7 @@ struct mtk_disp_ovl_data { ...@@ -62,6 +63,7 @@ struct mtk_disp_ovl_data {
unsigned int gmc_bits; unsigned int gmc_bits;
unsigned int layer_nr; unsigned int layer_nr;
bool fmt_rgb565_is_0; bool fmt_rgb565_is_0;
bool smi_id_en;
}; };
/** /**
...@@ -134,6 +136,13 @@ void mtk_ovl_start(struct device *dev) ...@@ -134,6 +136,13 @@ void mtk_ovl_start(struct device *dev)
{ {
struct mtk_disp_ovl *ovl = dev_get_drvdata(dev); struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);
if (ovl->data->smi_id_en) {
unsigned int reg;
reg = readl(ovl->regs + DISP_REG_OVL_DATAPATH_CON);
reg = reg | OVL_LAYER_SMI_ID_EN;
writel_relaxed(reg, ovl->regs + DISP_REG_OVL_DATAPATH_CON);
}
writel_relaxed(0x1, ovl->regs + DISP_REG_OVL_EN); writel_relaxed(0x1, ovl->regs + DISP_REG_OVL_EN);
} }
...@@ -142,6 +151,14 @@ void mtk_ovl_stop(struct device *dev) ...@@ -142,6 +151,14 @@ void mtk_ovl_stop(struct device *dev)
struct mtk_disp_ovl *ovl = dev_get_drvdata(dev); struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);
writel_relaxed(0x0, ovl->regs + DISP_REG_OVL_EN); writel_relaxed(0x0, ovl->regs + DISP_REG_OVL_EN);
if (ovl->data->smi_id_en) {
unsigned int reg;
reg = readl(ovl->regs + DISP_REG_OVL_DATAPATH_CON);
reg = reg & ~OVL_LAYER_SMI_ID_EN;
writel_relaxed(reg, ovl->regs + DISP_REG_OVL_DATAPATH_CON);
}
} }
void mtk_ovl_config(struct device *dev, unsigned int w, void mtk_ovl_config(struct device *dev, unsigned int w,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment