mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
84 lines
3.2 KiB
Diff
84 lines
3.2 KiB
Diff
From 6bf682bcdb546f382b7b4b2345884f3b2c743dd0 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Tue, 13 Apr 2021 11:55:55 +0200
|
|
Subject: [PATCH 493/552] drm/vc4: hdmi: Convert to the new clock request API
|
|
|
|
The new clock request API allows us to increase the rate of the HSM
|
|
clock to match our pixel rate requirements while decreasing it when
|
|
we're done, resulting in a better power-efficiency.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 20 ++++++++++++++------
|
|
drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +++
|
|
2 files changed, 17 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
index b3219755240e..5e45263339af 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -969,6 +969,9 @@ static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder,
|
|
vc4_hdmi->variant->phy_disable(vc4_hdmi);
|
|
|
|
clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock);
|
|
+ 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);
|
|
|
|
ret = pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
@@ -1258,9 +1261,9 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
|
|
* pixel clock, but HSM ends up being the limiting factor.
|
|
*/
|
|
hsm_rate = max_t(unsigned long, 120000000, (pixel_rate / 100) * 101);
|
|
- ret = clk_set_min_rate(vc4_hdmi->hsm_clock, hsm_rate);
|
|
- if (ret) {
|
|
- DRM_ERROR("Failed to set HSM clock rate: %d\n", ret);
|
|
+ vc4_hdmi->hsm_req = clk_request_start(vc4_hdmi->hsm_clock, hsm_rate);
|
|
+ if (IS_ERR(vc4_hdmi->hsm_req)) {
|
|
+ DRM_ERROR("Failed to set HSM clock rate: %ld\n", PTR_ERR(vc4_hdmi->hsm_req));
|
|
return;
|
|
}
|
|
|
|
@@ -1273,9 +1276,11 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
|
|
else
|
|
bvb_rate = 75000000;
|
|
|
|
- ret = clk_set_min_rate(vc4_hdmi->pixel_bvb_clock, bvb_rate);
|
|
- if (ret) {
|
|
- DRM_ERROR("Failed to set pixel bvb clock rate: %d\n", ret);
|
|
+ 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);
|
|
+ clk_disable_unprepare(vc4_hdmi->hsm_clock);
|
|
clk_disable_unprepare(vc4_hdmi->pixel_clock);
|
|
return;
|
|
}
|
|
@@ -1283,6 +1288,9 @@ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
|
|
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);
|
|
+ clk_request_done(vc4_hdmi->hsm_req);
|
|
+ clk_disable_unprepare(vc4_hdmi->hsm_clock);
|
|
clk_disable_unprepare(vc4_hdmi->pixel_clock);
|
|
return;
|
|
}
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
index 28007fc632bd..78651ab61fa8 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
@@ -184,6 +184,9 @@ struct vc4_hdmi {
|
|
|
|
struct reset_control *reset;
|
|
|
|
+ struct clk_request *bvb_req;
|
|
+ struct clk_request *hsm_req;
|
|
+
|
|
/* Common debugfs regset */
|
|
struct debugfs_regset32 hdmi_regset;
|
|
struct debugfs_regset32 hd_regset;
|
|
--
|
|
2.33.0
|
|
|