aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.15/950-0869-drm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2022-05-16 23:40:32 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2022-05-17 15:11:22 +0200
commit20ea6adbf199097c4f5f591ffee088340630dae4 (patch)
treed6719d95e136611a1c25bbf7789652d6d402779d /target/linux/bcm27xx/patches-5.15/950-0869-drm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch
parentbca05bd072180dc38ef740b37ded9572a6db1981 (diff)
downloadupstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.gz
upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.bz2
upstream-20ea6adbf199097c4f5f591ffee088340630dae4.zip
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>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0869-drm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0869-drm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0869-drm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch b/target/linux/bcm27xx/patches-5.15/950-0869-drm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch
new file mode 100644
index 0000000000..2331ce14cc
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.15/950-0869-drm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch
@@ -0,0 +1,36 @@
+From 067cebf5a6624a8613ac407efc72f80060ab4efb Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 25 Mar 2022 15:48:48 +0100
+Subject: [PATCH] drm/vc4: kms: Warn if clk_set_min_rate fails
+
+We currently ignore the clk_set_min_rate return code assuming it would
+succeed. However, it can fail if we ask for a rate higher than the
+current maximum for example.
+
+Since we can't fail in atomic_commit, at least warn on failure.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_kms.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -400,7 +400,7 @@ static void vc4_atomic_commit_tail(struc
+ unsigned long core_rate = max_t(unsigned long,
+ 500000000, state_rate);
+
+- clk_set_min_rate(hvs->core_clk, core_rate);
++ WARN_ON(clk_set_min_rate(hvs->core_clk, core_rate));
+ }
+
+ drm_atomic_helper_commit_modeset_disables(dev, state);
+@@ -430,7 +430,7 @@ static void vc4_atomic_commit_tail(struc
+ drm_dbg(dev, "Running the core clock at %lu Hz\n",
+ new_hvs_state->core_clock_rate);
+
+- clk_set_min_rate(hvs->core_clk, new_hvs_state->core_clock_rate);
++ WARN_ON(clk_set_min_rate(hvs->core_clk, new_hvs_state->core_clock_rate));
+
+ drm_dbg(dev, "Core clock actual rate: %lu Hz\n",
+ clk_get_rate(hvs->core_clk));