diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2012-02-09 10:56:48 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-02-13 07:01:36 -0500 |
commit | f9cd8ec34f240884cf7ec44e1a4cac12c167ecb2 (patch) | |
tree | d6b9207eb2989fe7f3590f2c1370c5035d6392ce /drivers | |
parent | 67d4a87b0a6bf7225aacc2c14e3542ec2f6b803f (diff) |
vmwgfx: Move function declaration to correct header
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 12 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 8 |
2 files changed, 6 insertions, 14 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 28664156a1d8..a393bdcfd4b3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |||
@@ -662,18 +662,6 @@ int vmw_overlay_num_overlays(struct vmw_private *dev_priv); | |||
662 | int vmw_overlay_num_free_overlays(struct vmw_private *dev_priv); | 662 | int vmw_overlay_num_free_overlays(struct vmw_private *dev_priv); |
663 | 663 | ||
664 | /** | 664 | /** |
665 | * Fence function - vmwgfx_fence.c | ||
666 | */ | ||
667 | |||
668 | int vmw_event_fence_action_queue(struct drm_file *file_priv, | ||
669 | struct vmw_fence_obj *fence, | ||
670 | struct drm_pending_event *event, | ||
671 | uint32_t *tv_sec, | ||
672 | uint32_t *tv_usec, | ||
673 | bool interruptible); | ||
674 | |||
675 | |||
676 | /** | ||
677 | * GMR Id manager | 665 | * GMR Id manager |
678 | */ | 666 | */ |
679 | 667 | ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h index 8767fc13265d..faf2e7873860 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | |||
@@ -111,6 +111,10 @@ extern int vmw_fence_event_ioctl(struct drm_device *dev, void *data, | |||
111 | struct drm_file *file_priv); | 111 | struct drm_file *file_priv); |
112 | extern void vmw_event_fence_fpriv_gone(struct vmw_fence_manager *fman, | 112 | extern void vmw_event_fence_fpriv_gone(struct vmw_fence_manager *fman, |
113 | struct list_head *event_list); | 113 | struct list_head *event_list); |
114 | 114 | extern int vmw_event_fence_action_queue(struct drm_file *filee_priv, | |
115 | 115 | struct vmw_fence_obj *fence, | |
116 | struct drm_pending_event *event, | ||
117 | uint32_t *tv_sec, | ||
118 | uint32_t *tv_usec, | ||
119 | bool interruptible); | ||
116 | #endif /* _VMWGFX_FENCE_H_ */ | 120 | #endif /* _VMWGFX_FENCE_H_ */ |