summaryrefslogtreecommitdiff
path: root/include/drm/drmP.h
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-08-29 12:12:39 +0200
committerDave Airlie <airlied@redhat.com>2014-09-10 17:41:55 +1000
commit69d516c0a990b42c4d55f7631fa28cc41bfcc8f0 (patch)
tree7b412692e7e8e74ecdc123d863524985929f5945 /include/drm/drmP.h
parentedf0ac7c67ce596f43d66a781660889bbdcc9505 (diff)
drm: inline "struct drm_sigdata"
The sigdata structure is only used to group two fields in drm_device. Inline it and make it an unnamed object. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r--include/drm/drmP.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 8f55875dafbb..840a3735d3da 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -432,12 +432,6 @@ struct drm_sg_mem {
dma_addr_t *busaddr;
};
-struct drm_sigdata {
- int context;
- struct drm_hw_lock *lock;
-};
-
-
/**
* Kernel side of a mapping
*/
@@ -1035,9 +1029,13 @@ struct drm_device {
struct drm_sg_mem *sg; /**< Scatter gather memory */
unsigned int num_crtcs; /**< Number of CRTCs on this device */
- struct drm_sigdata sigdata; /**< For block_all_signals */
sigset_t sigmask;
+ struct {
+ int context;
+ struct drm_hw_lock *lock;
+ } sigdata;
+
struct drm_local_map *agp_buffer_map;
unsigned int agp_buffer_token;