diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-06-21 12:06:03 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-06-21 12:18:16 +1000 |
| commit | 031e610a6a21448a63dff7a0416e5e206724caac (patch) | |
| tree | 3ae658895daeda054e9572c5583d2820b4d3f324 /include/uapi/drm | |
| parent | Merge v5.2-rc5 into drm-next (diff) | |
| parent | drm/vmwgfx: Kill unneeded legacy security features (diff) | |
| download | linux-dev-031e610a6a21448a63dff7a0416e5e206724caac.tar.xz linux-dev-031e610a6a21448a63dff7a0416e5e206724caac.zip | |
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next
- The coherent memory changes including mm changes.
- Some vmwgfx debug fixes.
- Removal of vmwgfx legacy security checks.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <VMware> <thomas@shipmail.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190619072531.4026-1-thomas@shipmail.org
Diffstat (limited to 'include/uapi/drm')
| -rw-r--r-- | include/uapi/drm/vmwgfx_drm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h index 399f58317cff..02cab33f2f25 100644 --- a/include/uapi/drm/vmwgfx_drm.h +++ b/include/uapi/drm/vmwgfx_drm.h @@ -891,11 +891,13 @@ struct drm_vmw_shader_arg { * surface. * @drm_vmw_surface_flag_create_buffer: Create a backup buffer if none is * given. + * @drm_vmw_surface_flag_coherent: Back surface with coherent memory. */ enum drm_vmw_surface_flags { drm_vmw_surface_flag_shareable = (1 << 0), drm_vmw_surface_flag_scanout = (1 << 1), - drm_vmw_surface_flag_create_buffer = (1 << 2) + drm_vmw_surface_flag_create_buffer = (1 << 2), + drm_vmw_surface_flag_coherent = (1 << 3), }; /** |