kernel: bump 5.15 to 5.15.100

[openwrt/staging/ldir.git] / target / linux / bcm27xx / patches-5.15 / 950-0603-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch

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 9ecf5db11d369a535d22202c91d8be7d6c119407..cb0daf15f008c58942b2d342410a68b9458af38a 100644 (file)
--- 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
@@ -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;
-@@ -1219,15 +1211,6 @@ static void vc4_hdmi_encoder_post_crtc_e
+@@ -1220,15 +1212,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)
-@@ -1321,8 +1304,6 @@ static const struct drm_encoder_helper_f
+@@ -1322,8 +1305,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)
-@@ -1422,16 +1403,10 @@ static bool vc4_hdmi_audio_can_stream(st
+@@ -1423,16 +1404,10 @@ static bool vc4_hdmi_audio_can_stream(st
        lockdep_assert_held(&vc4_hdmi->mutex);
  
        /*