From: Greg Kroah-Hartman Date: Fri, 12 Apr 2024 08:30:40 +0000 (+0200) Subject: drop queue-4.19/drm-imx-parallel-display-remove-bus-flags-check-in-imx_pd_bridge_atom... X-Git-Tag: v4.19.312~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c3adc299c16265b318bb953c3b2cb992491c660;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/drm-imx-parallel-display-remove-bus-flags-check-in-imx_pd_bridge_atomic_check.patch --- diff --git a/queue-4.19/drm-imx-parallel-display-remove-bus-flags-check-in-imx_pd_bridge_atomic_check.patch b/queue-4.19/drm-imx-parallel-display-remove-bus-flags-check-in-imx_pd_bridge_atomic_check.patch deleted file mode 100644 index dc812b0cbb3..00000000000 --- a/queue-4.19/drm-imx-parallel-display-remove-bus-flags-check-in-imx_pd_bridge_atomic_check.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 6061806a863e8b65b109eb06a280041cc7525442 Mon Sep 17 00:00:00 2001 -From: Christoph Niedermaier -Date: Tue, 1 Feb 2022 12:36:43 +0100 -Subject: drm/imx: parallel-display: Remove bus flags check in imx_pd_bridge_atomic_check() - -From: Christoph Niedermaier - -commit 6061806a863e8b65b109eb06a280041cc7525442 upstream. - -If display timings were read from the devicetree using -of_get_display_timing() and pixelclk-active is defined -there, the flag DISPLAY_FLAGS_SYNC_POSEDGE/NEGEDGE is -automatically generated. Through the function -drm_bus_flags_from_videomode() e.g. called in the -panel-simple driver this flag got into the bus flags, -but then in imx_pd_bridge_atomic_check() the bus flag -check failed and will not initialize the display. The -original commit fe141cedc433 does not explain why this -check was introduced. So remove the bus flags check, -because it stops the initialization of the display with -valid bus flags. - -Fixes: fe141cedc433 ("drm/imx: pd: Use bus format/flags provided by the bridge when available") -Signed-off-by: Christoph Niedermaier -Cc: Marek Vasut -Cc: Boris Brezillon -Cc: Philipp Zabel -Cc: David Airlie -Cc: Daniel Vetter -Cc: Shawn Guo -Cc: Sascha Hauer -Cc: Pengutronix Kernel Team -Cc: Fabio Estevam -Cc: NXP Linux Team -Cc: linux-arm-kernel@lists.infradead.org -To: dri-devel@lists.freedesktop.org -Tested-by: Max Krummenacher -Acked-by: Boris Brezillon -Signed-off-by: Marek Vasut -Link: https://patchwork.freedesktop.org/patch/msgid/20220201113643.4638-1-cniedermaier@dh-electronics.com -Signed-off-by: Maarten Lankhorst -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/imx/parallel-display.c | 8 -------- - 1 file changed, 8 deletions(-) - ---- a/drivers/gpu/drm/imx/parallel-display.c -+++ b/drivers/gpu/drm/imx/parallel-display.c -@@ -235,14 +235,6 @@ static int imx_pd_bridge_atomic_check(st - if (!imx_pd_format_supported(bus_fmt)) - return -EINVAL; - -- if (bus_flags & -- ~(DRM_BUS_FLAG_DE_LOW | DRM_BUS_FLAG_DE_HIGH | -- DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE | -- DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)) { -- dev_warn(imxpd->dev, "invalid bus_flags (%x)\n", bus_flags); -- return -EINVAL; -- } -- - bridge_state->output_bus_cfg.flags = bus_flags; - bridge_state->input_bus_cfg.flags = bus_flags; - imx_crtc_state->bus_flags = bus_flags; diff --git a/queue-4.19/series b/queue-4.19/series index e4903510823..a9a0e826d27 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -105,7 +105,6 @@ usb-udc-remove-warning-when-queue-disabled-ep.patch scsi-qla2xxx-fix-command-flush-on-cable-pull.patch x86-cpu-enable-stibp-on-amd-if-automatic-ibrs-is-enabled.patch timers-move-clearing-of-base-timer_running-under-base-lock.patch -drm-imx-parallel-display-remove-bus-flags-check-in-imx_pd_bridge_atomic_check.patch scsi-lpfc-correct-size-for-wqe-for-memset.patch usb-core-fix-deadlock-in-usb_deauthorize_interface.patch nfc-nci-fix-uninit-value-in-nci_dev_up-and-nci_ntf_p.patch