bcm27xx: update patches from RPi foundation
[openwrt/staging/luka.git] / target / linux / bcm27xx / patches-5.4 / 950-0617-drm-vc4-Fixup-for-firmware-KMS.patch
1 From 3c10a82ae5ce60ee8b4dbd1d1f8436efaa4593c3 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
3 Date: Mon, 30 Mar 2020 12:52:26 +0100
4 Subject: [PATCH] drm/vc4: Fixup for firmware KMS
5
6 Fix up "drm/vc4: Kick the core clock up during a mode change" for
7 firmware KMS mode where we don't have the HVS or core clock
8 configured.
9
10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
11 ---
12 drivers/gpu/drm/vc4/vc4_kms.c | 6 ++++--
13 1 file changed, 4 insertions(+), 2 deletions(-)
14
15 --- a/drivers/gpu/drm/vc4/vc4_kms.c
16 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
17 @@ -239,7 +239,8 @@ vc4_atomic_complete_commit(struct drm_at
18 vc4_hvs_mask_underrun(dev, vc4_crtc_state->assigned_channel);
19 }
20
21 - clk_set_rate(hvs->core_clk, 500000000);
22 + if (!vc4->firmware_kms)
23 + clk_set_rate(hvs->core_clk, 500000000);
24
25 drm_atomic_helper_wait_for_fences(dev, state, false);
26
27 @@ -266,7 +267,8 @@ vc4_atomic_complete_commit(struct drm_at
28
29 drm_atomic_helper_commit_cleanup_done(state);
30
31 - clk_set_rate(hvs->core_clk, 200000000);
32 + if (!vc4->firmware_kms)
33 + clk_set_rate(hvs->core_clk, 200000000);
34
35 drm_atomic_state_put(state);
36