diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-05-06 01:19:27 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2010-05-23 09:51:33 +0200 |
| commit | beb5ceec39778f94e1b5f50cd34f940b2d485447 (patch) | |
| tree | a1d92b51f7d4c5a2e8da5a497b52e7b77c14ea1d | |
| parent | 3832c05a915696f49f203b30ce6458a1887f67e4 (diff) | |
Update glamo_drm.h from kernel source
| -rw-r--r-- | include/drm/glamo_drm.h | 18 |
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 { |