From 20ea6adbf199097c4f5f591ffee088340630dae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Mon, 16 May 2022 23:40:32 +0200 Subject: bcm27xx: add support for linux v5.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Álvaro Fernández Rojas --- ...rm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 target/linux/bcm27xx/patches-5.15/950-0869-drm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch (limited to 'target/linux/bcm27xx/patches-5.15/950-0869-drm-vc4-kms-Warn-if-clk_set_min_rate-fails.patch') 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 +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 +--- + 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)); -- cgit v1.2.3