aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include/uapi
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-01-30 15:18:33 +1000
committerDave Airlie <airlied@redhat.com>2020-01-30 15:18:38 +1000
commitd47c7f06268082bc0082a15297a07c0da59b0fc4 (patch)
treeda0a04f32061b6f19924c09fcb2ef91722158643 /include/uapi
parentMerge branch 'linux-5.6' of git://github.com/skeggsb/linux into drm-next (diff)
parentdrm/nouveau/fb/gp102-: allow module to load even when scrubber binary is missing (diff)
downloadwireguard-linux-d47c7f06268082bc0082a15297a07c0da59b0fc4.tar.xz
wireguard-linux-d47c7f06268082bc0082a15297a07c0da59b0fc4.zip
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/uapi')
-rw-r--r--include/uapi/drm/nouveau_drm.h1
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;
};