From 2abddc877ae0b310eebed6397b90358edd583a34 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Aug 2022 15:37:55 +0200 Subject: [PATCH] 5.10-stable patches added patches: drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch --- ...dpoint-parsing-in-dedicated-function.patch | 48 +++++++++++++++++++ ...ange_matches-from-a-global-to-static.patch | 35 ++++++++++++++ queue-5.10/series | 2 + 3 files changed, 85 insertions(+) create mode 100644 queue-5.10/drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch create mode 100644 queue-5.10/drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch diff --git a/queue-5.10/drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch b/queue-5.10/drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch new file mode 100644 index 00000000000..c48a053d295 --- /dev/null +++ b/queue-5.10/drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch @@ -0,0 +1,48 @@ +From 9030a9e571b3ba250d3d450a98310e3c74ecaff4 Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Thu, 28 Apr 2022 23:31:32 +0200 +Subject: drm/bridge: tc358767: Fix (e)DP bridge endpoint parsing in dedicated function + +From: Marek Vasut + +commit 9030a9e571b3ba250d3d450a98310e3c74ecaff4 upstream. + +Per toshiba,tc358767.yaml DT binding document, port@2 the output (e)DP +port is optional. In case this port is not described in DT, the bridge +driver operates in DPI-to-DP mode. The drm_of_find_panel_or_bridge() +call in tc_probe_edp_bridge_endpoint() returns -ENODEV in case port@2 +is not present in DT and this specific return value is incorrectly +propagated outside of tc_probe_edp_bridge_endpoint() function. All +other error values must be propagated and are propagated correctly. + +Return 0 in case the port@2 is missing instead, that reinstates the +original behavior before the commit this patch fixes. + +Fixes: 8478095a8c4b ("drm/bridge: tc358767: Move (e)DP bridge endpoint parsing into dedicated function") +Signed-off-by: Marek Vasut +Cc: Jonas Karlman +Cc: Laurent Pinchart +Cc: Lucas Stach +Cc: Marek Vasut +Cc: Maxime Ripard +Cc: Neil Armstrong +Cc: Robert Foss +Cc: Sam Ravnborg +Reviewed-by: Lucas Stach +Link: https://patchwork.freedesktop.org/patch/msgid/20220428213132.447890-1-marex@denx.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/bridge/tc358767.c ++++ b/drivers/gpu/drm/bridge/tc358767.c +@@ -1559,7 +1559,7 @@ static int tc_probe_edp_bridge_endpoint( + tc->bridge.type = DRM_MODE_CONNECTOR_DisplayPort; + } + +- return ret; ++ return 0; + } + + static void tc_clk_disable(void *data) diff --git a/queue-5.10/drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch b/queue-5.10/drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch new file mode 100644 index 00000000000..973d6f163b5 --- /dev/null +++ b/queue-5.10/drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch @@ -0,0 +1,35 @@ +From 63569d90863ff26c8b10c8971d1271c17a45224b Mon Sep 17 00:00:00 2001 +From: Tom Rix +Date: Wed, 29 Jun 2022 16:01:01 -0400 +Subject: drm/vc4: change vc4_dma_range_matches from a global to static + +From: Tom Rix + +commit 63569d90863ff26c8b10c8971d1271c17a45224b upstream. + +sparse reports +drivers/gpu/drm/vc4/vc4_drv.c:270:27: warning: symbol 'vc4_dma_range_matches' was not declared. Should it be static? + +vc4_dma_range_matches is only used in vc4_drv.c, so it's storage class specifier +should be static. + +Fixes: da8e393e23ef ("drm/vc4: drv: Adopt the dma configuration from the HVS or V3D component") +Signed-off-by: Tom Rix +Signed-off-by: Maxime Ripard +Link: https://patchwork.freedesktop.org/patch/msgid/20220629200101.498138-1-trix@redhat.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/vc4/vc4_drv.c ++++ b/drivers/gpu/drm/vc4/vc4_drv.c +@@ -246,7 +246,7 @@ static void vc4_match_add_drivers(struct + } + } + +-const struct of_device_id vc4_dma_range_matches[] = { ++static const struct of_device_id vc4_dma_range_matches[] = { + { .compatible = "brcm,bcm2711-hvs" }, + { .compatible = "brcm,bcm2835-hvs" }, + { .compatible = "brcm,bcm2835-v3d" }, diff --git a/queue-5.10/series b/queue-5.10/series index fc5b6c0e334..311c0f4516c 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -540,3 +540,5 @@ kvm-x86-avoid-theoretical-null-pointer-dereference-in-kvm_irq_delivery_to_apic_f mac80211-fix-a-memory-leak-where-sta_info-is-not-freed.patch tcp-fix-over-estimation-in-sk_forced_mem_schedule.patch revert-mwifiex-fix-sleep-in-atomic-context-bugs-caused-by-dev_coredumpv.patch +drm-bridge-tc358767-fix-e-dp-bridge-endpoint-parsing-in-dedicated-function.patch +drm-vc4-change-vc4_dma_range_matches-from-a-global-to-static.patch -- 2.47.3