kernel: bump 5.10 to 5.10.173

[openwrt/staging/hauke.git] / target / linux / bcm27xx / patches-5.10 / 950-0637-drm-vc4-hdmi-Remove-redundant-variables.patch

diff --git a/target/linux/bcm27xx/patches-5.10/950-0637-drm-vc4-hdmi-Remove-redundant-variables.patch b/target/linux/bcm27xx/patches-5.10/950-0637-drm-vc4-hdmi-Remove-redundant-variables.patch
index 7bac6185163ab5c737c83e3ce99b1a28533842e3..407b4cfaaf642f1fb801e433655bda4fcb681413 100644 (file)
--- a/target/linux/bcm27xx/patches-5.10/950-0637-drm-vc4-hdmi-Remove-redundant-variables.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0637-drm-vc4-hdmi-Remove-redundant-variables.patch
@@ -11,7 +11,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
-@@ -1167,12 +1167,13 @@ static u32 vc5_hdmi_channel_map(struct v
+@@ -1168,12 +1168,13 @@ static u32 vc5_hdmi_channel_map(struct v
  }
  
  /* HDMI audio codec callbacks */
@@ -27,7 +27,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                                    VC4_HD_MAI_SMP_N_MASK >>
                                    VC4_HD_MAI_SMP_N_SHIFT,
                                    (VC4_HD_MAI_SMP_M_MASK >>
-@@ -1184,12 +1185,11 @@ static void vc4_hdmi_audio_set_mai_clock
+@@ -1185,12 +1186,11 @@ static void vc4_hdmi_audio_set_mai_clock
                   VC4_SET_FIELD(m - 1, VC4_HD_MAI_SMP_M));
  }
  
@@ -41,7 +41,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        u32 n, cts;
        u64 tmp;
  
-@@ -1323,27 +1323,25 @@ static int vc4_hdmi_audio_prepare(struct
+@@ -1324,27 +1324,25 @@ static int vc4_hdmi_audio_prepare(struct
  {
        struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
        struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
@@ -75,7 +75,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        if (params->iec.status[0] & IEC958_AES0_NONAUDIO &&
            params->channels == 8)
                mai_audio_format = VC4_HDMI_MAI_FORMAT_HBR;
-@@ -1361,7 +1359,7 @@ static int vc4_hdmi_audio_prepare(struct
+@@ -1362,7 +1360,7 @@ static int vc4_hdmi_audio_prepare(struct
                VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_INACTIVE_CHANNELS |
                VC4_SET_FIELD(0x8, VC4_HDMI_AUDIO_PACKET_B_FRAME_IDENTIFIER);
  
@@ -84,7 +84,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        audio_packet_config |= VC4_SET_FIELD(channel_mask,
                                             VC4_HDMI_AUDIO_PACKET_CEA_MASK);
  
-@@ -1380,7 +1378,7 @@ static int vc4_hdmi_audio_prepare(struct
+@@ -1381,7 +1379,7 @@ static int vc4_hdmi_audio_prepare(struct
        channel_map = vc4_hdmi->variant->channel_map(vc4_hdmi, channel_mask);
        HDMI_WRITE(HDMI_MAI_CHANNEL_MAP, channel_map);
        HDMI_WRITE(HDMI_AUDIO_PACKET_CONFIG, audio_packet_config);