* [PATCH v17 1/6] drm/ingenic: Implement proper .atomic_get_input_bus_fmts
2022-04-06 16:26 [PATCH v17 0/6] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
@ 2022-04-06 16:26 ` H. Nikolaus Schaller
2022-04-06 16:26 ` [PATCH v17 2/6] drm/ingenic: Add dw-hdmi driver specialization for jz4780 H. Nikolaus Schaller
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: H. Nikolaus Schaller @ 2022-04-06 16:26 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, H. Nikolaus Schaller,
Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
From: Paul Cercueil <paul@crapouillou.net>
The .atomic_get_input_bus_fmts() callback of our top bridge should
return the possible input formats for a given output format. If the
requested output format is not supported, then NULL should be returned,
otherwise the bus format negociation will end with a bus format that the
encoder does not support.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 28 ++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index a4f5a323f4906..8eb0ad501a7b9 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -833,6 +833,32 @@ static int ingenic_drm_bridge_atomic_check(struct drm_bridge *bridge,
}
}
+static u32 *
+ingenic_drm_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
+ struct drm_bridge_state *bridge_state,
+ struct drm_crtc_state *crtc_state,
+ struct drm_connector_state *conn_state,
+ u32 output_fmt,
+ unsigned int *num_input_fmts)
+{
+ switch (output_fmt) {
+ case MEDIA_BUS_FMT_RGB888_1X24:
+ case MEDIA_BUS_FMT_RGB666_1X18:
+ case MEDIA_BUS_FMT_RGB565_1X16:
+ case MEDIA_BUS_FMT_RGB888_3X8:
+ case MEDIA_BUS_FMT_RGB888_3X8_DELTA:
+ break;
+ default:
+ *num_input_fmts = 0;
+ return NULL;
+ }
+
+ return drm_atomic_helper_bridge_propagate_bus_fmt(bridge, bridge_state,
+ crtc_state, conn_state,
+ output_fmt,
+ num_input_fmts);
+}
+
static irqreturn_t ingenic_drm_irq_handler(int irq, void *arg)
{
struct ingenic_drm *priv = drm_device_get_priv(arg);
@@ -984,7 +1010,7 @@ static const struct drm_bridge_funcs ingenic_drm_bridge_funcs = {
.atomic_reset = drm_atomic_helper_bridge_reset,
.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
- .atomic_get_input_bus_fmts = drm_atomic_helper_bridge_propagate_bus_fmt,
+ .atomic_get_input_bus_fmts = ingenic_drm_bridge_atomic_get_input_bus_fmts,
};
static const struct drm_mode_config_funcs ingenic_drm_mode_config_funcs = {
--
2.33.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v17 2/6] drm/ingenic: Add dw-hdmi driver specialization for jz4780
2022-04-06 16:26 [PATCH v17 0/6] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
2022-04-06 16:26 ` [PATCH v17 1/6] drm/ingenic: Implement proper .atomic_get_input_bus_fmts H. Nikolaus Schaller
@ 2022-04-06 16:26 ` H. Nikolaus Schaller
2022-04-06 16:26 ` [PATCH v17 3/6] drm/bridge: dw-hdmi: filter out YUV output formats when DVI H. Nikolaus Schaller
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: H. Nikolaus Schaller @ 2022-04-06 16:26 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, H. Nikolaus Schaller,
Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
From: Paul Boddie <paul@boddie.org.uk>
A specialisation of the generic Synopsys HDMI driver is employed for
JZ4780 HDMI support. This requires a new driver, plus device tree and
configuration modifications.
Here we add Kconfig DRM_INGENIC_DW_HDMI, Makefile and driver code.
Note that there is no hpd-gpio installed on the CI20 board HDMI
connector. Hence there is no hpd detection by the connector driver
and we have to enable polling in the dw-hdmi core driver.
For that we need to set .poll_enabled but that struct component
can only be accessed by core code. Hence we use the public
setter function drm_kms_helper_hotplug_event() introduced before.
Also note that we disable Color Space Conversion since it is not
working on jz4780.
Signed-off-by: Paul Boddie <paul@boddie.org.uk>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/ingenic/Kconfig | 9 ++
drivers/gpu/drm/ingenic/Makefile | 1 +
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 104 ++++++++++++++++++++++
3 files changed, 114 insertions(+)
create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
diff --git a/drivers/gpu/drm/ingenic/Kconfig b/drivers/gpu/drm/ingenic/Kconfig
index 001f59fb06d56..090830bcbde7f 100644
--- a/drivers/gpu/drm/ingenic/Kconfig
+++ b/drivers/gpu/drm/ingenic/Kconfig
@@ -24,4 +24,13 @@ config DRM_INGENIC_IPU
The Image Processing Unit (IPU) will appear as a second primary plane.
+config DRM_INGENIC_DW_HDMI
+ tristate "Ingenic specific support for Synopsys DW HDMI"
+ depends on MACH_JZ4780
+ select DRM_DW_HDMI
+ help
+ Choose this option to enable Synopsys DesignWare HDMI based driver.
+ If you want to enable HDMI on Ingenic JZ4780 based SoC, you should
+ select this option.
+
endif
diff --git a/drivers/gpu/drm/ingenic/Makefile b/drivers/gpu/drm/ingenic/Makefile
index d313326bdddbb..f10cc1c5a5f22 100644
--- a/drivers/gpu/drm/ingenic/Makefile
+++ b/drivers/gpu/drm/ingenic/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_DRM_INGENIC) += ingenic-drm.o
ingenic-drm-y = ingenic-drm-drv.o
ingenic-drm-$(CONFIG_DRM_INGENIC_IPU) += ingenic-ipu.o
+obj-$(CONFIG_DRM_INGENIC_DW_HDMI) += ingenic-dw-hdmi.o
diff --git a/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
new file mode 100644
index 0000000000000..10c56183613b0
--- /dev/null
+++ b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2019, 2020 Paul Boddie <paul@boddie.org.uk>
+ *
+ * Derived from dw_hdmi-imx.c with i.MX portions removed.
+ */
+
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+
+#include <drm/bridge/dw_hdmi.h>
+#include <drm/drm_of.h>
+#include <drm/drm_print.h>
+
+static const struct dw_hdmi_mpll_config ingenic_mpll_cfg[] = {
+ { 45250000, { { 0x01e0, 0x0000 }, { 0x21e1, 0x0000 }, { 0x41e2, 0x0000 } } },
+ { 92500000, { { 0x0140, 0x0005 }, { 0x2141, 0x0005 }, { 0x4142, 0x0005 } } },
+ { 148500000, { { 0x00a0, 0x000a }, { 0x20a1, 0x000a }, { 0x40a2, 0x000a } } },
+ { 216000000, { { 0x00a0, 0x000a }, { 0x2001, 0x000f }, { 0x4002, 0x000f } } },
+ { ~0UL, { { 0x0000, 0x0000 }, { 0x0000, 0x0000 }, { 0x0000, 0x0000 } } }
+};
+
+static const struct dw_hdmi_curr_ctrl ingenic_cur_ctr[] = {
+ /*pixelclk bpp8 bpp10 bpp12 */
+ { 54000000, { 0x091c, 0x091c, 0x06dc } },
+ { 58400000, { 0x091c, 0x06dc, 0x06dc } },
+ { 72000000, { 0x06dc, 0x06dc, 0x091c } },
+ { 74250000, { 0x06dc, 0x0b5c, 0x091c } },
+ { 118800000, { 0x091c, 0x091c, 0x06dc } },
+ { 216000000, { 0x06dc, 0x0b5c, 0x091c } },
+ { ~0UL, { 0x0000, 0x0000, 0x0000 } },
+};
+
+/*
+ * Resistance term 133Ohm Cfg
+ * PREEMP config 0.00
+ * TX/CK level 10
+ */
+static const struct dw_hdmi_phy_config ingenic_phy_config[] = {
+ /*pixelclk symbol term vlev */
+ { 216000000, 0x800d, 0x0005, 0x01ad},
+ { ~0UL, 0x0000, 0x0000, 0x0000}
+};
+
+static enum drm_mode_status
+ingenic_dw_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,
+ const struct drm_display_info *info,
+ const struct drm_display_mode *mode)
+{
+ if (mode->clock < 13500)
+ return MODE_CLOCK_LOW;
+ /* FIXME: Hardware is capable of 270MHz, but setup data is missing. */
+ if (mode->clock > 216000)
+ return MODE_CLOCK_HIGH;
+
+ return MODE_OK;
+}
+
+static struct dw_hdmi_plat_data ingenic_dw_hdmi_plat_data = {
+ .mpll_cfg = ingenic_mpll_cfg,
+ .cur_ctr = ingenic_cur_ctr,
+ .phy_config = ingenic_phy_config,
+ .mode_valid = ingenic_dw_hdmi_mode_valid,
+ .output_port = 1,
+ .disable_csc = 0, /* DRM_COLOR_FORMAT_YCBCR do not work */
+};
+
+static const struct of_device_id ingenic_dw_hdmi_dt_ids[] = {
+ { .compatible = "ingenic,jz4780-dw-hdmi" },
+ { /* Sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, ingenic_dw_hdmi_dt_ids);
+
+static void ingenic_dw_hdmi_cleanup(void *data)
+{
+ struct dw_hdmi *hdmi = (struct dw_hdmi *)data;
+
+ dw_hdmi_remove(hdmi);
+}
+
+static int ingenic_dw_hdmi_probe(struct platform_device *pdev)
+{
+ struct dw_hdmi *hdmi;
+
+ hdmi = dw_hdmi_probe(pdev, &ingenic_dw_hdmi_plat_data);
+ if (IS_ERR(hdmi))
+ return PTR_ERR(hdmi);
+
+ return devm_add_action_or_reset(&pdev->dev, ingenic_dw_hdmi_cleanup, hdmi);
+}
+
+static struct platform_driver ingenic_dw_hdmi_driver = {
+ .probe = ingenic_dw_hdmi_probe,
+ .driver = {
+ .name = "dw-hdmi-ingenic",
+ .of_match_table = ingenic_dw_hdmi_dt_ids,
+ },
+};
+module_platform_driver(ingenic_dw_hdmi_driver);
+
+MODULE_DESCRIPTION("JZ4780 Specific DW-HDMI Driver Extension");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:dw-hdmi-ingenic");
--
2.33.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v17 3/6] drm/bridge: dw-hdmi: filter out YUV output formats when DVI
2022-04-06 16:26 [PATCH v17 0/6] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
2022-04-06 16:26 ` [PATCH v17 1/6] drm/ingenic: Implement proper .atomic_get_input_bus_fmts H. Nikolaus Schaller
2022-04-06 16:26 ` [PATCH v17 2/6] drm/ingenic: Add dw-hdmi driver specialization for jz4780 H. Nikolaus Schaller
@ 2022-04-06 16:26 ` H. Nikolaus Schaller
2022-04-06 16:26 ` [PATCH v17 4/6] drm/bridge: dw-hdmi: handle unusable or non-configured CSC module H. Nikolaus Schaller
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: H. Nikolaus Schaller @ 2022-04-06 16:26 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, H. Nikolaus Schaller,
Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
From: Neil Armstrong <narmstrong@baylibre.com>
When the display is not an HDMI sink, only the RGB output format is
valid. Thus stop returning YUV output formats when sink is not HDMI.
Fixes: 6c3c719936da ("drm/bridge: synopsys: dw-hdmi: add bus format negociation")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index a563460f8d209..f50af40e10340 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -2538,6 +2538,7 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
struct drm_connector *conn = conn_state->connector;
struct drm_display_info *info = &conn->display_info;
struct drm_display_mode *mode = &crtc_state->mode;
+ struct dw_hdmi *hdmi = bridge->driver_private;
u8 max_bpc = conn_state->max_requested_bpc;
bool is_hdmi2_sink = info->hdmi.scdc.supported ||
(info->color_formats & DRM_COLOR_FORMAT_YCBCR420);
@@ -2564,7 +2565,7 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
* If the current mode enforces 4:2:0, force the output but format
* to 4:2:0 and do not add the YUV422/444/RGB formats
*/
- if (conn->ycbcr_420_allowed &&
+ if (hdmi->sink_is_hdmi && conn->ycbcr_420_allowed &&
(drm_mode_is_420_only(info, mode) ||
(is_hdmi2_sink && drm_mode_is_420_also(info, mode)))) {
@@ -2595,36 +2596,36 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
*/
if (max_bpc >= 16 && info->bpc == 16) {
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
output_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
output_fmts[i++] = MEDIA_BUS_FMT_RGB161616_1X48;
}
if (max_bpc >= 12 && info->bpc >= 12) {
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
output_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
output_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
output_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
}
if (max_bpc >= 10 && info->bpc >= 10) {
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
output_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
output_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
}
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
/* Default 8bit RGB fallback */
--
2.33.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v17 4/6] drm/bridge: dw-hdmi: handle unusable or non-configured CSC module
2022-04-06 16:26 [PATCH v17 0/6] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
` (2 preceding siblings ...)
2022-04-06 16:26 ` [PATCH v17 3/6] drm/bridge: dw-hdmi: filter out YUV output formats when DVI H. Nikolaus Schaller
@ 2022-04-06 16:26 ` H. Nikolaus Schaller
2022-04-07 8:28 ` Neil Armstrong
2022-04-06 16:26 ` [PATCH v17 5/6] drm/bridge: dw-hdmi: add YCBCR formats only if CSC is available H. Nikolaus Schaller
2022-04-06 16:26 ` [PATCH v17 6/6] drm/bridge: display-connector: add ddc-en gpio support H. Nikolaus Schaller
5 siblings, 1 reply; 13+ messages in thread
From: H. Nikolaus Schaller @ 2022-04-06 16:26 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, H. Nikolaus Schaller,
Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
From: Neil Armstrong <narmstrong@baylibre.com>
The dw-hdmi integrates an optional Color Space Conversion feature used
to handle color-space conversions.
On some platforms, the CSC isn't built-in or non-functional.
This adds the necessary code to disable the CSC functionality
and limit the bus format negotiation to force using the same
input bus format as the output bus format.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 100 +++++++++++++++-------
drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 1 +
include/drm/bridge/dw_hdmi.h | 1 +
3 files changed, 71 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index f50af40e10340..b5a665c5e406e 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -158,6 +158,8 @@ struct dw_hdmi {
struct hdmi_data_info hdmi_data;
const struct dw_hdmi_plat_data *plat_data;
+ bool csc_available; /* indicates if the CSC engine is usable */
+
int vic;
u8 edid[HDMI_EDID_LEN];
@@ -1009,9 +1011,10 @@ static int is_color_space_interpolation(struct dw_hdmi *hdmi)
static bool is_csc_needed(struct dw_hdmi *hdmi)
{
- return is_color_space_conversion(hdmi) ||
- is_color_space_decimation(hdmi) ||
- is_color_space_interpolation(hdmi);
+ return hdmi->csc_available &&
+ (is_color_space_conversion(hdmi) ||
+ is_color_space_decimation(hdmi) ||
+ is_color_space_interpolation(hdmi));
}
static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi)
@@ -1064,6 +1067,9 @@ static void hdmi_video_csc(struct dw_hdmi *hdmi)
int interpolation = HDMI_CSC_CFG_INTMODE_DISABLE;
int decimation = 0;
+ if (!hdmi->csc_available)
+ return;
+
/* YCC422 interpolation to 444 mode */
if (is_color_space_interpolation(hdmi))
interpolation = HDMI_CSC_CFG_INTMODE_CHROMA_INT_FORMULA1;
@@ -2665,6 +2671,7 @@ static u32 *dw_hdmi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
u32 output_fmt,
unsigned int *num_input_fmts)
{
+ struct dw_hdmi *hdmi = bridge->driver_private;
u32 *input_fmts;
unsigned int i = 0;
@@ -2683,62 +2690,81 @@ static u32 *dw_hdmi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
/* 8bit */
case MEDIA_BUS_FMT_RGB888_1X24:
input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
- input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
- input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
+ if (hdmi->csc_available) {
+ input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
+ input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
+ }
break;
case MEDIA_BUS_FMT_YUV8_1X24:
input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
- input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
- input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
+ if (hdmi->csc_available) {
+ input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
+ input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
+ }
break;
case MEDIA_BUS_FMT_UYVY8_1X16:
input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
- input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
- input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
+ if (hdmi->csc_available) {
+ input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
+ input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
+ }
break;
/* 10bit */
case MEDIA_BUS_FMT_RGB101010_1X30:
input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
- input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
- input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
+ if (hdmi->csc_available) {
+ input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
+ input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
+ }
break;
case MEDIA_BUS_FMT_YUV10_1X30:
input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
- input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
- input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
+ if (hdmi->csc_available) {
+ input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
+ input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
+ }
break;
case MEDIA_BUS_FMT_UYVY10_1X20:
input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
- input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
- input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
+ if (hdmi->csc_available) {
+ input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
+ input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
+ }
break;
/* 12bit */
case MEDIA_BUS_FMT_RGB121212_1X36:
input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
- input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
- input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
+ if (hdmi->csc_available) {
+ input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
+ input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
+ }
break;
case MEDIA_BUS_FMT_YUV12_1X36:
input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
- input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
- input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
+ if (hdmi->csc_available) {
+ input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
+ input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
+ }
break;
case MEDIA_BUS_FMT_UYVY12_1X24:
input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
- input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
- input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
+ if (hdmi->csc_available) {
+ input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
+ input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
+ }
break;
/* 16bit */
case MEDIA_BUS_FMT_RGB161616_1X48:
input_fmts[i++] = MEDIA_BUS_FMT_RGB161616_1X48;
- input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
+ if (hdmi->csc_available)
+ input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
break;
case MEDIA_BUS_FMT_YUV16_1X48:
- input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
- input_fmts[i++] = MEDIA_BUS_FMT_RGB161616_1X48;
+ if (hdmi->csc_available)
+ input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
break;
/*YUV 4:2:0 */
@@ -2767,15 +2793,24 @@ static int dw_hdmi_bridge_atomic_check(struct drm_bridge *bridge,
{
struct dw_hdmi *hdmi = bridge->driver_private;
- hdmi->hdmi_data.enc_out_bus_format =
- bridge_state->output_bus_cfg.format;
+ if (!hdmi->csc_available &&
+ bridge_state->output_bus_cfg.format != bridge_state->input_bus_cfg.format) {
+ dev_warn(hdmi->dev, "different input format 0x%04x & output format 0x%04x while CSC isn't usable, fallback to safe format\n",
+ bridge_state->input_bus_cfg.format,
+ bridge_state->output_bus_cfg.format);
+ hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_FIXED;
+ hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_FIXED;
+ } else {
+ hdmi->hdmi_data.enc_out_bus_format =
+ bridge_state->output_bus_cfg.format;
- hdmi->hdmi_data.enc_in_bus_format =
- bridge_state->input_bus_cfg.format;
+ hdmi->hdmi_data.enc_in_bus_format =
+ bridge_state->input_bus_cfg.format;
- dev_dbg(hdmi->dev, "input format 0x%04x, output format 0x%04x\n",
- bridge_state->input_bus_cfg.format,
- bridge_state->output_bus_cfg.format);
+ dev_dbg(hdmi->dev, "input format 0x%04x, output format 0x%04x\n",
+ bridge_state->input_bus_cfg.format,
+ bridge_state->output_bus_cfg.format);
+ }
return 0;
}
@@ -3481,6 +3516,9 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
hdmi->cec = platform_device_register_full(&pdevinfo);
}
+ /* Get CSC useability from config0 register and permit override for platforms */
+ hdmi->csc_available = !plat_data->disable_csc || (config0 & HDMI_CONFIG0_CSC);
+
drm_bridge_add(&hdmi->bridge);
return hdmi;
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
index 1999db05bc3b2..279722e4d1898 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
@@ -541,6 +541,7 @@ enum {
/* CONFIG0_ID field values */
HDMI_CONFIG0_I2S = 0x10,
+ HDMI_CONFIG0_CSC = 0x04,
HDMI_CONFIG0_CEC = 0x02,
/* CONFIG1_ID field values */
diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index 2a1f85f9a8a3f..b2f689cbe864c 100644
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
@@ -157,6 +157,7 @@ struct dw_hdmi_plat_data {
unsigned long mpixelclock);
unsigned int disable_cec : 1;
+ unsigned int disable_csc : 1;
};
struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
--
2.33.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v17 4/6] drm/bridge: dw-hdmi: handle unusable or non-configured CSC module
2022-04-06 16:26 ` [PATCH v17 4/6] drm/bridge: dw-hdmi: handle unusable or non-configured CSC module H. Nikolaus Schaller
@ 2022-04-07 8:28 ` Neil Armstrong
2022-04-07 11:15 ` H. Nikolaus Schaller
0 siblings, 1 reply; 13+ messages in thread
From: Neil Armstrong @ 2022-04-07 8:28 UTC (permalink / raw)
To: H. Nikolaus Schaller, Andrzej Hajda, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Kieran Bingham
Cc: letux-kernel, linux-mips, linux-kernel, dri-devel, Jonas Karlman
Hi,
On 06/04/2022 18:26, H. Nikolaus Schaller wrote:
> From: Neil Armstrong <narmstrong@baylibre.com>
>
> The dw-hdmi integrates an optional Color Space Conversion feature used
> to handle color-space conversions.
>
> On some platforms, the CSC isn't built-in or non-functional.
>
> This adds the necessary code to disable the CSC functionality
> and limit the bus format negotiation to force using the same
> input bus format as the output bus format.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 100 +++++++++++++++-------
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 1 +
> include/drm/bridge/dw_hdmi.h | 1 +
> 3 files changed, 71 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index f50af40e10340..b5a665c5e406e 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -158,6 +158,8 @@ struct dw_hdmi {
> struct hdmi_data_info hdmi_data;
> const struct dw_hdmi_plat_data *plat_data;
>
> + bool csc_available; /* indicates if the CSC engine is usable */
> +
> int vic;
>
> u8 edid[HDMI_EDID_LEN];
> @@ -1009,9 +1011,10 @@ static int is_color_space_interpolation(struct dw_hdmi *hdmi)
>
> static bool is_csc_needed(struct dw_hdmi *hdmi)
> {
> - return is_color_space_conversion(hdmi) ||
> - is_color_space_decimation(hdmi) ||
> - is_color_space_interpolation(hdmi);
> + return hdmi->csc_available &&
> + (is_color_space_conversion(hdmi) ||
> + is_color_space_decimation(hdmi) ||
> + is_color_space_interpolation(hdmi));
> }
>
> static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi)
> @@ -1064,6 +1067,9 @@ static void hdmi_video_csc(struct dw_hdmi *hdmi)
> int interpolation = HDMI_CSC_CFG_INTMODE_DISABLE;
> int decimation = 0;
>
> + if (!hdmi->csc_available)
> + return;
> +
> /* YCC422 interpolation to 444 mode */
> if (is_color_space_interpolation(hdmi))
> interpolation = HDMI_CSC_CFG_INTMODE_CHROMA_INT_FORMULA1;
> @@ -2665,6 +2671,7 @@ static u32 *dw_hdmi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
> u32 output_fmt,
> unsigned int *num_input_fmts)
> {
> + struct dw_hdmi *hdmi = bridge->driver_private;
> u32 *input_fmts;
> unsigned int i = 0;
>
> @@ -2683,62 +2690,81 @@ static u32 *dw_hdmi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
> /* 8bit */
> case MEDIA_BUS_FMT_RGB888_1X24:
> input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
> - input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
> + if (hdmi->csc_available) {
> + input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
> + }
> break;
> case MEDIA_BUS_FMT_YUV8_1X24:
> input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
> - input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
> + if (hdmi->csc_available) {
> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
> + input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
> + }
> break;
> case MEDIA_BUS_FMT_UYVY8_1X16:
> input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
> - input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
> - input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
> + if (hdmi->csc_available) {
> + input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
> + input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
> + }
> break;
>
> /* 10bit */
> case MEDIA_BUS_FMT_RGB101010_1X30:
> input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
> - input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
> + if (hdmi->csc_available) {
> + input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
> + }
> break;
> case MEDIA_BUS_FMT_YUV10_1X30:
> input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
> - input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
> + if (hdmi->csc_available) {
> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
> + input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
> + }
> break;
> case MEDIA_BUS_FMT_UYVY10_1X20:
> input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
> - input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
> - input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
> + if (hdmi->csc_available) {
> + input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
> + input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
> + }
> break;
>
> /* 12bit */
> case MEDIA_BUS_FMT_RGB121212_1X36:
> input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
> - input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
> + if (hdmi->csc_available) {
> + input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
> + }
> break;
> case MEDIA_BUS_FMT_YUV12_1X36:
> input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
> - input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
> + if (hdmi->csc_available) {
> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
> + input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
> + }
> break;
> case MEDIA_BUS_FMT_UYVY12_1X24:
> input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
> - input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
> - input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
> + if (hdmi->csc_available) {
> + input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
> + input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
> + }
> break;
>
> /* 16bit */
> case MEDIA_BUS_FMT_RGB161616_1X48:
> input_fmts[i++] = MEDIA_BUS_FMT_RGB161616_1X48;
> - input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
> + if (hdmi->csc_available)
> + input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
> break;
> case MEDIA_BUS_FMT_YUV16_1X48:
> - input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
> - input_fmts[i++] = MEDIA_BUS_FMT_RGB161616_1X48;
> + if (hdmi->csc_available)
> + input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
> break;
>
> /*YUV 4:2:0 */
> @@ -2767,15 +2793,24 @@ static int dw_hdmi_bridge_atomic_check(struct drm_bridge *bridge,
> {
> struct dw_hdmi *hdmi = bridge->driver_private;
>
> - hdmi->hdmi_data.enc_out_bus_format =
> - bridge_state->output_bus_cfg.format;
> + if (!hdmi->csc_available &&
> + bridge_state->output_bus_cfg.format != bridge_state->input_bus_cfg.format) {
> + dev_warn(hdmi->dev, "different input format 0x%04x & output format 0x%04x while CSC isn't usable, fallback to safe format\n",
> + bridge_state->input_bus_cfg.format,
> + bridge_state->output_bus_cfg.format);
> + hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_FIXED;
> + hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_FIXED;
> + } else {
> + hdmi->hdmi_data.enc_out_bus_format =
> + bridge_state->output_bus_cfg.format;
>
> - hdmi->hdmi_data.enc_in_bus_format =
> - bridge_state->input_bus_cfg.format;
> + hdmi->hdmi_data.enc_in_bus_format =
> + bridge_state->input_bus_cfg.format;
>
> - dev_dbg(hdmi->dev, "input format 0x%04x, output format 0x%04x\n",
> - bridge_state->input_bus_cfg.format,
> - bridge_state->output_bus_cfg.format);
> + dev_dbg(hdmi->dev, "input format 0x%04x, output format 0x%04x\n",
> + bridge_state->input_bus_cfg.format,
> + bridge_state->output_bus_cfg.format);
> + }
>
> return 0;
> }
> @@ -3481,6 +3516,9 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
> hdmi->cec = platform_device_register_full(&pdevinfo);
> }
>
> + /* Get CSC useability from config0 register and permit override for platforms */
> + hdmi->csc_available = !plat_data->disable_csc || (config0 & HDMI_CONFIG0_CSC);
> +
> drm_bridge_add(&hdmi->bridge);
>
> return hdmi;
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
> index 1999db05bc3b2..279722e4d1898 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
> @@ -541,6 +541,7 @@ enum {
>
> /* CONFIG0_ID field values */
> HDMI_CONFIG0_I2S = 0x10,
> + HDMI_CONFIG0_CSC = 0x04,
> HDMI_CONFIG0_CEC = 0x02,
>
> /* CONFIG1_ID field values */
> diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
> index 2a1f85f9a8a3f..b2f689cbe864c 100644
> --- a/include/drm/bridge/dw_hdmi.h
> +++ b/include/drm/bridge/dw_hdmi.h
> @@ -157,6 +157,7 @@ struct dw_hdmi_plat_data {
> unsigned long mpixelclock);
>
> unsigned int disable_cec : 1;
> + unsigned int disable_csc : 1;
> };
>
> struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
Is this really still needed now you filter correctly the possible
modes in patch 1 ?
Neil
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v17 4/6] drm/bridge: dw-hdmi: handle unusable or non-configured CSC module
2022-04-07 8:28 ` Neil Armstrong
@ 2022-04-07 11:15 ` H. Nikolaus Schaller
0 siblings, 0 replies; 13+ messages in thread
From: H. Nikolaus Schaller @ 2022-04-07 11:15 UTC (permalink / raw)
To: Neil Armstrong
Cc: Andrzej Hajda, Robert Foss, Paul Boddie, Laurent Pinchart,
Jernej Skrabec, David Airlie, Daniel Vetter, Paul Cercueil,
Maxime Ripard, Kieran Bingham, letux-kernel, linux-mips,
linux-kernel, dri-devel, Jonas Karlman
Hi Neil,
> Am 07.04.2022 um 10:28 schrieb Neil Armstrong <narmstrong@baylibre.com>:
>
> Hi,
>
> On 06/04/2022 18:26, H. Nikolaus Schaller wrote:
>> From: Neil Armstrong <narmstrong@baylibre.com>
>> The dw-hdmi integrates an optional Color Space Conversion feature used
>> to handle color-space conversions.
>> On some platforms, the CSC isn't built-in or non-functional.
>> This adds the necessary code to disable the CSC functionality
>> and limit the bus format negotiation to force using the same
>> input bus format as the output bus format.
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
>> ---
>> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 100 +++++++++++++++-------
>> drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 1 +
>> include/drm/bridge/dw_hdmi.h | 1 +
>> 3 files changed, 71 insertions(+), 31 deletions(-)
>> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>> index f50af40e10340..b5a665c5e406e 100644
>> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>> @@ -158,6 +158,8 @@ struct dw_hdmi {
>> struct hdmi_data_info hdmi_data;
>> const struct dw_hdmi_plat_data *plat_data;
>> + bool csc_available; /* indicates if the CSC engine is usable */
>> +
>> int vic;
>> u8 edid[HDMI_EDID_LEN];
>> @@ -1009,9 +1011,10 @@ static int is_color_space_interpolation(struct dw_hdmi *hdmi)
>> static bool is_csc_needed(struct dw_hdmi *hdmi)
>> {
>> - return is_color_space_conversion(hdmi) ||
>> - is_color_space_decimation(hdmi) ||
>> - is_color_space_interpolation(hdmi);
>> + return hdmi->csc_available &&
>> + (is_color_space_conversion(hdmi) ||
>> + is_color_space_decimation(hdmi) ||
>> + is_color_space_interpolation(hdmi));
>> }
>> static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi)
>> @@ -1064,6 +1067,9 @@ static void hdmi_video_csc(struct dw_hdmi *hdmi)
>> int interpolation = HDMI_CSC_CFG_INTMODE_DISABLE;
>> int decimation = 0;
>> + if (!hdmi->csc_available)
>> + return;
>> +
>> /* YCC422 interpolation to 444 mode */
>> if (is_color_space_interpolation(hdmi))
>> interpolation = HDMI_CSC_CFG_INTMODE_CHROMA_INT_FORMULA1;
>> @@ -2665,6 +2671,7 @@ static u32 *dw_hdmi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
>> u32 output_fmt,
>> unsigned int *num_input_fmts)
>> {
>> + struct dw_hdmi *hdmi = bridge->driver_private;
>> u32 *input_fmts;
>> unsigned int i = 0;
>> @@ -2683,62 +2690,81 @@ static u32 *dw_hdmi_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
>> /* 8bit */
>> case MEDIA_BUS_FMT_RGB888_1X24:
>> input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
>> - input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
>> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
>> + if (hdmi->csc_available) {
>> + input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
>> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
>> + }
>> break;
>> case MEDIA_BUS_FMT_YUV8_1X24:
>> input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
>> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
>> - input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
>> + if (hdmi->csc_available) {
>> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
>> + input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
>> + }
>> break;
>> case MEDIA_BUS_FMT_UYVY8_1X16:
>> input_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
>> - input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
>> - input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
>> + if (hdmi->csc_available) {
>> + input_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
>> + input_fmts[i++] = MEDIA_BUS_FMT_RGB888_1X24;
>> + }
>> break;
>> /* 10bit */
>> case MEDIA_BUS_FMT_RGB101010_1X30:
>> input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
>> - input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
>> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
>> + if (hdmi->csc_available) {
>> + input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
>> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
>> + }
>> break;
>> case MEDIA_BUS_FMT_YUV10_1X30:
>> input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
>> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
>> - input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
>> + if (hdmi->csc_available) {
>> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
>> + input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
>> + }
>> break;
>> case MEDIA_BUS_FMT_UYVY10_1X20:
>> input_fmts[i++] = MEDIA_BUS_FMT_UYVY10_1X20;
>> - input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
>> - input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
>> + if (hdmi->csc_available) {
>> + input_fmts[i++] = MEDIA_BUS_FMT_YUV10_1X30;
>> + input_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
>> + }
>> break;
>> /* 12bit */
>> case MEDIA_BUS_FMT_RGB121212_1X36:
>> input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
>> - input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
>> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
>> + if (hdmi->csc_available) {
>> + input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
>> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
>> + }
>> break;
>> case MEDIA_BUS_FMT_YUV12_1X36:
>> input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
>> - input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
>> - input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
>> + if (hdmi->csc_available) {
>> + input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
>> + input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
>> + }
>> break;
>> case MEDIA_BUS_FMT_UYVY12_1X24:
>> input_fmts[i++] = MEDIA_BUS_FMT_UYVY12_1X24;
>> - input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
>> - input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
>> + if (hdmi->csc_available) {
>> + input_fmts[i++] = MEDIA_BUS_FMT_YUV12_1X36;
>> + input_fmts[i++] = MEDIA_BUS_FMT_RGB121212_1X36;
>> + }
>> break;
>> /* 16bit */
>> case MEDIA_BUS_FMT_RGB161616_1X48:
>> input_fmts[i++] = MEDIA_BUS_FMT_RGB161616_1X48;
>> - input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
>> + if (hdmi->csc_available)
>> + input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
>> break;
>> case MEDIA_BUS_FMT_YUV16_1X48:
>> - input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
>> - input_fmts[i++] = MEDIA_BUS_FMT_RGB161616_1X48;
>> + if (hdmi->csc_available)
>> + input_fmts[i++] = MEDIA_BUS_FMT_YUV16_1X48;
>> break;
>> /*YUV 4:2:0 */
>> @@ -2767,15 +2793,24 @@ static int dw_hdmi_bridge_atomic_check(struct drm_bridge *bridge,
>> {
>> struct dw_hdmi *hdmi = bridge->driver_private;
>> - hdmi->hdmi_data.enc_out_bus_format =
>> - bridge_state->output_bus_cfg.format;
>> + if (!hdmi->csc_available &&
>> + bridge_state->output_bus_cfg.format != bridge_state->input_bus_cfg.format) {
>> + dev_warn(hdmi->dev, "different input format 0x%04x & output format 0x%04x while CSC isn't usable, fallback to safe format\n",
>> + bridge_state->input_bus_cfg.format,
>> + bridge_state->output_bus_cfg.format);
>> + hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_FIXED;
>> + hdmi->hdmi_data.enc_in_bus_format = MEDIA_BUS_FMT_FIXED;
>> + } else {
>> + hdmi->hdmi_data.enc_out_bus_format =
>> + bridge_state->output_bus_cfg.format;
>> - hdmi->hdmi_data.enc_in_bus_format =
>> - bridge_state->input_bus_cfg.format;
>> + hdmi->hdmi_data.enc_in_bus_format =
>> + bridge_state->input_bus_cfg.format;
>> - dev_dbg(hdmi->dev, "input format 0x%04x, output format 0x%04x\n",
>> - bridge_state->input_bus_cfg.format,
>> - bridge_state->output_bus_cfg.format);
>> + dev_dbg(hdmi->dev, "input format 0x%04x, output format 0x%04x\n",
>> + bridge_state->input_bus_cfg.format,
>> + bridge_state->output_bus_cfg.format);
>> + }
>> return 0;
>> }
>> @@ -3481,6 +3516,9 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
>> hdmi->cec = platform_device_register_full(&pdevinfo);
>> }
>> + /* Get CSC useability from config0 register and permit override for platforms */
>> + hdmi->csc_available = !plat_data->disable_csc || (config0 & HDMI_CONFIG0_CSC);
>> +
>> drm_bridge_add(&hdmi->bridge);
>> return hdmi;
>> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
>> index 1999db05bc3b2..279722e4d1898 100644
>> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
>> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
>> @@ -541,6 +541,7 @@ enum {
>> /* CONFIG0_ID field values */
>> HDMI_CONFIG0_I2S = 0x10,
>> + HDMI_CONFIG0_CSC = 0x04,
>> HDMI_CONFIG0_CEC = 0x02,
>> /* CONFIG1_ID field values */
>> diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
>> index 2a1f85f9a8a3f..b2f689cbe864c 100644
>> --- a/include/drm/bridge/dw_hdmi.h
>> +++ b/include/drm/bridge/dw_hdmi.h
>> @@ -157,6 +157,7 @@ struct dw_hdmi_plat_data {
>> unsigned long mpixelclock);
>> unsigned int disable_cec : 1;
>> + unsigned int disable_csc : 1;
>> };
>> struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
>
> Is this really still needed now you filter correctly the possible
> modes in patch 1 ?
I had not tried to remove them because they were needed in [PATCH v16]
but indeed they are no longer needed. Something (which I personally
don't understand) may have blocked it so far, but it is not worth
further analyses.
So we can shrink the series and no need to touch drm/bridge: dw-hdmi:
any more!
I'll now post a new v18.
BR and thanks for review,
Nikolaus
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v17 5/6] drm/bridge: dw-hdmi: add YCBCR formats only if CSC is available
2022-04-06 16:26 [PATCH v17 0/6] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
` (3 preceding siblings ...)
2022-04-06 16:26 ` [PATCH v17 4/6] drm/bridge: dw-hdmi: handle unusable or non-configured CSC module H. Nikolaus Schaller
@ 2022-04-06 16:26 ` H. Nikolaus Schaller
2022-04-07 8:29 ` Neil Armstrong
2022-04-06 16:26 ` [PATCH v17 6/6] drm/bridge: display-connector: add ddc-en gpio support H. Nikolaus Schaller
5 siblings, 1 reply; 13+ messages in thread
From: H. Nikolaus Schaller @ 2022-04-06 16:26 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, H. Nikolaus Schaller,
Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
otherwise they will produce a black HDMI screen.
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index b5a665c5e406e..ec40dd8865065 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -2628,10 +2628,12 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
}
- if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ if (hdmi->csc_available && hdmi->sink_is_hdmi &&
+ (info->color_formats & DRM_COLOR_FORMAT_YCBCR422))
output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
- if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (hdmi->csc_available && hdmi->sink_is_hdmi &&
+ (info->color_formats & DRM_COLOR_FORMAT_YCBCR444))
output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
/* Default 8bit RGB fallback */
--
2.33.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v17 5/6] drm/bridge: dw-hdmi: add YCBCR formats only if CSC is available
2022-04-06 16:26 ` [PATCH v17 5/6] drm/bridge: dw-hdmi: add YCBCR formats only if CSC is available H. Nikolaus Schaller
@ 2022-04-07 8:29 ` Neil Armstrong
2022-04-07 11:15 ` H. Nikolaus Schaller
0 siblings, 1 reply; 13+ messages in thread
From: Neil Armstrong @ 2022-04-07 8:29 UTC (permalink / raw)
To: H. Nikolaus Schaller, Andrzej Hajda, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Kieran Bingham
Cc: letux-kernel, linux-mips, linux-kernel, dri-devel, Jonas Karlman
On 06/04/2022 18:26, H. Nikolaus Schaller wrote:
> otherwise they will produce a black HDMI screen.
>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index b5a665c5e406e..ec40dd8865065 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -2628,10 +2628,12 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
> output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
> }
>
> - if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
> + if (hdmi->csc_available && hdmi->sink_is_hdmi &&
> + (info->color_formats & DRM_COLOR_FORMAT_YCBCR422))
> output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
>
> - if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
> + if (hdmi->csc_available && hdmi->sink_is_hdmi &&
> + (info->color_formats & DRM_COLOR_FORMAT_YCBCR444))
> output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
>
> /* Default 8bit RGB fallback */
This patch shouldn't be needed anymore with proper filtering in patch 1.
Neil
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v17 5/6] drm/bridge: dw-hdmi: add YCBCR formats only if CSC is available
2022-04-07 8:29 ` Neil Armstrong
@ 2022-04-07 11:15 ` H. Nikolaus Schaller
0 siblings, 0 replies; 13+ messages in thread
From: H. Nikolaus Schaller @ 2022-04-07 11:15 UTC (permalink / raw)
To: Neil Armstrong
Cc: Andrzej Hajda, Robert Foss, Paul Boddie, Laurent Pinchart,
Jernej Skrabec, David Airlie, Daniel Vetter, Paul Cercueil,
Maxime Ripard, Kieran Bingham, letux-kernel, linux-mips,
linux-kernel, dri-devel, Jonas Karlman
> Am 07.04.2022 um 10:29 schrieb Neil Armstrong <narmstrong@baylibre.com>:
>
> On 06/04/2022 18:26, H. Nikolaus Schaller wrote:
>> otherwise they will produce a black HDMI screen.
>> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
>> ---
>> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>> index b5a665c5e406e..ec40dd8865065 100644
>> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>> @@ -2628,10 +2628,12 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
>> output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
>> }
>> - if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
>> + if (hdmi->csc_available && hdmi->sink_is_hdmi &&
>> + (info->color_formats & DRM_COLOR_FORMAT_YCBCR422))
>> output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
>> - if (hdmi->sink_is_hdmi && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
>> + if (hdmi->csc_available && hdmi->sink_is_hdmi &&
>> + (info->color_formats & DRM_COLOR_FORMAT_YCBCR444))
>> output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
>> /* Default 8bit RGB fallback */
>
> This patch shouldn't be needed anymore with proper filtering in patch 1.
It can indeed be removed as well.
BR and thanks,
Nikolaus
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v17 6/6] drm/bridge: display-connector: add ddc-en gpio support
2022-04-06 16:26 [PATCH v17 0/6] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
` (4 preceding siblings ...)
2022-04-06 16:26 ` [PATCH v17 5/6] drm/bridge: dw-hdmi: add YCBCR formats only if CSC is available H. Nikolaus Schaller
@ 2022-04-06 16:26 ` H. Nikolaus Schaller
2022-04-07 7:30 ` Laurent Pinchart
5 siblings, 1 reply; 13+ messages in thread
From: H. Nikolaus Schaller @ 2022-04-06 16:26 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, H. Nikolaus Schaller,
Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
"hdmi-connector.yaml" bindings defines an optional property
"ddc-en-gpios" for a single gpio to enable DDC operation.
Usually this controls +5V power on the HDMI connector.
This +5V may also be needed for HPD.
This was not reflected in code but is needed to make the CI20
board work.
Now, the driver activates the ddc gpio after probe and
deactivates after remove so it is "almost on".
But only if this driver is loaded (and not e.g. blacklisted
as module).
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/bridge/display-connector.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c
index d24f5b90feabf..e4d52a7e31b71 100644
--- a/drivers/gpu/drm/bridge/display-connector.c
+++ b/drivers/gpu/drm/bridge/display-connector.c
@@ -24,6 +24,7 @@ struct display_connector {
int hpd_irq;
struct regulator *dp_pwr;
+ struct gpio_desc *ddc_en;
};
static inline struct display_connector *
@@ -345,6 +346,17 @@ static int display_connector_probe(struct platform_device *pdev)
}
}
+ /* enable DDC */
+ if (type == DRM_MODE_CONNECTOR_HDMIA) {
+ conn->ddc_en = devm_gpiod_get_optional(&pdev->dev, "ddc-en",
+ GPIOD_OUT_HIGH);
+
+ if (IS_ERR(conn->ddc_en)) {
+ dev_err(&pdev->dev, "Couldn't get ddc-en gpio\n");
+ return PTR_ERR(conn->ddc_en);
+ }
+ }
+
conn->bridge.funcs = &display_connector_bridge_funcs;
conn->bridge.of_node = pdev->dev.of_node;
@@ -373,6 +385,9 @@ static int display_connector_remove(struct platform_device *pdev)
{
struct display_connector *conn = platform_get_drvdata(pdev);
+ if (conn->ddc_en)
+ gpiod_set_value(conn->ddc_en, 0);
+
if (conn->dp_pwr)
regulator_disable(conn->dp_pwr);
--
2.33.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v17 6/6] drm/bridge: display-connector: add ddc-en gpio support
2022-04-06 16:26 ` [PATCH v17 6/6] drm/bridge: display-connector: add ddc-en gpio support H. Nikolaus Schaller
@ 2022-04-07 7:30 ` Laurent Pinchart
2022-04-07 11:15 ` H. Nikolaus Schaller
0 siblings, 1 reply; 13+ messages in thread
From: Laurent Pinchart @ 2022-04-07 7:30 UTC (permalink / raw)
To: H. Nikolaus Schaller
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Jernej Skrabec, David Airlie, Daniel Vetter, Paul Cercueil,
Maxime Ripard, Kieran Bingham, Jonas Karlman, linux-kernel,
dri-devel, linux-mips, letux-kernel
Hi Nikolaus,
Thank you for the patch.
On Wed, Apr 06, 2022 at 06:26:08PM +0200, H. Nikolaus Schaller wrote:
> "hdmi-connector.yaml" bindings defines an optional property
> "ddc-en-gpios" for a single gpio to enable DDC operation.
>
> Usually this controls +5V power on the HDMI connector.
> This +5V may also be needed for HPD.
>
> This was not reflected in code but is needed to make the CI20
> board work.
>
> Now, the driver activates the ddc gpio after probe and
> deactivates after remove so it is "almost on".
>
> But only if this driver is loaded (and not e.g. blacklisted
> as module).
>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/gpu/drm/bridge/display-connector.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c
> index d24f5b90feabf..e4d52a7e31b71 100644
> --- a/drivers/gpu/drm/bridge/display-connector.c
> +++ b/drivers/gpu/drm/bridge/display-connector.c
> @@ -24,6 +24,7 @@ struct display_connector {
> int hpd_irq;
>
> struct regulator *dp_pwr;
> + struct gpio_desc *ddc_en;
> };
>
> static inline struct display_connector *
> @@ -345,6 +346,17 @@ static int display_connector_probe(struct platform_device *pdev)
> }
> }
>
> + /* enable DDC */
> + if (type == DRM_MODE_CONNECTOR_HDMIA) {
> + conn->ddc_en = devm_gpiod_get_optional(&pdev->dev, "ddc-en",
> + GPIOD_OUT_HIGH);
> +
> + if (IS_ERR(conn->ddc_en)) {
> + dev_err(&pdev->dev, "Couldn't get ddc-en gpio\n");
> + return PTR_ERR(conn->ddc_en);
> + }
> + }
> +
> conn->bridge.funcs = &display_connector_bridge_funcs;
> conn->bridge.of_node = pdev->dev.of_node;
>
> @@ -373,6 +385,9 @@ static int display_connector_remove(struct platform_device *pdev)
> {
> struct display_connector *conn = platform_get_drvdata(pdev);
>
> + if (conn->ddc_en)
> + gpiod_set_value(conn->ddc_en, 0);
> +
> if (conn->dp_pwr)
> regulator_disable(conn->dp_pwr);
>
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v17 6/6] drm/bridge: display-connector: add ddc-en gpio support
2022-04-07 7:30 ` Laurent Pinchart
@ 2022-04-07 11:15 ` H. Nikolaus Schaller
0 siblings, 0 replies; 13+ messages in thread
From: H. Nikolaus Schaller @ 2022-04-07 11:15 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Jernej Skrabec, David Airlie, Daniel Vetter, Paul Cercueil,
Maxime Ripard, Kieran Bingham, Jonas Karlman, linux-kernel,
dri-devel, linux-mips, letux-kernel
Hi Laurent,
> Am 07.04.2022 um 09:30 schrieb Laurent Pinchart <laurent.pinchart@ideasonboard.com>:
>
> Hi Nikolaus,
>
> Thank you for the patch.
>
> On Wed, Apr 06, 2022 at 06:26:08PM +0200, H. Nikolaus Schaller wrote:
>> "hdmi-connector.yaml" bindings defines an optional property
>> "ddc-en-gpios" for a single gpio to enable DDC operation.
>>
>> Usually this controls +5V power on the HDMI connector.
>> This +5V may also be needed for HPD.
>>
>> This was not reflected in code but is needed to make the CI20
>> board work.
>>
>> Now, the driver activates the ddc gpio after probe and
>> deactivates after remove so it is "almost on".
>>
>> But only if this driver is loaded (and not e.g. blacklisted
>> as module).
>>
>> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Added to v18 (which is needed to remove some now redundant patches
and fix a detail in the ingenic-drm driver).
BR and thanks for review,
Nikolaus
^ permalink raw reply [flat|nested] 13+ messages in thread