From 215866e3c87e9ea8f22e4e20fe0ce47787de78ce Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2024 11:30:25 +0100 Subject: [PATCH 1/2] drm/vc4: dpi: Add override for RGB order There are no MEDIA_BUS_FMT_* defines for GRB or BRG, and adding them is a pain. Add a DT override to allow setting the order. Signed-off-by: Dave Stevenson --- drivers/gpu/drm/vc4/vc4_dpi.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c index 39152e755a13e4..305a34e8213928 100644 --- a/drivers/gpu/drm/vc4/vc4_dpi.c +++ b/drivers/gpu/drm/vc4/vc4_dpi.c @@ -95,6 +95,8 @@ struct vc4_dpi { struct clk *core_clock; struct debugfs_regset32 regset; + + int rgb_order_override; }; #define to_vc4_dpi(_encoder) \ @@ -205,6 +207,11 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder) } } + if (dpi->rgb_order_override >= 0) { + dpi_c &= ~DPI_ORDER_MASK; + dpi_c |= VC4_SET_FIELD(dpi->rgb_order_override, DPI_ORDER); + } + if (connector->display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE) dpi_c |= DPI_PIXEL_CLK_INVERT; @@ -313,6 +320,7 @@ static int vc4_dpi_bind(struct device *dev, struct device *master, void *data) { struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); + const char *rgb_order = NULL; struct vc4_dpi *dpi; int ret; @@ -361,6 +369,20 @@ static int vc4_dpi_bind(struct device *dev, struct device *master, void *data) if (ret) return ret; + dpi->rgb_order_override = -1; + if (!of_property_read_string(dev->of_node, "rgb_order", &rgb_order)) { + if (!strcmp(rgb_order, "rgb")) + dpi->rgb_order_override = DPI_ORDER_RGB; + else if (!strcmp(rgb_order, "bgr")) + dpi->rgb_order_override = DPI_ORDER_BGR; + else if (!strcmp(rgb_order, "grb")) + dpi->rgb_order_override = DPI_ORDER_GRB; + else if (!strcmp(rgb_order, "brg")) + dpi->rgb_order_override = DPI_ORDER_BRG; + else + DRM_ERROR("Invalid dpi order %s - ignored\n", rgb_order); + } + ret = drmm_encoder_init(drm, &dpi->encoder.base, &vc4_dpi_encoder_funcs, DRM_MODE_ENCODER_DPI, From cb5761095b1671fcd9ed59e467d4bec9622966a7 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 10 May 2024 11:31:44 +0100 Subject: [PATCH 2/2] dtoverlay: Add rgb-order override for vc4-kms-dpi-generic Sets the new DT property for rgb-order. Signed-off-by: Dave Stevenson --- arch/arm/boot/dts/overlays/README | 4 ++++ arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts | 1 + 2 files changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index 7cb552f4784aa4..b08b49d2873748 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -4988,6 +4988,10 @@ Params: clock-frequency Display clock frequency (Hz) Set the default brightness. Normal range 1-16. (default 16). rotate Display rotation {0,90,180,270} (default 0) + rgb-order Allow override of RGB order from DPI. + Options for vc4 are "rgb", "bgr", "grb", and + "brg". Other values will be ignored. + Name: vc4-kms-dpi-hyperpixel2r diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts index 8b006fcd9e58d2..f599e2a743adcb 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts @@ -77,5 +77,6 @@ rgb888 = <&panel_generic>, "bus-format:0=0x100a", <&dpi_node_generic>, "pinctrl-0:0=",<&dpi_gpio0>; bus-format = <&panel_generic>, "bus-format:0"; + rgb-order = <&dpi_node_generic>, "rgb_order"; }; };