From: <bwi...@ke...> - 2012-06-29 18:12:49
|
configure.ac | 2 +- intel/intel_bufmgr_gem.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) New commits: commit 1b1a4f0a779f7ab2ba5673b9c9fe2a37047fe765 Author: Ben Widawsky <be...@bw...> Date: Fri Jun 29 11:08:05 2012 -0700 configure: bump version for release Signed-off-by: Ben Widawsky <be...@bw...> diff --git a/configure.ac b/configure.ac index 1e23b36..a1c8c69 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.36], + [2.4.37], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm]) commit f7210fa4ecf6a5456aa5a6bcc0584d38b2c8449e Author: Ben Widawsky <be...@bw...> Date: Fri Jan 13 11:31:52 2012 -0800 intel/context: create/destroy implementation Add relevant code to set up minimal state and call the appropriate kernel IOCTLs. This was missed in the previous cherry-picking for 2.3.36. Signed-off-by: Ben Widawsky <be...@bw...> diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 485308b..a957c28 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -2840,6 +2840,51 @@ drm_intel_bufmgr_gem_set_aub_dump(drm_intel_bufmgr *bufmgr, int enable) } } +drm_intel_context * +drm_intel_gem_context_create(drm_intel_bufmgr *bufmgr) +{ + drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bufmgr; + struct drm_i915_gem_context_create create; + drm_i915_getparam_t gp; + drm_intel_context *context = NULL; + int tmp = 0, ret; + + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_CONTEXT_CREATE, &create); + if (ret != 0) { + fprintf(stderr, "DRM_IOCTL_I915_GEM_CONTEXT_CREATE failed: %s\n", + strerror(errno)); + return NULL; + } + + context = calloc(1, sizeof(*context)); + context->ctx_id = create.ctx_id; + context->bufmgr = bufmgr; + + return context; +} + +void +drm_intel_gem_context_destroy(drm_intel_context *ctx) +{ + drm_intel_bufmgr_gem *bufmgr_gem; + struct drm_i915_gem_context_destroy destroy; + int ret; + + if (ctx == NULL) + return; + + bufmgr_gem = (drm_intel_bufmgr_gem *)ctx->bufmgr; + destroy.ctx_id = ctx->ctx_id; + ret = drmIoctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_CONTEXT_DESTROY, + &destroy); + if (ret != 0) + fprintf(stderr, "DRM_IOCTL_I915_GEM_CONTEXT_DESTROY failed: %s\n", + strerror(errno)); + + free(ctx); +} + + /** * Annotate the given bo for use in aub dumping. * |