提交 82872e42 编写于 作者: Y Yakir Yang

drm/rockchip: analogix_dp: add rk3399 eDP support

RK3399 and RK3288 shared the same eDP IP controller, only some light
difference with VOP configure and GRF configure.
Signed-off-by: NYakir Yang <ykk@rock-chips.com>
Acked-by: NMark Yao <mark.yao@rock-chips.com>
Reviewed-by: NTomasz Figa <tomasz.figa@chromium.com>
Reviewed-by: NSean Paul <seanpaul@chromium.org>
上级 7bdc0720
...@@ -5,6 +5,7 @@ Required properties for dp-controller: ...@@ -5,6 +5,7 @@ Required properties for dp-controller:
platform specific such as: platform specific such as:
* "samsung,exynos5-dp" * "samsung,exynos5-dp"
* "rockchip,rk3288-dp" * "rockchip,rk3288-dp"
* "rockchip,rk3399-edp"
-reg: -reg:
physical base address of the controller and length physical base address of the controller and length
of memory mapped region. of memory mapped region.
......
...@@ -2,7 +2,8 @@ Rockchip RK3288 specific extensions to the Analogix Display Port ...@@ -2,7 +2,8 @@ Rockchip RK3288 specific extensions to the Analogix Display Port
================================ ================================
Required properties: Required properties:
- compatible: "rockchip,rk3288-edp"; - compatible: "rockchip,rk3288-edp",
"rockchip,rk3399-edp";
- reg: physical base address of the controller and length - reg: physical base address of the controller and length
......
...@@ -1208,6 +1208,7 @@ static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp) ...@@ -1208,6 +1208,7 @@ static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp)
switch (dp->plat_data->dev_type) { switch (dp->plat_data->dev_type) {
case RK3288_DP: case RK3288_DP:
case RK3399_EDP:
/* /*
* Like Rk3288 DisplayPort TRM indicate that "Main link * Like Rk3288 DisplayPort TRM indicate that "Main link
* containing 4 physical lanes of 2.7/1.62 Gbps/lane". * containing 4 physical lanes of 2.7/1.62 Gbps/lane".
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#define RK3288_GRF_SOC_CON6 0x25c #define RK3288_GRF_SOC_CON6 0x25c
#define RK3288_EDP_LCDC_SEL BIT(5) #define RK3288_EDP_LCDC_SEL BIT(5)
#define RK3399_GRF_SOC_CON20 0x6250
#define RK3399_EDP_LCDC_SEL BIT(5)
#define HIWORD_UPDATE(val, mask) (val | (mask) << 16) #define HIWORD_UPDATE(val, mask) (val | (mask) << 16)
...@@ -159,6 +161,8 @@ rockchip_dp_drm_encoder_atomic_check(struct drm_encoder *encoder, ...@@ -159,6 +161,8 @@ rockchip_dp_drm_encoder_atomic_check(struct drm_encoder *encoder,
struct drm_connector_state *conn_state) struct drm_connector_state *conn_state)
{ {
struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state); struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);
struct rockchip_dp_device *dp = to_dp(encoder);
int ret;
/* /*
* FIXME(Yakir): driver should configure the CRTC output video * FIXME(Yakir): driver should configure the CRTC output video
...@@ -173,8 +177,19 @@ rockchip_dp_drm_encoder_atomic_check(struct drm_encoder *encoder, ...@@ -173,8 +177,19 @@ rockchip_dp_drm_encoder_atomic_check(struct drm_encoder *encoder,
* But if I configure CTRC to RGBaaa, and eDP driver still keep * But if I configure CTRC to RGBaaa, and eDP driver still keep
* RGB666 input video mode, then screen would works prefect. * RGB666 input video mode, then screen would works prefect.
*/ */
s->output_mode = ROCKCHIP_OUT_MODE_AAAA; s->output_mode = ROCKCHIP_OUT_MODE_AAAA;
s->output_type = DRM_MODE_CONNECTOR_eDP; s->output_type = DRM_MODE_CONNECTOR_eDP;
if (dp->data->chip_type == RK3399_EDP) {
/*
* For RK3399, VOP Lit must code the out mode to RGB888,
* VOP Big must code the out mode to RGB10.
*/
ret = drm_of_encoder_active_endpoint_id(dp->dev->of_node,
encoder);
if (ret > 0)
s->output_mode = ROCKCHIP_OUT_MODE_P888;
}
return 0; return 0;
} }
...@@ -378,6 +393,13 @@ static const struct dev_pm_ops rockchip_dp_pm_ops = { ...@@ -378,6 +393,13 @@ static const struct dev_pm_ops rockchip_dp_pm_ops = {
#endif #endif
}; };
static const struct rockchip_dp_chip_data rk3399_edp = {
.lcdsel_grf_reg = RK3399_GRF_SOC_CON20,
.lcdsel_big = HIWORD_UPDATE(0, RK3399_EDP_LCDC_SEL),
.lcdsel_lit = HIWORD_UPDATE(RK3399_EDP_LCDC_SEL, RK3399_EDP_LCDC_SEL),
.chip_type = RK3399_EDP,
};
static const struct rockchip_dp_chip_data rk3288_dp = { static const struct rockchip_dp_chip_data rk3288_dp = {
.lcdsel_grf_reg = RK3288_GRF_SOC_CON6, .lcdsel_grf_reg = RK3288_GRF_SOC_CON6,
.lcdsel_big = HIWORD_UPDATE(0, RK3288_EDP_LCDC_SEL), .lcdsel_big = HIWORD_UPDATE(0, RK3288_EDP_LCDC_SEL),
...@@ -387,6 +409,7 @@ static const struct rockchip_dp_chip_data rk3288_dp = { ...@@ -387,6 +409,7 @@ static const struct rockchip_dp_chip_data rk3288_dp = {
static const struct of_device_id rockchip_dp_dt_ids[] = { static const struct of_device_id rockchip_dp_dt_ids[] = {
{.compatible = "rockchip,rk3288-dp", .data = &rk3288_dp }, {.compatible = "rockchip,rk3288-dp", .data = &rk3288_dp },
{.compatible = "rockchip,rk3399-edp", .data = &rk3399_edp },
{} {}
}; };
MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids); MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids);
......
...@@ -16,11 +16,12 @@ ...@@ -16,11 +16,12 @@
enum analogix_dp_devtype { enum analogix_dp_devtype {
EXYNOS_DP, EXYNOS_DP,
RK3288_DP, RK3288_DP,
RK3399_EDP,
}; };
static inline bool is_rockchip(enum analogix_dp_devtype type) static inline bool is_rockchip(enum analogix_dp_devtype type)
{ {
return type == RK3288_DP; return type == RK3288_DP || type == RK3399_EDP;
} }
struct analogix_dp_plat_data { struct analogix_dp_plat_data {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册