diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index 2783c16647..384176837b 100644 --- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf @@ -3242,7 +3242,7 @@ CONFIG_REGULATOR_GPIO=y # CONFIG_REGULATOR_MAX77826 is not set # CONFIG_REGULATOR_MCP16502 is not set # CONFIG_REGULATOR_MP5416 is not set -# CONFIG_REGULATOR_MP8859 is not set +CONFIG_REGULATOR_MP8859=y # CONFIG_REGULATOR_MP886X is not set # CONFIG_REGULATOR_MPQ7920 is not set # CONFIG_REGULATOR_MT6311 is not set diff --git a/projects/Rockchip/patches/linux/default/linux-1001-drm-rockchip.patch b/projects/Rockchip/patches/linux/default/linux-1001-drm-rockchip.patch index f1b8b44fad..7b00183069 100644 --- a/projects/Rockchip/patches/linux/default/linux-1001-drm-rockchip.patch +++ b/projects/Rockchip/patches/linux/default/linux-1001-drm-rockchip.patch @@ -3421,3 +3421,38 @@ index 3719309ad0d0..00025dcd3bb9 100644 { /* sentinel */ } }; +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Algea Cao +Date: Wed, 6 Jun 2018 15:47:12 +0800 +Subject: [PATCH] drm/bridge: synopsys: dw-hdmi: Select formula1 for csc + decimation + +Formula3 and Formula2 for csc decimation will cause hdmi yuv422 +display err. + +Formula3: +The pixel color of left 0-14 columns and right 0-12 columns is +err. + +Formula2: +The pixel color of left 0-2 columns is err. + +Change-Id: I94fdd5fd962a24fde02dde1fe3ac10437ad117ad +Signed-off-by: Algea Cao +--- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +index 3340aef73d8d..d798846579f5 100644 +--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c ++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +@@ -1060,7 +1060,7 @@ static void hdmi_video_csc(struct dw_hdmi *hdmi) + if (is_color_space_interpolation(hdmi)) + interpolation = HDMI_CSC_CFG_INTMODE_CHROMA_INT_FORMULA1; + else if (is_color_space_decimation(hdmi)) +- decimation = HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA3; ++ decimation = HDMI_CSC_CFG_DECMODE_CHROMA_INT_FORMULA1; + + switch (hdmi_bus_fmt_color_depth(hdmi->hdmi_data.enc_out_bus_format)) { + case 8: