diff options
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r-- | include/drm/drmP.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index e1b2e8b98af7..e928625a9da0 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -143,6 +143,7 @@ void drm_err(const char *format, ...); | |||
143 | #define DRIVER_MODESET 0x2000 | 143 | #define DRIVER_MODESET 0x2000 |
144 | #define DRIVER_PRIME 0x4000 | 144 | #define DRIVER_PRIME 0x4000 |
145 | #define DRIVER_RENDER 0x8000 | 145 | #define DRIVER_RENDER 0x8000 |
146 | #define DRIVER_ATOMIC 0x10000 | ||
146 | 147 | ||
147 | /***********************************************************************/ | 148 | /***********************************************************************/ |
148 | /** \name Macros to make printk easier */ | 149 | /** \name Macros to make printk easier */ |
@@ -283,6 +284,8 @@ struct drm_file { | |||
283 | * in the plane list | 284 | * in the plane list |
284 | */ | 285 | */ |
285 | unsigned universal_planes:1; | 286 | unsigned universal_planes:1; |
287 | /* true if client understands atomic properties */ | ||
288 | unsigned atomic:1; | ||
286 | 289 | ||
287 | struct pid *pid; | 290 | struct pid *pid; |
288 | kuid_t uid; | 291 | kuid_t uid; |
@@ -744,8 +747,6 @@ struct drm_device { | |||
744 | 747 | ||
745 | /** \name Context support */ | 748 | /** \name Context support */ |
746 | /*@{ */ | 749 | /*@{ */ |
747 | bool irq_enabled; /**< True if irq handler is enabled */ | ||
748 | int irq; | ||
749 | 750 | ||
750 | __volatile__ long context_flag; /**< Context swapping flag */ | 751 | __volatile__ long context_flag; /**< Context swapping flag */ |
751 | int last_context; /**< Last current context */ | 752 | int last_context; /**< Last current context */ |
@@ -753,6 +754,8 @@ struct drm_device { | |||
753 | 754 | ||
754 | /** \name VBLANK IRQ support */ | 755 | /** \name VBLANK IRQ support */ |
755 | /*@{ */ | 756 | /*@{ */ |
757 | bool irq_enabled; | ||
758 | int irq; | ||
756 | 759 | ||
757 | /* | 760 | /* |
758 | * At load time, disabling the vblank interrupt won't be allowed since | 761 | * At load time, disabling the vblank interrupt won't be allowed since |
@@ -954,6 +957,7 @@ extern void drm_master_put(struct drm_master **master); | |||
954 | extern void drm_put_dev(struct drm_device *dev); | 957 | extern void drm_put_dev(struct drm_device *dev); |
955 | extern void drm_unplug_dev(struct drm_device *dev); | 958 | extern void drm_unplug_dev(struct drm_device *dev); |
956 | extern unsigned int drm_debug; | 959 | extern unsigned int drm_debug; |
960 | extern bool drm_atomic; | ||
957 | 961 | ||
958 | /* Debugfs support */ | 962 | /* Debugfs support */ |
959 | #if defined(CONFIG_DEBUG_FS) | 963 | #if defined(CONFIG_DEBUG_FS) |