mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-20 14:38:20 +02:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From 33e8e066af31c3af1d18d615f5e8ab5e528e0000 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Wed, 21 Apr 2021 15:15:42 +0100
|
|
Subject: [PATCH] vc4/drm: hdmi: Handle case when bvb clock is null
|
|
|
|
Pi2/3 have no bvb clock but want the other clocks to remain enabled here
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/4299
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -608,7 +608,8 @@ static void vc4_hdmi_encoder_post_crtc_p
|
|
HDMI_READ(HDMI_VID_CTL) & ~VC4_HD_VID_CTL_ENABLE);
|
|
|
|
clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock);
|
|
- clk_request_done(vc4_hdmi->bvb_req);
|
|
+ if (vc4_hdmi->bvb_req)
|
|
+ clk_request_done(vc4_hdmi->bvb_req);
|
|
clk_disable_unprepare(vc4_hdmi->hsm_clock);
|
|
clk_request_done(vc4_hdmi->hsm_req);
|
|
clk_disable_unprepare(vc4_hdmi->pixel_clock);
|
|
@@ -932,7 +933,8 @@ static void vc4_hdmi_encoder_pre_crtc_co
|
|
else
|
|
bvb_rate = 75000000;
|
|
|
|
- vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
|
|
+ if (vc4_hdmi->pixel_bvb_clock)
|
|
+ vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
|
|
if (IS_ERR(vc4_hdmi->bvb_req)) {
|
|
DRM_ERROR("Failed to set pixel bvb clock rate: %ld\n", PTR_ERR(vc4_hdmi->bvb_req));
|
|
clk_request_done(vc4_hdmi->hsm_req);
|
|
@@ -944,7 +946,8 @@ static void vc4_hdmi_encoder_pre_crtc_co
|
|
ret = clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
|
|
if (ret) {
|
|
DRM_ERROR("Failed to turn on pixel bvb clock: %d\n", ret);
|
|
- clk_request_done(vc4_hdmi->bvb_req);
|
|
+ if (vc4_hdmi->bvb_req)
|
|
+ clk_request_done(vc4_hdmi->bvb_req);
|
|
clk_request_done(vc4_hdmi->hsm_req);
|
|
clk_disable_unprepare(vc4_hdmi->hsm_clock);
|
|
clk_disable_unprepare(vc4_hdmi->pixel_clock);
|