diff options
author | Dave Airlie <airlied@redhat.com> | 2020-01-30 15:18:33 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-01-30 15:18:38 +1000 |
commit | d47c7f06268082bc0082a15297a07c0da59b0fc4 (patch) | |
tree | da0a04f32061b6f19924c09fcb2ef91722158643 /include | |
parent | c689b069916c69c0afd2f72a9bbcd910bba7e590 (diff) | |
parent | c3463aed05abf06bd5ebaac12f2c015db298b98f (diff) | |
download | linux-d47c7f06268082bc0082a15297a07c0da59b0fc4.tar.bz2 |
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 'include')
-rw-r--r-- | include/uapi/drm/nouveau_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h index 9459a6e3bc1f..853a327433d3 100644 --- a/include/uapi/drm/nouveau_drm.h +++ b/include/uapi/drm/nouveau_drm.h @@ -110,6 +110,7 @@ struct drm_nouveau_gem_pushbuf { __u64 push; __u32 suffix0; __u32 suffix1; +#define NOUVEAU_GEM_PUSHBUF_SYNC (1ULL << 0) __u64 vram_available; __u64 gart_available; }; |