From: Thomas Hellstrom <thellstrom@vmware.com>
To: airlied@gmail.com
Cc: airlied@redhat.com, Thomas Hellstrom <thellstrom@vmware.com>,
dri-devel@lists.freedesktop.org
Subject: [PATCH 8/9] vmwgfx: Move function declaration to correct header
Date: Thu, 9 Feb 2012 16:56:48 +0100 [thread overview]
Message-ID: <1328803009-2847-9-git-send-email-thellstrom@vmware.com> (raw)
In-Reply-To: <1328803009-2847-1-git-send-email-thellstrom@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 12 ------------
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 2866415..a393bdc 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);
int vmw_overlay_num_free_overlays(struct vmw_private *dev_priv);
/**
- * Fence function - vmwgfx_fence.c
- */
-
-int vmw_event_fence_action_queue(struct drm_file *file_priv,
- struct vmw_fence_obj *fence,
- struct drm_pending_event *event,
- uint32_t *tv_sec,
- uint32_t *tv_usec,
- bool interruptible);
-
-
-/**
* GMR Id manager
*/
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.h
index 8767fc1..faf2e78 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,
struct drm_file *file_priv);
extern void vmw_event_fence_fpriv_gone(struct vmw_fence_manager *fman,
struct list_head *event_list);
-
-
+extern int vmw_event_fence_action_queue(struct drm_file *filee_priv,
+ struct vmw_fence_obj *fence,
+ struct drm_pending_event *event,
+ uint32_t *tv_sec,
+ uint32_t *tv_usec,
+ bool interruptible);
#endif /* _VMWGFX_FENCE_H_ */
--
1.7.4.4
next prev parent reply other threads:[~2012-02-09 15:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 15:56 [PATCH -next 0/0] vmwgfx updates Thomas Hellstrom
2012-02-09 15:56 ` [PATCH 1/9] vmwgfx: Rework fence event action Thomas Hellstrom
2012-02-09 15:56 ` [PATCH 2/9] vmwgfx: Clean up pending event references to struct drm_file objects on close Thomas Hellstrom
2012-02-09 15:56 ` [PATCH 3/9] vmwgfx: Make it possible to get fence from execbuf Thomas Hellstrom
2012-02-09 15:56 ` [PATCH 4/9] vmwgfx: Pipe fence out of screen object dirty functions Thomas Hellstrom
2012-02-09 15:56 ` [PATCH 5/9] vmwgfx: Add page flip support Thomas Hellstrom
2012-02-09 15:56 ` [PATCH 6/9] vmwgfx: Pick up the initial size from the width and height regs Thomas Hellstrom
2012-02-09 15:56 ` [PATCH 7/9] drm/vmwgfx: Treat out-of-range initial width and height as host errors Thomas Hellstrom
2012-02-09 15:56 ` Thomas Hellstrom [this message]
2012-02-09 15:56 ` [PATCH 9/9] drm/vmwgfx: Bump driver minor Thomas Hellstrom
2012-02-09 15:58 ` [PATCH -next 0/0] vmwgfx updates Thomas Hellstrom
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328803009-2847-9-git-send-email-thellstrom@vmware.com \
--to=thellstrom@vmware.com \
--cc=airlied@gmail.com \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.