summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2009-05-06 01:19:27 +0100
committerChristoph Brill <christoph.brill@chamaeleon.de>2011-12-13 22:15:47 +0100
commite6e37de49eccf2ba316112ca980c82a9068a786b (patch)
tree874877e2377d2a420d97aa83462e2c1c56a68740
parent8970c7ccbaf7a2df6014d7265416ad9a4115f3bd (diff)
Update glamo_drm.h from kernel source
-rw-r--r--include/drm/glamo_drm.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/include/drm/glamo_drm.h b/include/drm/glamo_drm.h
index 1f128b68..1b585e4f 100644
--- a/include/drm/glamo_drm.h
+++ b/include/drm/glamo_drm.h
@@ -52,8 +52,8 @@
#define DRM_GLAMO_GEM_PWRITE 0x22
#define DRM_GLAMO_GEM_WAIT_RENDERING 0x24
-#define DRM_IOCTL_GLAMO_CMDBUF DRM_IOW( DRM_COMMAND_BASE + DRM_GLAMO_CMDBUF, drm_glamo_cmd_buffer_t)
-#define DRM_IOCTL_GLAMO_SWAP DRM_IO( DRM_COMMAND_BASE + DRM_GLAMO_SWAP)
+#define DRM_IOCTL_GLAMO_CMDBUF DRM_IOW(DRM_COMMAND_BASE + DRM_GLAMO_CMDBUF, drm_glamo_cmd_buffer_t)
+#define DRM_IOCTL_GLAMO_SWAP DRM_IO(DRM_COMMAND_BASE + DRM_GLAMO_SWAP)
#define DRM_IOCTL_GLAMO_GEM_INFO DRM_IOWR(DRM_COMMAND_BASE + DRM_GLAMO_GEM_INFO, struct drm_glamo_gem_info)
#define DRM_IOCTL_GLAMO_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_GLAMO_GEM_CREATE, struct drm_glamo_gem_create)
@@ -65,19 +65,18 @@
#define DRM_IOCTL_GLAMO_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_GLAMO_GEM_WAIT_RENDERING, struct drm_glamo_gem_wait_rendering)
typedef struct drm_glamo_cmd_buffer {
- int bufsz;
- char __user *buf;
+ int bufsz; /* Size of buffer, in bytes */
+ char __user *buf; /* Buffer of stuff to go onto the ring buffer */
+ int *obj_pos; /* Offsets (in bytes) at which to put objs */
+ uint32_t *objs; /* List of buffer object (handles) to use */
+ int nobjs; /* Number of objects referenced */
int nbox;
struct drm_clip_rect __user *boxes;
} drm_glamo_cmd_buffer_t;
-/* return to userspace start/size of gtt and vram apertures */
struct drm_glamo_gem_info {
- uint64_t gart_start;
- uint64_t gart_size;
uint64_t vram_start;
uint64_t vram_size;
- uint64_t vram_visible;
};
struct drm_glamo_gem_create {
@@ -85,8 +84,7 @@ struct drm_glamo_gem_create {
uint64_t alignment;
uint32_t handle;
uint32_t initial_domain; // to allow VRAM to be created
- uint32_t no_backing_store; // for VRAM objects - select whether they need backing store
- // pretty much front/back/depth don't need it - other things do
+ uint32_t no_backing_store;
};
struct drm_glamo_gem_mmap {