diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-02-28 05:57:14 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-02-28 05:57:14 +0100 |
| commit | 6c64ae228f0826859c56711ce133aff037d6205f (patch) | |
| tree | 831f7b3c5a4eb3a5ab932edb6ca27780a316e714 /drivers/gpu/drm/vc4/vc4_hdmi.h | |
| parent | Merge tag 'mediatek-drm-next-5.18' of https://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Linux 5.17-rc6 (diff) | |
| download | linux-6c64ae228f0826859c56711ce133aff037d6205f.tar.xz linux-6c64ae228f0826859c56711ce133aff037d6205f.zip | |
Backmerge tag 'v5.17-rc6' into drm-next
This backmerges v5.17-rc6 so I can merge some amdgpu and some tegra changes on top.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_hdmi.h')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h index 933a468e10f3..1076faeab616 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -117,6 +117,7 @@ struct vc4_hdmi_audio { struct snd_soc_dai_link_component platform; struct snd_dmaengine_dai_dma_data dma_data; struct hdmi_audio_infoframe infoframe; + struct platform_device *codec_pdev; bool streaming; }; |