From 5ac1e86ecfa99d2bff8ef318cef5e53d1aa8e7a4 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 23 Jan 2013 11:53:26 -0800 Subject: Expose swap pages IOCTL Signed-off-by: Keith Packard --- include/drm/i915_drm.h | 17 +++++++++++++++++ intel/intel_bufmgr.h | 4 ++++ intel/intel_bufmgr_gem.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 7e9e9bd0..574a62bb 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -198,6 +198,7 @@ typedef struct _drm_i915_sarea { #define DRM_I915_GEM_SET_CACHEING 0x2f #define DRM_I915_GEM_GET_CACHEING 0x30 #define DRM_I915_REG_READ 0x31 +#define DRM_I915_GEM_SWAP_PAGES 0x32 #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) #define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) @@ -247,6 +248,7 @@ typedef struct _drm_i915_sarea { #define DRM_IOCTL_I915_GEM_CONTEXT_CREATE DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create) #define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy) #define DRM_IOCTL_I915_REG_READ DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_REG_READ, struct drm_i915_reg_read) +#define DRM_IOCTL_I915_GEM_SWAP_PAGES DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SWAP_PAGES, struct drm_i915_gem_swap_pages) /* Allow drivers to submit batchbuffers directly to hardware, relying * on the security mechanisms provided by hardware. @@ -941,4 +943,19 @@ struct drm_i915_reg_read { __u64 offset; __u64 val; /* Return value */ }; + +struct drm_i915_gem_swap_pages { + /** Handle of BO a */ + __u32 bo_a; + __u32 start_a; + __u32 stride_a; + + /** Handle of BO b */ + __u32 bo_b; + __u32 start_b; + __u32 stride_b; + + __u32 width; + __u32 height; +}; #endif /* _I915_DRM_H_ */ diff --git a/intel/intel_bufmgr.h b/intel/intel_bufmgr.h index 8d7f2390..5f8dc626 100644 --- a/intel/intel_bufmgr.h +++ b/intel/intel_bufmgr.h @@ -245,6 +245,10 @@ int drm_intel_reg_read(drm_intel_bufmgr *bufmgr, uint32_t offset, uint64_t *result); +int drm_intel_gem_swap_pages(drm_intel_bo *a, uint32_t start_a, uint32_t stride_a, + drm_intel_bo *b, uint32_t start_b, uint32_t stride_b, + uint32_t width, uint32_t height); + /** @{ Compatibility defines to keep old code building despite the symbol rename * from dri_* to drm_intel_* */ diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 8d45839d..133aaf49 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -2973,6 +2973,34 @@ drm_intel_reg_read(drm_intel_bufmgr *bufmgr, return ret; } +int drm_intel_gem_swap_pages(drm_intel_bo *a, uint32_t start_a, uint32_t stride_a, + drm_intel_bo *b, uint32_t start_b, uint32_t stride_b, + uint32_t width, uint32_t height) +{ + drm_intel_bo_gem *a_gem = (drm_intel_bo_gem *) a; + drm_intel_bo_gem *b_gem = (drm_intel_bo_gem *) b; + drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) a->bufmgr; + struct drm_i915_gem_swap_pages args; + int ret; + + VG_CLEAR(args); + args.bo_a = a_gem->gem_handle; + args.start_a = start_a; + args.stride_a = stride_a; + + args.bo_b = b_gem->gem_handle; + args.start_b = start_b; + args.stride_b = stride_b; + + args.width = width; + args.height = height; + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_SWAP_PAGES, &args); + + if (ret != 0) + fprintf(stderr, "DRM_IOCTL_I915_GEM_SWAP_PAGES failed: %s\n", + strerror(errno)); + return ret; +} /** * Annotate the given bo for use in aub dumping. -- cgit v1.2.3