Commit 62fc5cd1 authored by Xinlei Lee's avatar Xinlei Lee Committed by Chun-Kuang Hu
parent 1b929c02
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/of_graph.h> #include <linux/of_graph.h>
#include <linux/pinctrl/consumer.h> #include <linux/pinctrl/consumer.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/soc/mediatek/mtk-mmsys.h>
#include <linux/types.h> #include <linux/types.h>
#include <video/videomode.h> #include <video/videomode.h>
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
#include "mtk_disp_drv.h" #include "mtk_disp_drv.h"
#include "mtk_dpi_regs.h" #include "mtk_dpi_regs.h"
#include "mtk_drm_ddp_comp.h" #include "mtk_drm_ddp_comp.h"
#include "mtk_drm_drv.h"
enum mtk_dpi_out_bit_num { enum mtk_dpi_out_bit_num {
MTK_DPI_OUT_BIT_NUM_8BITS, MTK_DPI_OUT_BIT_NUM_8BITS,
...@@ -66,6 +68,7 @@ struct mtk_dpi { ...@@ -66,6 +68,7 @@ struct mtk_dpi {
struct drm_connector *connector; struct drm_connector *connector;
void __iomem *regs; void __iomem *regs;
struct device *dev; struct device *dev;
struct device *mmsys_dev;
struct clk *engine_clk; struct clk *engine_clk;
struct clk *pixel_clk; struct clk *pixel_clk;
struct clk *tvd_clk; struct clk *tvd_clk;
...@@ -134,6 +137,7 @@ struct mtk_dpi_yc_limit { ...@@ -134,6 +137,7 @@ struct mtk_dpi_yc_limit {
* @yuv422_en_bit: Enable bit of yuv422. * @yuv422_en_bit: Enable bit of yuv422.
* @csc_enable_bit: Enable bit of CSC. * @csc_enable_bit: Enable bit of CSC.
* @pixels_per_iter: Quantity of transferred pixels per iteration. * @pixels_per_iter: Quantity of transferred pixels per iteration.
* @edge_cfg_in_mmsys: If the edge configuration for DPI's output needs to be set in MMSYS.
*/ */
struct mtk_dpi_conf { struct mtk_dpi_conf {
unsigned int (*cal_factor)(int clock); unsigned int (*cal_factor)(int clock);
...@@ -152,6 +156,7 @@ struct mtk_dpi_conf { ...@@ -152,6 +156,7 @@ struct mtk_dpi_conf {
u32 yuv422_en_bit; u32 yuv422_en_bit;
u32 csc_enable_bit; u32 csc_enable_bit;
u32 pixels_per_iter; u32 pixels_per_iter;
bool edge_cfg_in_mmsys;
}; };
static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask) static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val, u32 mask)
...@@ -448,8 +453,12 @@ static void mtk_dpi_dual_edge(struct mtk_dpi *dpi) ...@@ -448,8 +453,12 @@ static void mtk_dpi_dual_edge(struct mtk_dpi *dpi)
mtk_dpi_mask(dpi, DPI_OUTPUT_SETTING, mtk_dpi_mask(dpi, DPI_OUTPUT_SETTING,
dpi->output_fmt == MEDIA_BUS_FMT_RGB888_2X12_LE ? dpi->output_fmt == MEDIA_BUS_FMT_RGB888_2X12_LE ?
EDGE_SEL : 0, EDGE_SEL); EDGE_SEL : 0, EDGE_SEL);
if (dpi->conf->edge_cfg_in_mmsys)
mtk_mmsys_ddp_dpi_fmt_config(dpi->mmsys_dev, MTK_DPI_RGB888_DDR_CON);
} else { } else {
mtk_dpi_mask(dpi, DPI_DDR_SETTING, DDR_EN | DDR_4PHASE, 0); mtk_dpi_mask(dpi, DPI_DDR_SETTING, DDR_EN | DDR_4PHASE, 0);
if (dpi->conf->edge_cfg_in_mmsys)
mtk_mmsys_ddp_dpi_fmt_config(dpi->mmsys_dev, MTK_DPI_RGB888_SDR_CON);
} }
} }
...@@ -777,8 +786,10 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data) ...@@ -777,8 +786,10 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data)
{ {
struct mtk_dpi *dpi = dev_get_drvdata(dev); struct mtk_dpi *dpi = dev_get_drvdata(dev);
struct drm_device *drm_dev = data; struct drm_device *drm_dev = data;
struct mtk_drm_private *priv = drm_dev->dev_private;
int ret; int ret;
dpi->mmsys_dev = priv->mmsys_dev;
ret = drm_simple_encoder_init(drm_dev, &dpi->encoder, ret = drm_simple_encoder_init(drm_dev, &dpi->encoder,
DRM_MODE_ENCODER_TMDS); DRM_MODE_ENCODER_TMDS);
if (ret) { if (ret) {
......
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