openwrt/target/linux/bcm27xx/patches-5.15/950-0863-Revert-drm-vc4-hdmi-Convert-to-the-new-clock-request.patch
Álvaro Fernández Rojas 20ea6adbf1 bcm27xx: add support for linux v5.15
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B

Signed-off-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2022-05-17 15:11:22 +02:00

40 lines
1.2 KiB
Diff

From 0e5138afb28dbfd4f9004a48c879cf9c0d27f2b9 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@cerno.tech>
Date: Wed, 16 Mar 2022 09:52:34 +0100
Subject: [PATCH] Revert "drm/vc4: hdmi: Convert to the new clock
request API"
This reverts commit 5dbb9357519a9479eacdda130713bf0dc44e069c.
---
drivers/gpu/drm/vc4/vc4_kms.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -355,7 +355,6 @@ static void vc4_atomic_commit_tail(struc
struct drm_crtc *crtc;
struct vc4_hvs_state *old_hvs_state;
unsigned int channel;
- struct clk_request *core_req;
int i;
old_hvs_state = vc4_hvs_get_old_global_state(state);
@@ -401,7 +400,7 @@ static void vc4_atomic_commit_tail(struc
unsigned long core_rate = max_t(unsigned long,
500000000, state_rate);
- core_req = clk_request_start(hvs->core_clk, core_rate);
+ clk_set_min_rate(hvs->core_clk, core_rate);
}
drm_atomic_helper_commit_modeset_disables(dev, state);
@@ -433,8 +432,6 @@ static void vc4_atomic_commit_tail(struc
clk_set_min_rate(hvs->core_clk, new_hvs_state->core_clock_rate);
- clk_request_done(core_req);
-
drm_dbg(dev, "Core clock actual rate: %lu Hz\n",
clk_get_rate(hvs->core_clk));
}