From 7b79b2a30850a3d251cf9bac8e777546ed48b216 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Mon, 10 May 2021 19:09:55 +0800 Subject: [PATCH] drm/rockchip: remove MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA This format is a definition from rockchip rk61x/rk62x lvds, and has no application scenarios so far. Signed-off-by: Andy Yan Change-Id: Ifb139eaf35d5e83fa96579b1dfcf3762556a77a1 --- drivers/gpu/drm/rockchip/rk618/rk618_dither.c | 1 - drivers/gpu/drm/rockchip/rk618/rk618_lvds.c | 3 --- drivers/gpu/drm/rockchip/rk628/rk628_lvds.c | 2 -- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 -- include/dt-bindings/display/media-bus-format.h | 1 - 5 files changed, 9 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_dither.c b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c index 60938bf6409f..ab1bbe9cee4e 100644 --- a/drivers/gpu/drm/rockchip/rk618/rk618_dither.c +++ b/drivers/gpu/drm/rockchip/rk618/rk618_dither.c @@ -29,7 +29,6 @@ void rk618_frc_dither_init(struct rk618 *rk618, u32 bus_format) val = FRC_OUT_MODE_RGB666 | FRC_DITHER_DISABLE; break; case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: - case MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA: val = FRC_OUT_MODE_RGB888 | FRC_DITHER_ENABLE; break; case MEDIA_BUS_FMT_RGB888_1X24: diff --git a/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c index 83ee5f093ac0..46ad676879f9 100644 --- a/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c +++ b/drivers/gpu/drm/rockchip/rk618/rk618_lvds.c @@ -124,9 +124,6 @@ static void rk618_lvds_bridge_enable(struct drm_bridge *bridge) rk618_frc_dither_init(lvds->parent, lvds->bus_format); switch (lvds->bus_format) { - case MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA: - format = LVDS_FORMAT_JEIDA_18BIT; - break; case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA: format = LVDS_FORMAT_JEIDA_24BIT; break; diff --git a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c index b0b6dcedd00b..33330d8e197e 100644 --- a/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c +++ b/drivers/gpu/drm/rockchip/rk628/rk628_lvds.c @@ -64,8 +64,6 @@ static inline struct rk628_lvds *connector_to_lvds(struct drm_connector *c) static enum lvds_format rk628_lvds_get_format(u32 bus_format) { switch (bus_format) { - case MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA: - return LVDS_FORMAT_JEIDA_18BIT; case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA: return LVDS_FORMAT_JEIDA_24BIT; case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG: diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 3898b852537b..7c8b5b902f27 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -551,7 +551,6 @@ static const struct drm_bus_format_enum_list drm_bus_format_enum_list[] = { { MEDIA_BUS_FMT_RGB666_1X18, "RGB666_1X18" }, { MEDIA_BUS_FMT_RGB666_1X24_CPADHI, "RGB666_1X24_CPADHI" }, { MEDIA_BUS_FMT_RGB666_1X7X3_SPWG, "RGB666_1X7X3_SPWG" }, - { MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA, "RGB666_1X7X3_JEIDA" }, { MEDIA_BUS_FMT_YUV8_1X24, "YUV8_1X24" }, { MEDIA_BUS_FMT_UYYVYY8_0_5X24, "UYYVYY8_0_5X24" }, { MEDIA_BUS_FMT_YUV10_1X30, "YUV10_1X30" }, @@ -3721,7 +3720,6 @@ static void vop2_dither_setup(struct drm_crtc *crtc) case MEDIA_BUS_FMT_RGB666_1X18: case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG: - case MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA: VOP_MODULE_SET(vop2, vp, dither_down_en, 1); VOP_MODULE_SET(vop2, vp, dither_down_mode, RGB888_TO_RGB666); break; diff --git a/include/dt-bindings/display/media-bus-format.h b/include/dt-bindings/display/media-bus-format.h index 0170148a1343..d7c0774a33fc 100644 --- a/include/dt-bindings/display/media-bus-format.h +++ b/include/dt-bindings/display/media-bus-format.h @@ -60,7 +60,6 @@ #define MEDIA_BUS_FMT_RGB101010_1X30 0x1018 #define MEDIA_BUS_FMT_RGB121212_1X36 0x1019 #define MEDIA_BUS_FMT_RGB161616_1X48 0x101a -#define MEDIA_BUS_FMT_RGB666_1X7X3_JEIDA 0x101b #define MEDIA_BUS_FMT_SRGB888_3X8 0x101c #define MEDIA_BUS_FMT_SBGR888_3X8 0x101d #define MEDIA_BUS_FMT_SRBG888_3X8 0x101e