diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-01-30 08:18:33 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-01-30 08:18:38 +0300 |
| commit | d47c7f06268082bc0082a15297a07c0da59b0fc4 (patch) | |
| tree | da0a04f32061b6f19924c09fcb2ef91722158643 /drivers/gpu/drm/nouveau/nouveau_drv.h | |
| parent | c689b069916c69c0afd2f72a9bbcd910bba7e590 (diff) | |
| parent | c3463aed05abf06bd5ebaac12f2c015db298b98f (diff) | |
| download | linux-d47c7f06268082bc0082a15297a07c0da59b0fc4.tar.xz | |
Merge branch 'linux-5.6' of git://github.com/skeggsb/linux into drm-next
A couple of OOPS fixes, fixes for TU1xx if firmware isn't available,
better behaviour in the face of GPU faults, and a patch to make HD
audio work again after runpm changes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv4xcLF6Ahh7UYEesn-wBEksd2da+ghusBAdODMrH7Sz2A@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index da8c46e09943..c2c332fbde97 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -58,6 +58,8 @@ #include <drm/ttm/ttm_module.h> #include <drm/ttm/ttm_page_alloc.h> +#include <drm/drm_audio_component.h> + #include "uapi/drm/nouveau_drm.h" struct nouveau_channel; @@ -211,6 +213,11 @@ struct nouveau_drm { struct nouveau_svm *svm; struct nouveau_dmem *dmem; + + struct { + struct drm_audio_component *component; + bool component_registered; + } audio; }; static inline struct nouveau_drm * |