diff options
| author | John Audia <therealgraysky@proton.me> | 2023-03-12 10:03:16 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-03-27 18:58:34 +0200 |
| commit | 24d84a13a41008c1feb906a5ffc0da74e00275f5 (patch) | |
| tree | 0f990b18d0a771df05e435330fd6a8b7b5f3bacf /target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch | |
| parent | 36bf158b47b6b013fb3f68aa4e2bf2ffc90bb9b0 (diff) | |
| download | upstream-24d84a13a41008c1feb906a5ffc0da74e00275f5.tar.gz upstream-24d84a13a41008c1feb906a5ffc0da74e00275f5.tar.bz2 upstream-24d84a13a41008c1feb906a5ffc0da74e00275f5.zip | |
kernel: bump 5.10 to 5.10.173
Manually rebased:
ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
All other patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit d4aad642ff80750ec16a58058eb6da718e2129cd)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch b/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch index 25792b28fd..0d2a398451 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch @@ -14,7 +14,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1035,9 +1035,8 @@ static int sample_rate_to_mai_fmt(int sa +@@ -1036,9 +1036,8 @@ static int sample_rate_to_mai_fmt(int sa } /* HDMI audio codec callbacks */ @@ -26,7 +26,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com> { struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai); struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base; -@@ -1050,12 +1049,15 @@ static int vc4_hdmi_audio_hw_params(stru +@@ -1051,12 +1050,15 @@ static int vc4_hdmi_audio_hw_params(stru if (substream != vc4_hdmi->audio.substream) return -EINVAL; @@ -47,7 +47,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com> HDMI_WRITE(HDMI_MAI_CTL, VC4_HD_MAI_CTL_RESET | -@@ -1267,7 +1269,7 @@ static const struct snd_soc_component_dr +@@ -1268,7 +1270,7 @@ static const struct snd_soc_component_dr static const struct snd_soc_dai_ops vc4_hdmi_audio_dai_ops = { .startup = vc4_hdmi_audio_startup, .shutdown = vc4_hdmi_audio_shutdown, |