diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-05-18 15:32:03 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-06 19:20:28 +0200 |
| commit | ed1536e0b6b7f2aeea6881632b89b269d27ff7ce (patch) | |
| tree | baf77f9a1bb148f9d0c765d78de348e81e92583b /target/linux/bcm27xx/patches-5.15/950-0603-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch | |
| parent | f800f8d6fc4f21ed87454aa657ebbf376dc3b6cf (diff) | |
| download | upstream-ed1536e0b6b7f2aeea6881632b89b269d27ff7ce.tar.gz upstream-ed1536e0b6b7f2aeea6881632b89b269d27ff7ce.tar.bz2 upstream-ed1536e0b6b7f2aeea6881632b89b269d27ff7ce.zip | |
kernel: bump 5.15 to 5.15.41
Deleted (upstreamed):
generic/backport-5.15/890-v5.19-net-sfp-Add-tx-fault-workaround-for-Huawei-MA5671A-SFP-ON.patch [1]
Other patches automatically rebased.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.41&id=99858114a3b2c8f5f8707d9bbd46c50f547c87c0
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0603-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0603-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0603-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch b/target/linux/bcm27xx/patches-5.15/950-0603-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch index 9d0361c426..9ecf5db11d 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0603-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0603-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch @@ -14,7 +14,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -210,6 +210,7 @@ vc4_hdmi_connector_detect(struct drm_con +@@ -211,6 +211,7 @@ vc4_hdmi_connector_detect(struct drm_con connected = true; } @@ -22,7 +22,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> if (connected) { if (connector->status != connector_status_connected) { struct edid *edid = drm_get_edid(connector, vc4_hdmi->ddc); -@@ -730,15 +731,6 @@ static void vc4_hdmi_encoder_post_crtc_p +@@ -731,15 +732,6 @@ static void vc4_hdmi_encoder_post_crtc_p mutex_unlock(&vc4_hdmi->mutex); } @@ -38,7 +38,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable) { unsigned long flags; -@@ -1218,15 +1210,6 @@ static void vc4_hdmi_encoder_post_crtc_e +@@ -1219,15 +1211,6 @@ static void vc4_hdmi_encoder_post_crtc_e mutex_unlock(&vc4_hdmi->mutex); } @@ -54,7 +54,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> static void vc4_hdmi_encoder_atomic_mode_set(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state) -@@ -1320,8 +1303,6 @@ static const struct drm_encoder_helper_f +@@ -1321,8 +1304,6 @@ static const struct drm_encoder_helper_f .atomic_check = vc4_hdmi_encoder_atomic_check, .atomic_mode_set = vc4_hdmi_encoder_atomic_mode_set, .mode_valid = vc4_hdmi_encoder_mode_valid, @@ -63,7 +63,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> }; static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask) -@@ -1421,16 +1402,10 @@ static bool vc4_hdmi_audio_can_stream(st +@@ -1422,16 +1403,10 @@ static bool vc4_hdmi_audio_can_stream(st lockdep_assert_held(&vc4_hdmi->mutex); /* |