提交 c20bbaca 编写于 作者: B Bo-Chen Chen 提交者: Zheng Zengkai

drm/mediatek: dpi: Remove output format of YUV

stable inclusion
from stable-v5.10.137
commit c47d69ed5667e698c87f0b4c867ceac7fc09a5a6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c47d69ed5667e698c87f0b4c867ceac7fc09a5a6

--------------------------------

[ Upstream commit c9ed0713 ]

DPI is not support output format as YUV, but there is the setting of
configuring output YUV. Therefore, remove them in this patch.

Fixes: 9e629c17 ("drm/mediatek: Add DPI sub driver")
Signed-off-by: NBo-Chen Chen <rex-bc.chen@mediatek.com>
Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20220701035845.16458-5-rex-bc.chen@mediatek.com/Signed-off-by: NChun-Kuang Hu <chunkuang.hu@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 b559841e
...@@ -52,13 +52,7 @@ enum mtk_dpi_out_channel_swap { ...@@ -52,13 +52,7 @@ enum mtk_dpi_out_channel_swap {
}; };
enum mtk_dpi_out_color_format { enum mtk_dpi_out_color_format {
MTK_DPI_COLOR_FORMAT_RGB, MTK_DPI_COLOR_FORMAT_RGB
MTK_DPI_COLOR_FORMAT_RGB_FULL,
MTK_DPI_COLOR_FORMAT_YCBCR_444,
MTK_DPI_COLOR_FORMAT_YCBCR_422,
MTK_DPI_COLOR_FORMAT_XV_YCC,
MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL,
MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL
}; };
struct mtk_dpi { struct mtk_dpi {
...@@ -358,24 +352,11 @@ static void mtk_dpi_config_disable_edge(struct mtk_dpi *dpi) ...@@ -358,24 +352,11 @@ static void mtk_dpi_config_disable_edge(struct mtk_dpi *dpi)
static void mtk_dpi_config_color_format(struct mtk_dpi *dpi, static void mtk_dpi_config_color_format(struct mtk_dpi *dpi,
enum mtk_dpi_out_color_format format) enum mtk_dpi_out_color_format format)
{ {
if ((format == MTK_DPI_COLOR_FORMAT_YCBCR_444) || /* only support RGB888 */
(format == MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL)) {
mtk_dpi_config_yuv422_enable(dpi, false);
mtk_dpi_config_csc_enable(dpi, true);
mtk_dpi_config_swap_input(dpi, false);
mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_BGR);
} else if ((format == MTK_DPI_COLOR_FORMAT_YCBCR_422) ||
(format == MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL)) {
mtk_dpi_config_yuv422_enable(dpi, true);
mtk_dpi_config_csc_enable(dpi, true);
mtk_dpi_config_swap_input(dpi, true);
mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB);
} else {
mtk_dpi_config_yuv422_enable(dpi, false); mtk_dpi_config_yuv422_enable(dpi, false);
mtk_dpi_config_csc_enable(dpi, false); mtk_dpi_config_csc_enable(dpi, false);
mtk_dpi_config_swap_input(dpi, false); mtk_dpi_config_swap_input(dpi, false);
mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB); mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB);
}
} }
static void mtk_dpi_power_off(struct mtk_dpi *dpi) static void mtk_dpi_power_off(struct mtk_dpi *dpi)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册