diff options
| author | Sinclair Yeh <syeh@vmware.com> | 2017-09-07 21:27:23 +0200 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-10-25 12:03:53 -0700 |
| commit | 6c67b7bf25d837e8610650932195c096f1dd6bc2 (patch) | |
| tree | 13b5e196150e5b8911859e770ec1ccf9622e98b2 /drm_auth.h | |
| parent | 749baed003d4f8eab1a1b03d03048110fbd0d7f0 (diff) | |
vmwgfx: Update stand alone to v4.12
Mostly straight copy-and-paste from upstream, with the following
notable changes
* Added #undef CONFIG_DEBUG_FS in drmP.h to exclude all debugfs code
* Minor updates to a few vmwgfx files due to API change
* Carried over from the v4.11 update: Skipped update to drm_mm and
drm_vma_manager because the switch to using interval tree makes
porting difficult
* Added #include <linux/highuid.h> to drm_ioctl.c to make CentOS
build
* Rolled in [Commit 3bacf4361cd0: drm/vmwgfx: Fix fbdev emulation
using legacy functions]
* Updated vmwgfx code to match upstream v4.12 code
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Deepak Rawat <drawat@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'drm_auth.h')
| -rw-r--r-- | drm_auth.h | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -28,6 +28,23 @@ #ifndef _DRM_AUTH_H_ #define _DRM_AUTH_H_ +/* + * Legacy DRI1 locking data structure. Only here instead of in drm_legacy.h for + * include ordering reasons. + * + * DO NOT USE. + */ +struct drm_lock_data { + struct drm_hw_lock *hw_lock; + struct drm_file *file_priv; + wait_queue_head_t lock_queue; + unsigned long lock_time; + spinlock_t spinlock; + uint32_t kernel_waiters; + uint32_t user_waiters; + int idle_has_lock; +}; + /** * struct drm_master - drm master structure * |