mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
63 lines
1.9 KiB
Diff
63 lines
1.9 KiB
Diff
From 6471977d8ec8ebbbc836f5fb24f506264ffa603c Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Thu, 22 Jul 2021 15:27:27 +0100
|
|
Subject: [PATCH 512/552] Revert "drm/vc4: hdmi: Make sure the controller is
|
|
powered up during bind"
|
|
|
|
This reverts commit 94bc403a9a7af3bd042ecdc160e6ab0b08331df8.
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 17 ++---------------
|
|
1 file changed, 2 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
index 090a224c06fa..01de714424f2 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -2305,18 +2305,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
|
|
vc4_hdmi->disable_4kp60 = true;
|
|
}
|
|
|
|
- /*
|
|
- * We need to have the device powered up at this point to call
|
|
- * our reset hook and for the CEC init.
|
|
- */
|
|
- ret = vc4_hdmi_runtime_resume(dev);
|
|
- if (ret)
|
|
- goto err_put_ddc;
|
|
-
|
|
- pm_runtime_get_noresume(dev);
|
|
- pm_runtime_set_active(dev);
|
|
- pm_runtime_enable(dev);
|
|
-
|
|
if (vc4_hdmi->variant->reset)
|
|
vc4_hdmi->variant->reset(vc4_hdmi);
|
|
|
|
@@ -2328,6 +2316,8 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
|
|
clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
|
|
}
|
|
|
|
+ pm_runtime_enable(dev);
|
|
+
|
|
drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
|
|
drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs);
|
|
|
|
@@ -2351,8 +2341,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
|
|
vc4_hdmi_debugfs_regs,
|
|
vc4_hdmi);
|
|
|
|
- pm_runtime_put_sync(dev);
|
|
-
|
|
return 0;
|
|
|
|
err_free_cec:
|
|
@@ -2363,7 +2351,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
|
|
vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
|
|
err_destroy_encoder:
|
|
drm_encoder_cleanup(encoder);
|
|
- pm_runtime_put_sync(dev);
|
|
pm_runtime_disable(dev);
|
|
err_put_ddc:
|
|
put_device(&vc4_hdmi->ddc->dev);
|
|
--
|
|
2.33.0
|
|
|