diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-01-09 15:48:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-01-09 15:48:50 +1000 |
| commit | 0739b8ba82276f6caac3e544eb6cc21c16d1ca9e (patch) | |
| tree | 19f2102798d519a3eb71bb367cc0c433b584f24b /drivers/gpu/drm/mediatek/mtk_dp.c | |
| parent | ae7f6d59ef8ca7de9a02320eb03b200ed76cde5e (diff) | |
| parent | 938fbb16aba8f7b88e0fdcf56f315a5bbad41aad (diff) | |
Merge tag 'drm-misc-next-2025-01-06' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for 6.14:
UAPI Changes:
- Clarify drm memory stats documentation
Cross-subsystem Changes:
Core Changes:
- sched: Documentation fixes,
Driver Changes:
- amdgpu: Track BO memory stats at runtime
- amdxdna: Various fixes
- hisilicon: New HIBMC driver
- bridges:
- Provide default implementation of atomic_check for HDMI bridges
- it605: HDCP improvements, MCCS Support
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250106-augmented-kakapo-of-action-0cf000@houat
Diffstat (limited to 'drivers/gpu/drm/mediatek/mtk_dp.c')
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_dp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c index 139121b7f1d1..b04bcd91c4e9 100644 --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -2638,7 +2638,6 @@ static const struct hdmi_codec_ops mtk_dp_audio_codec_ops = { .audio_shutdown = mtk_dp_audio_shutdown, .get_eld = mtk_dp_audio_get_eld, .hook_plugged_cb = mtk_dp_audio_hook_plugged_cb, - .no_capture_mute = 1, }; static int mtk_dp_register_audio_driver(struct device *dev) @@ -2649,6 +2648,7 @@ static int mtk_dp_register_audio_driver(struct device *dev) .max_i2s_channels = 8, .i2s = 1, .data = mtk_dp, + .no_capture_mute = 1, }; mtk_dp->audio_pdev = platform_device_register_data(dev, |