kernel: bump 5.15 to 5.15.41

[openwrt/staging/dedeckeh.git] / target / linux / bcm27xx / patches-5.15 / 950-0633-drm-vc4-hdmi-Take-bpp-into-account-for-the-scrambler.patch

diff --git a/target/linux/bcm27xx/patches-5.15/950-0633-drm-vc4-hdmi-Take-bpp-into-account-for-the-scrambler.patch b/target/linux/bcm27xx/patches-5.15/950-0633-drm-vc4-hdmi-Take-bpp-into-account-for-the-scrambler.patch
index d44e161cf0b730cf6449e0f2d674f8fe1db466ee..608cc18fda94ffb29699d2bb107073386cb491e4 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0633-drm-vc4-hdmi-Take-bpp-into-account-for-the-scrambler.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0633-drm-vc4-hdmi-Take-bpp-into-account-for-the-scrambler.patch
@@ -19,7 +19,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -102,9 +102,17 @@
+@@ -103,9 +103,17 @@
  
  #define HDMI_14_MAX_TMDS_CLK   (340 * 1000 * 1000)
  
@@ -39,7 +39,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  }
  
  static bool vc4_hdmi_is_full_range_rgb(struct vc4_hdmi *vc4_hdmi,
-@@ -276,7 +284,7 @@ static int vc4_hdmi_connector_get_modes(
+@@ -277,7 +285,7 @@ static int vc4_hdmi_connector_get_modes(
                struct drm_display_mode *mode;
  
                list_for_each_entry(mode, &connector->probed_modes, head) {
@@ -48,7 +48,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                                drm_warn_once(drm, "The core clock cannot reach frequencies high enough to support 4k @ 60Hz.");
                                drm_warn_once(drm, "Please change your config.txt file to add hdmi_enable_4kp60.");
                        }
-@@ -627,7 +635,7 @@ static void vc4_hdmi_enable_scrambling(s
+@@ -628,7 +636,7 @@ static void vc4_hdmi_enable_scrambling(s
        if (!vc4_hdmi_supports_scrambling(encoder, mode))
                return;
  
@@ -57,7 +57,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                return;
  
        drm_scdc_set_high_tmds_clock_ratio(vc4_hdmi->ddc, true);
-@@ -1244,6 +1252,7 @@ static void vc4_hdmi_encoder_atomic_mode
+@@ -1245,6 +1253,7 @@ static void vc4_hdmi_encoder_atomic_mode
        struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
  
        mutex_lock(&vc4_hdmi->mutex);