| Message ID | 20190206130356.18771-34-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/46] drm/i915: Hack and slash, throttle execbuffer hogs | expand |
On 06/02/2019 13:03, Chris Wilson wrote: > It can be useful to have a single ioctl to create a context with all > the initial parameters instead of a series of create + setparam + setparam > ioctls. This extension to create context allows any of the parameters > to be passed in as a linked list to be applied to the newly constructed > context. > > v2: Make a local copy of user setparam (Tvrtko) > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/i915_drv.c | 2 +- > drivers/gpu/drm/i915/i915_gem_context.c | 428 +++++++++++++----------- > include/uapi/drm/i915_drm.h | 163 ++++----- > 3 files changed, 325 insertions(+), 268 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 487e78094e93..fc11460f8327 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -2994,7 +2994,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = { > DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey_ioctl, DRM_MASTER), > DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, drm_noop, DRM_MASTER), > DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_AUTH|DRM_RENDER_ALLOW), > - DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW), > + DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE_EXT, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW), > DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_RENDER_ALLOW), > DRM_IOCTL_DEF_DRV(I915_REG_READ, i915_reg_read_ioctl, DRM_RENDER_ALLOW), > DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATS, i915_gem_context_reset_stats_ioctl, DRM_RENDER_ALLOW), > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c > index dd49b1ef3ff2..609ef59f4d95 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -89,6 +89,7 @@ > #include <drm/i915_drm.h> > #include "i915_drv.h" > #include "i915_trace.h" > +#include "i915_user_extensions.h" > #include "intel_lrc_reg.h" > #include "intel_workarounds.h" > > @@ -1044,188 +1045,6 @@ static int set_ppgtt(struct i915_gem_context *ctx, > return err; > } > > -static bool client_is_banned(struct drm_i915_file_private *file_priv) > -{ > - return atomic_read(&file_priv->ban_score) >= I915_CLIENT_SCORE_BANNED; > -} > - > -int i915_gem_context_create_ioctl(struct drm_device *dev, void *data, > - struct drm_file *file) > -{ > - struct drm_i915_private *dev_priv = to_i915(dev); > - struct drm_i915_gem_context_create *args = data; > - struct drm_i915_file_private *file_priv = file->driver_priv; > - struct i915_gem_context *ctx; > - int ret; > - > - if (!DRIVER_CAPS(dev_priv)->has_logical_contexts) > - return -ENODEV; > - > - if (args->pad != 0) > - return -EINVAL; > - > - if (client_is_banned(file_priv)) { > - DRM_DEBUG("client %s[%d] banned from creating ctx\n", > - current->comm, > - pid_nr(get_task_pid(current, PIDTYPE_PID))); > - > - return -EIO; > - } > - > - ret = i915_mutex_lock_interruptible(dev); > - if (ret) > - return ret; > - > - ctx = i915_gem_create_context(dev_priv, file_priv); > - mutex_unlock(&dev->struct_mutex); > - if (IS_ERR(ctx)) > - return PTR_ERR(ctx); > - > - GEM_BUG_ON(i915_gem_context_is_kernel(ctx)); > - > - args->ctx_id = ctx->user_handle; > - DRM_DEBUG("HW context %d created\n", args->ctx_id); > - > - return 0; > -} > - > -int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, > - struct drm_file *file) > -{ > - struct drm_i915_gem_context_destroy *args = data; > - struct drm_i915_file_private *file_priv = file->driver_priv; > - struct i915_gem_context *ctx; > - int ret; > - > - if (args->pad != 0) > - return -EINVAL; > - > - if (args->ctx_id == DEFAULT_CONTEXT_HANDLE) > - return -ENOENT; > - > - ctx = i915_gem_context_lookup(file_priv, args->ctx_id); > - if (!ctx) > - return -ENOENT; > - > - ret = mutex_lock_interruptible(&dev->struct_mutex); > - if (ret) > - goto out; > - > - __destroy_hw_context(ctx, file_priv); > - mutex_unlock(&dev->struct_mutex); > - > -out: > - i915_gem_context_put(ctx); > - return 0; > -} > - > -static int get_sseu(struct i915_gem_context *ctx, > - struct drm_i915_gem_context_param *args) > -{ > - struct drm_i915_gem_context_param_sseu user_sseu; > - struct intel_engine_cs *engine; > - struct intel_context *ce; > - int ret; > - > - if (args->size == 0) > - goto out; > - else if (args->size < sizeof(user_sseu)) > - return -EINVAL; > - > - if (copy_from_user(&user_sseu, u64_to_user_ptr(args->value), > - sizeof(user_sseu))) > - return -EFAULT; > - > - if (user_sseu.flags || user_sseu.rsvd) > - return -EINVAL; > - > - engine = intel_engine_lookup_user(ctx->i915, > - user_sseu.engine_class, > - user_sseu.engine_instance); > - if (!engine) > - return -EINVAL; > - > - /* Only use for mutex here is to serialize get_param and set_param. */ > - ret = mutex_lock_interruptible(&ctx->i915->drm.struct_mutex); > - if (ret) > - return ret; > - > - ce = to_intel_context(ctx, engine); > - > - user_sseu.slice_mask = ce->sseu.slice_mask; > - user_sseu.subslice_mask = ce->sseu.subslice_mask; > - user_sseu.min_eus_per_subslice = ce->sseu.min_eus_per_subslice; > - user_sseu.max_eus_per_subslice = ce->sseu.max_eus_per_subslice; > - > - mutex_unlock(&ctx->i915->drm.struct_mutex); > - > - if (copy_to_user(u64_to_user_ptr(args->value), &user_sseu, > - sizeof(user_sseu))) > - return -EFAULT; > - > -out: > - args->size = sizeof(user_sseu); > - > - return 0; > -} > - > -int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, > - struct drm_file *file) > -{ > - struct drm_i915_file_private *file_priv = file->driver_priv; > - struct drm_i915_gem_context_param *args = data; > - struct i915_gem_context *ctx; > - int ret = 0; > - > - ctx = i915_gem_context_lookup(file_priv, args->ctx_id); > - if (!ctx) > - return -ENOENT; > - > - switch (args->param) { > - case I915_CONTEXT_PARAM_BAN_PERIOD: > - ret = -EINVAL; > - break; > - case I915_CONTEXT_PARAM_NO_ZEROMAP: > - args->size = 0; > - args->value = test_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags); > - break; > - case I915_CONTEXT_PARAM_GTT_SIZE: > - args->size = 0; > - > - if (ctx->ppgtt) > - args->value = ctx->ppgtt->vm.total; > - else if (to_i915(dev)->mm.aliasing_ppgtt) > - args->value = to_i915(dev)->mm.aliasing_ppgtt->vm.total; > - else > - args->value = to_i915(dev)->ggtt.vm.total; > - break; > - case I915_CONTEXT_PARAM_NO_ERROR_CAPTURE: > - args->size = 0; > - args->value = i915_gem_context_no_error_capture(ctx); > - break; > - case I915_CONTEXT_PARAM_BANNABLE: > - args->size = 0; > - args->value = i915_gem_context_is_bannable(ctx); > - break; > - case I915_CONTEXT_PARAM_PRIORITY: > - args->size = 0; > - args->value = ctx->sched.priority >> I915_USER_PRIORITY_SHIFT; > - break; > - case I915_CONTEXT_PARAM_SSEU: > - ret = get_sseu(ctx, args); > - break; > - case I915_CONTEXT_PARAM_VM: > - ret = get_ppgtt(ctx, args); > - break; > - default: > - ret = -EINVAL; > - break; > - } > - > - i915_gem_context_put(ctx); > - return ret; > -} > - > static int gen8_emit_rpcs_config(struct i915_request *rq, > struct intel_context *ce, > struct intel_sseu sseu) > @@ -1501,18 +1320,11 @@ static int set_sseu(struct i915_gem_context *ctx, > return 0; > } > > -int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, > - struct drm_file *file) > +static int ctx_setparam(struct i915_gem_context *ctx, > + struct drm_i915_gem_context_param *args) > { > - struct drm_i915_file_private *file_priv = file->driver_priv; > - struct drm_i915_gem_context_param *args = data; > - struct i915_gem_context *ctx; > int ret = 0; > > - ctx = i915_gem_context_lookup(file_priv, args->ctx_id); > - if (!ctx) > - return -ENOENT; > - > switch (args->param) { > case I915_CONTEXT_PARAM_NO_ZEROMAP: > if (args->size) > @@ -1522,6 +1334,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, > else > clear_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags); > break; > + > case I915_CONTEXT_PARAM_NO_ERROR_CAPTURE: > if (args->size) > ret = -EINVAL; > @@ -1530,6 +1343,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, > else > i915_gem_context_clear_no_error_capture(ctx); > break; > + > case I915_CONTEXT_PARAM_BANNABLE: > if (args->size) > ret = -EINVAL; > @@ -1547,7 +1361,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, > > if (args->size) > ret = -EINVAL; > - else if (!(to_i915(dev)->caps.scheduler & I915_SCHEDULER_CAP_PRIORITY)) > + else if (!(ctx->i915->caps.scheduler & I915_SCHEDULER_CAP_PRIORITY)) > ret = -ENODEV; > else if (priority > I915_CONTEXT_MAX_USER_PRIORITY || > priority < I915_CONTEXT_MIN_USER_PRIORITY) > @@ -1575,6 +1389,236 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, > break; > } > > + return ret; > +} > + > +static int create_setparam(struct i915_user_extension __user *ext, void *data) > +{ > + struct drm_i915_gem_context_create_ext_setparam local; > + > + if (copy_from_user(&local, ext, sizeof(local))) > + return -EFAULT; > + > + if (local.setparam.ctx_id) > + return -EINVAL; > + > + return ctx_setparam(data, &local.setparam); > +} > + > +static const i915_user_extension_fn create_extensions[] = { > + [I915_CONTEXT_CREATE_EXT_SETPARAM] = create_setparam, > +}; > + > +static bool client_is_banned(struct drm_i915_file_private *file_priv) > +{ > + return atomic_read(&file_priv->ban_score) >= I915_CLIENT_SCORE_BANNED; > +} > + > +int i915_gem_context_create_ioctl(struct drm_device *dev, void *data, > + struct drm_file *file) > +{ > + struct drm_i915_private *dev_priv = to_i915(dev); > + struct drm_i915_gem_context_create_ext *args = data; > + struct drm_i915_file_private *file_priv = file->driver_priv; > + struct i915_gem_context *ctx; > + int ret; > + > + if (!DRIVER_CAPS(dev_priv)->has_logical_contexts) > + return -ENODEV; > + > + if (args->flags) > + return -EINVAL; > + > + if (client_is_banned(file_priv)) { > + DRM_DEBUG("client %s[%d] banned from creating ctx\n", > + current->comm, > + pid_nr(get_task_pid(current, PIDTYPE_PID))); > + > + return -EIO; > + } > + > + ret = i915_mutex_lock_interruptible(dev); > + if (ret) > + return ret; > + > + ctx = i915_gem_create_context(dev_priv, file_priv); > + mutex_unlock(&dev->struct_mutex); > + if (IS_ERR(ctx)) > + return PTR_ERR(ctx); > + > + GEM_BUG_ON(i915_gem_context_is_kernel(ctx)); > + > + ret = i915_user_extensions(u64_to_user_ptr(args->extensions), > + create_extensions, > + ARRAY_SIZE(create_extensions), > + ctx); > + if (ret) { > + idr_remove(&file_priv->context_idr, ctx->user_handle); > + context_close(ctx); > + return ret; > + } > + > + args->ctx_id = ctx->user_handle; > + DRM_DEBUG("HW context %d created\n", args->ctx_id); > + > + return 0; > +} > + > +int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, > + struct drm_file *file) > +{ > + struct drm_i915_gem_context_destroy *args = data; > + struct drm_i915_file_private *file_priv = file->driver_priv; > + struct i915_gem_context *ctx; > + int ret; > + > + if (args->pad != 0) > + return -EINVAL; > + > + if (args->ctx_id == DEFAULT_CONTEXT_HANDLE) > + return -ENOENT; > + > + ctx = i915_gem_context_lookup(file_priv, args->ctx_id); > + if (!ctx) > + return -ENOENT; > + > + ret = mutex_lock_interruptible(&dev->struct_mutex); > + if (ret) > + goto out; > + > + __destroy_hw_context(ctx, file_priv); > + mutex_unlock(&dev->struct_mutex); > + > +out: > + i915_gem_context_put(ctx); > + return 0; > +} > + > +static int get_sseu(struct i915_gem_context *ctx, > + struct drm_i915_gem_context_param *args) > +{ > + struct drm_i915_gem_context_param_sseu user_sseu; > + struct intel_engine_cs *engine; > + struct intel_context *ce; > + int ret; > + > + if (args->size == 0) > + goto out; > + else if (args->size < sizeof(user_sseu)) > + return -EINVAL; > + > + if (copy_from_user(&user_sseu, u64_to_user_ptr(args->value), > + sizeof(user_sseu))) > + return -EFAULT; > + > + if (user_sseu.flags || user_sseu.rsvd) > + return -EINVAL; > + > + engine = intel_engine_lookup_user(ctx->i915, > + user_sseu.engine_class, > + user_sseu.engine_instance); > + if (!engine) > + return -EINVAL; > + > + /* Only use for mutex here is to serialize get_param and set_param. */ > + ret = mutex_lock_interruptible(&ctx->i915->drm.struct_mutex); > + if (ret) > + return ret; > + > + ce = to_intel_context(ctx, engine); > + > + user_sseu.slice_mask = ce->sseu.slice_mask; > + user_sseu.subslice_mask = ce->sseu.subslice_mask; > + user_sseu.min_eus_per_subslice = ce->sseu.min_eus_per_subslice; > + user_sseu.max_eus_per_subslice = ce->sseu.max_eus_per_subslice; > + > + mutex_unlock(&ctx->i915->drm.struct_mutex); > + > + if (copy_to_user(u64_to_user_ptr(args->value), &user_sseu, > + sizeof(user_sseu))) > + return -EFAULT; > + > +out: > + args->size = sizeof(user_sseu); > + > + return 0; > +} > + > +int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, > + struct drm_file *file) > +{ > + struct drm_i915_file_private *file_priv = file->driver_priv; > + struct drm_i915_gem_context_param *args = data; > + struct i915_gem_context *ctx; > + int ret = 0; > + > + ctx = i915_gem_context_lookup(file_priv, args->ctx_id); > + if (!ctx) > + return -ENOENT; > + > + switch (args->param) { > + case I915_CONTEXT_PARAM_NO_ZEROMAP: > + args->size = 0; > + args->value = test_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags); > + break; > + > + case I915_CONTEXT_PARAM_GTT_SIZE: > + args->size = 0; > + if (ctx->ppgtt) > + args->value = ctx->ppgtt->vm.total; > + else if (to_i915(dev)->mm.aliasing_ppgtt) > + args->value = to_i915(dev)->mm.aliasing_ppgtt->vm.total; > + else > + args->value = to_i915(dev)->ggtt.vm.total; > + break; > + > + case I915_CONTEXT_PARAM_NO_ERROR_CAPTURE: > + args->size = 0; > + args->value = i915_gem_context_no_error_capture(ctx); > + break; > + > + case I915_CONTEXT_PARAM_BANNABLE: > + args->size = 0; > + args->value = i915_gem_context_is_bannable(ctx); > + break; > + > + case I915_CONTEXT_PARAM_PRIORITY: > + args->size = 0; > + args->value = ctx->sched.priority >> I915_USER_PRIORITY_SHIFT; > + break; > + > + case I915_CONTEXT_PARAM_SSEU: > + ret = get_sseu(ctx, args); > + break; > + > + case I915_CONTEXT_PARAM_VM: > + ret = get_ppgtt(ctx, args); > + break; > + > + case I915_CONTEXT_PARAM_BAN_PERIOD: > + default: > + ret = -EINVAL; > + break; > + } > + > + i915_gem_context_put(ctx); > + return ret; > +} > + > +int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, > + struct drm_file *file) > +{ > + struct drm_i915_file_private *file_priv = file->driver_priv; > + struct drm_i915_gem_context_param *args = data; > + struct i915_gem_context *ctx; > + int ret; > + > + ctx = i915_gem_context_lookup(file_priv, args->ctx_id); > + if (!ctx) > + return -ENOENT; > + > + ret = ctx_setparam(ctx, args); > + > i915_gem_context_put(ctx); > return ret; > } > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > index 2cd79639d6b5..c9ba7e408117 100644 > --- a/include/uapi/drm/i915_drm.h > +++ b/include/uapi/drm/i915_drm.h > @@ -389,6 +389,7 @@ typedef struct _drm_i915_sarea { > #define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey) > #define DRM_IOCTL_I915_GEM_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait) > #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_CREATE_EXT DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create_ext) > #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_GET_RESET_STATS DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GET_RESET_STATS, struct drm_i915_reset_stats) > @@ -1438,85 +1439,14 @@ struct drm_i915_gem_wait { > }; > > struct drm_i915_gem_context_create { > - /* output: id of new context*/ > - __u32 ctx_id; > - __u32 pad; > -}; > - > -struct drm_i915_gem_context_destroy { > - __u32 ctx_id; > + __u32 ctx_id; /* output: id of new context*/ > __u32 pad; > }; > > -/* > - * DRM_I915_GEM_VM_CREATE - > - * > - * Create a new virtual memory address space (ppGTT) for use within a context > - * on the same file. Extensions can be provided to configure exactly how the > - * address space is setup upon creation. > - * > - * The id of new VM (bound to the fd) for use with I915_CONTEXT_PARAM_VM is > - * returned. > - * > - * DRM_I915_GEM_VM_DESTROY - > - * > - * Destroys a previously created VM id. > - */ > -struct drm_i915_gem_vm_control { > - __u64 extensions; > +struct drm_i915_gem_context_create_ext { > + __u32 ctx_id; /* output: id of new context*/ > __u32 flags; > - __u32 id; > -}; > - > -struct drm_i915_reg_read { > - /* > - * Register offset. > - * For 64bit wide registers where the upper 32bits don't immediately > - * follow the lower 32bits, the offset of the lower 32bits must > - * be specified > - */ > - __u64 offset; > -#define I915_REG_READ_8B_WA (1ul << 0) > - > - __u64 val; /* Return value */ > -}; > -/* Known registers: > - * > - * Render engine timestamp - 0x2358 + 64bit - gen7+ > - * - Note this register returns an invalid value if using the default > - * single instruction 8byte read, in order to workaround that pass > - * flag I915_REG_READ_8B_WA in offset field. > - * > - */ > - > -struct drm_i915_reset_stats { > - __u32 ctx_id; > - __u32 flags; > - > - /* All resets since boot/module reload, for all contexts */ > - __u32 reset_count; > - > - /* Number of batches lost when active in GPU, for this context */ > - __u32 batch_active; > - > - /* Number of batches lost pending for execution, for this context */ > - __u32 batch_pending; > - > - __u32 pad; > -}; > - > -struct drm_i915_gem_userptr { > - __u64 user_ptr; > - __u64 user_size; > - __u32 flags; > -#define I915_USERPTR_READ_ONLY 0x1 > -#define I915_USERPTR_UNSYNCHRONIZED 0x80000000 > - /** > - * Returned handle for the object. > - * > - * Object handles are nonzero. > - */ > - __u32 handle; > + __u64 extensions; > }; > > struct drm_i915_gem_context_param { > @@ -1610,6 +1540,89 @@ struct drm_i915_gem_context_param_sseu { > __u32 rsvd; > }; > > +struct drm_i915_gem_context_create_ext_setparam { > +#define I915_CONTEXT_CREATE_EXT_SETPARAM 0 > + struct i915_user_extension base; > + struct drm_i915_gem_context_param setparam; > +}; > + > +struct drm_i915_gem_context_destroy { > + __u32 ctx_id; > + __u32 pad; > +}; > + > +/* > + * DRM_I915_GEM_VM_CREATE - > + * > + * Create a new virtual memory address space (ppGTT) for use within a context > + * on the same file. Extensions can be provided to configure exactly how the > + * address space is setup upon creation. > + * > + * The id of new VM (bound to the fd) for use with I915_CONTEXT_PARAM_VM is > + * returned. > + * > + * DRM_I915_GEM_VM_DESTROY - > + * > + * Destroys a previously created VM id. > + */ > +struct drm_i915_gem_vm_control { > + __u64 extensions; > + __u32 flags; > + __u32 id; > +}; > + > +struct drm_i915_reg_read { > + /* > + * Register offset. > + * For 64bit wide registers where the upper 32bits don't immediately > + * follow the lower 32bits, the offset of the lower 32bits must > + * be specified > + */ > + __u64 offset; > +#define I915_REG_READ_8B_WA (1ul << 0) > + > + __u64 val; /* Return value */ > +}; > + > +/* Known registers: > + * > + * Render engine timestamp - 0x2358 + 64bit - gen7+ > + * - Note this register returns an invalid value if using the default > + * single instruction 8byte read, in order to workaround that pass > + * flag I915_REG_READ_8B_WA in offset field. > + * > + */ > + > +struct drm_i915_reset_stats { > + __u32 ctx_id; > + __u32 flags; > + > + /* All resets since boot/module reload, for all contexts */ > + __u32 reset_count; > + > + /* Number of batches lost when active in GPU, for this context */ > + __u32 batch_active; > + > + /* Number of batches lost pending for execution, for this context */ > + __u32 batch_pending; > + > + __u32 pad; > +}; > + > +struct drm_i915_gem_userptr { > + __u64 user_ptr; > + __u64 user_size; > + __u32 flags; > +#define I915_USERPTR_READ_ONLY 0x1 > +#define I915_USERPTR_UNSYNCHRONIZED 0x80000000 > + /** > + * Returned handle for the object. > + * > + * Object handles are nonzero. > + */ > + __u32 handle; > +}; > + > enum drm_i915_oa_format { > I915_OA_FORMAT_A13 = 1, /* HSW only */ > I915_OA_FORMAT_A29, /* HSW only */ > LGTM. Feels like r-b is premature given the series will probably still change but effectively it's an r-b. Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 487e78094e93..fc11460f8327 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -2994,7 +2994,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = { DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey_ioctl, DRM_MASTER), DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, drm_noop, DRM_MASTER), DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_AUTH|DRM_RENDER_ALLOW), - DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE_EXT, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_REG_READ, i915_reg_read_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATS, i915_gem_context_reset_stats_ioctl, DRM_RENDER_ALLOW), diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index dd49b1ef3ff2..609ef59f4d95 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -89,6 +89,7 @@ #include <drm/i915_drm.h> #include "i915_drv.h" #include "i915_trace.h" +#include "i915_user_extensions.h" #include "intel_lrc_reg.h" #include "intel_workarounds.h" @@ -1044,188 +1045,6 @@ static int set_ppgtt(struct i915_gem_context *ctx, return err; } -static bool client_is_banned(struct drm_i915_file_private *file_priv) -{ - return atomic_read(&file_priv->ban_score) >= I915_CLIENT_SCORE_BANNED; -} - -int i915_gem_context_create_ioctl(struct drm_device *dev, void *data, - struct drm_file *file) -{ - struct drm_i915_private *dev_priv = to_i915(dev); - struct drm_i915_gem_context_create *args = data; - struct drm_i915_file_private *file_priv = file->driver_priv; - struct i915_gem_context *ctx; - int ret; - - if (!DRIVER_CAPS(dev_priv)->has_logical_contexts) - return -ENODEV; - - if (args->pad != 0) - return -EINVAL; - - if (client_is_banned(file_priv)) { - DRM_DEBUG("client %s[%d] banned from creating ctx\n", - current->comm, - pid_nr(get_task_pid(current, PIDTYPE_PID))); - - return -EIO; - } - - ret = i915_mutex_lock_interruptible(dev); - if (ret) - return ret; - - ctx = i915_gem_create_context(dev_priv, file_priv); - mutex_unlock(&dev->struct_mutex); - if (IS_ERR(ctx)) - return PTR_ERR(ctx); - - GEM_BUG_ON(i915_gem_context_is_kernel(ctx)); - - args->ctx_id = ctx->user_handle; - DRM_DEBUG("HW context %d created\n", args->ctx_id); - - return 0; -} - -int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, - struct drm_file *file) -{ - struct drm_i915_gem_context_destroy *args = data; - struct drm_i915_file_private *file_priv = file->driver_priv; - struct i915_gem_context *ctx; - int ret; - - if (args->pad != 0) - return -EINVAL; - - if (args->ctx_id == DEFAULT_CONTEXT_HANDLE) - return -ENOENT; - - ctx = i915_gem_context_lookup(file_priv, args->ctx_id); - if (!ctx) - return -ENOENT; - - ret = mutex_lock_interruptible(&dev->struct_mutex); - if (ret) - goto out; - - __destroy_hw_context(ctx, file_priv); - mutex_unlock(&dev->struct_mutex); - -out: - i915_gem_context_put(ctx); - return 0; -} - -static int get_sseu(struct i915_gem_context *ctx, - struct drm_i915_gem_context_param *args) -{ - struct drm_i915_gem_context_param_sseu user_sseu; - struct intel_engine_cs *engine; - struct intel_context *ce; - int ret; - - if (args->size == 0) - goto out; - else if (args->size < sizeof(user_sseu)) - return -EINVAL; - - if (copy_from_user(&user_sseu, u64_to_user_ptr(args->value), - sizeof(user_sseu))) - return -EFAULT; - - if (user_sseu.flags || user_sseu.rsvd) - return -EINVAL; - - engine = intel_engine_lookup_user(ctx->i915, - user_sseu.engine_class, - user_sseu.engine_instance); - if (!engine) - return -EINVAL; - - /* Only use for mutex here is to serialize get_param and set_param. */ - ret = mutex_lock_interruptible(&ctx->i915->drm.struct_mutex); - if (ret) - return ret; - - ce = to_intel_context(ctx, engine); - - user_sseu.slice_mask = ce->sseu.slice_mask; - user_sseu.subslice_mask = ce->sseu.subslice_mask; - user_sseu.min_eus_per_subslice = ce->sseu.min_eus_per_subslice; - user_sseu.max_eus_per_subslice = ce->sseu.max_eus_per_subslice; - - mutex_unlock(&ctx->i915->drm.struct_mutex); - - if (copy_to_user(u64_to_user_ptr(args->value), &user_sseu, - sizeof(user_sseu))) - return -EFAULT; - -out: - args->size = sizeof(user_sseu); - - return 0; -} - -int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, - struct drm_file *file) -{ - struct drm_i915_file_private *file_priv = file->driver_priv; - struct drm_i915_gem_context_param *args = data; - struct i915_gem_context *ctx; - int ret = 0; - - ctx = i915_gem_context_lookup(file_priv, args->ctx_id); - if (!ctx) - return -ENOENT; - - switch (args->param) { - case I915_CONTEXT_PARAM_BAN_PERIOD: - ret = -EINVAL; - break; - case I915_CONTEXT_PARAM_NO_ZEROMAP: - args->size = 0; - args->value = test_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags); - break; - case I915_CONTEXT_PARAM_GTT_SIZE: - args->size = 0; - - if (ctx->ppgtt) - args->value = ctx->ppgtt->vm.total; - else if (to_i915(dev)->mm.aliasing_ppgtt) - args->value = to_i915(dev)->mm.aliasing_ppgtt->vm.total; - else - args->value = to_i915(dev)->ggtt.vm.total; - break; - case I915_CONTEXT_PARAM_NO_ERROR_CAPTURE: - args->size = 0; - args->value = i915_gem_context_no_error_capture(ctx); - break; - case I915_CONTEXT_PARAM_BANNABLE: - args->size = 0; - args->value = i915_gem_context_is_bannable(ctx); - break; - case I915_CONTEXT_PARAM_PRIORITY: - args->size = 0; - args->value = ctx->sched.priority >> I915_USER_PRIORITY_SHIFT; - break; - case I915_CONTEXT_PARAM_SSEU: - ret = get_sseu(ctx, args); - break; - case I915_CONTEXT_PARAM_VM: - ret = get_ppgtt(ctx, args); - break; - default: - ret = -EINVAL; - break; - } - - i915_gem_context_put(ctx); - return ret; -} - static int gen8_emit_rpcs_config(struct i915_request *rq, struct intel_context *ce, struct intel_sseu sseu) @@ -1501,18 +1320,11 @@ static int set_sseu(struct i915_gem_context *ctx, return 0; } -int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, - struct drm_file *file) +static int ctx_setparam(struct i915_gem_context *ctx, + struct drm_i915_gem_context_param *args) { - struct drm_i915_file_private *file_priv = file->driver_priv; - struct drm_i915_gem_context_param *args = data; - struct i915_gem_context *ctx; int ret = 0; - ctx = i915_gem_context_lookup(file_priv, args->ctx_id); - if (!ctx) - return -ENOENT; - switch (args->param) { case I915_CONTEXT_PARAM_NO_ZEROMAP: if (args->size) @@ -1522,6 +1334,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, else clear_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags); break; + case I915_CONTEXT_PARAM_NO_ERROR_CAPTURE: if (args->size) ret = -EINVAL; @@ -1530,6 +1343,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, else i915_gem_context_clear_no_error_capture(ctx); break; + case I915_CONTEXT_PARAM_BANNABLE: if (args->size) ret = -EINVAL; @@ -1547,7 +1361,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, if (args->size) ret = -EINVAL; - else if (!(to_i915(dev)->caps.scheduler & I915_SCHEDULER_CAP_PRIORITY)) + else if (!(ctx->i915->caps.scheduler & I915_SCHEDULER_CAP_PRIORITY)) ret = -ENODEV; else if (priority > I915_CONTEXT_MAX_USER_PRIORITY || priority < I915_CONTEXT_MIN_USER_PRIORITY) @@ -1575,6 +1389,236 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, break; } + return ret; +} + +static int create_setparam(struct i915_user_extension __user *ext, void *data) +{ + struct drm_i915_gem_context_create_ext_setparam local; + + if (copy_from_user(&local, ext, sizeof(local))) + return -EFAULT; + + if (local.setparam.ctx_id) + return -EINVAL; + + return ctx_setparam(data, &local.setparam); +} + +static const i915_user_extension_fn create_extensions[] = { + [I915_CONTEXT_CREATE_EXT_SETPARAM] = create_setparam, +}; + +static bool client_is_banned(struct drm_i915_file_private *file_priv) +{ + return atomic_read(&file_priv->ban_score) >= I915_CLIENT_SCORE_BANNED; +} + +int i915_gem_context_create_ioctl(struct drm_device *dev, void *data, + struct drm_file *file) +{ + struct drm_i915_private *dev_priv = to_i915(dev); + struct drm_i915_gem_context_create_ext *args = data; + struct drm_i915_file_private *file_priv = file->driver_priv; + struct i915_gem_context *ctx; + int ret; + + if (!DRIVER_CAPS(dev_priv)->has_logical_contexts) + return -ENODEV; + + if (args->flags) + return -EINVAL; + + if (client_is_banned(file_priv)) { + DRM_DEBUG("client %s[%d] banned from creating ctx\n", + current->comm, + pid_nr(get_task_pid(current, PIDTYPE_PID))); + + return -EIO; + } + + ret = i915_mutex_lock_interruptible(dev); + if (ret) + return ret; + + ctx = i915_gem_create_context(dev_priv, file_priv); + mutex_unlock(&dev->struct_mutex); + if (IS_ERR(ctx)) + return PTR_ERR(ctx); + + GEM_BUG_ON(i915_gem_context_is_kernel(ctx)); + + ret = i915_user_extensions(u64_to_user_ptr(args->extensions), + create_extensions, + ARRAY_SIZE(create_extensions), + ctx); + if (ret) { + idr_remove(&file_priv->context_idr, ctx->user_handle); + context_close(ctx); + return ret; + } + + args->ctx_id = ctx->user_handle; + DRM_DEBUG("HW context %d created\n", args->ctx_id); + + return 0; +} + +int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, + struct drm_file *file) +{ + struct drm_i915_gem_context_destroy *args = data; + struct drm_i915_file_private *file_priv = file->driver_priv; + struct i915_gem_context *ctx; + int ret; + + if (args->pad != 0) + return -EINVAL; + + if (args->ctx_id == DEFAULT_CONTEXT_HANDLE) + return -ENOENT; + + ctx = i915_gem_context_lookup(file_priv, args->ctx_id); + if (!ctx) + return -ENOENT; + + ret = mutex_lock_interruptible(&dev->struct_mutex); + if (ret) + goto out; + + __destroy_hw_context(ctx, file_priv); + mutex_unlock(&dev->struct_mutex); + +out: + i915_gem_context_put(ctx); + return 0; +} + +static int get_sseu(struct i915_gem_context *ctx, + struct drm_i915_gem_context_param *args) +{ + struct drm_i915_gem_context_param_sseu user_sseu; + struct intel_engine_cs *engine; + struct intel_context *ce; + int ret; + + if (args->size == 0) + goto out; + else if (args->size < sizeof(user_sseu)) + return -EINVAL; + + if (copy_from_user(&user_sseu, u64_to_user_ptr(args->value), + sizeof(user_sseu))) + return -EFAULT; + + if (user_sseu.flags || user_sseu.rsvd) + return -EINVAL; + + engine = intel_engine_lookup_user(ctx->i915, + user_sseu.engine_class, + user_sseu.engine_instance); + if (!engine) + return -EINVAL; + + /* Only use for mutex here is to serialize get_param and set_param. */ + ret = mutex_lock_interruptible(&ctx->i915->drm.struct_mutex); + if (ret) + return ret; + + ce = to_intel_context(ctx, engine); + + user_sseu.slice_mask = ce->sseu.slice_mask; + user_sseu.subslice_mask = ce->sseu.subslice_mask; + user_sseu.min_eus_per_subslice = ce->sseu.min_eus_per_subslice; + user_sseu.max_eus_per_subslice = ce->sseu.max_eus_per_subslice; + + mutex_unlock(&ctx->i915->drm.struct_mutex); + + if (copy_to_user(u64_to_user_ptr(args->value), &user_sseu, + sizeof(user_sseu))) + return -EFAULT; + +out: + args->size = sizeof(user_sseu); + + return 0; +} + +int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, + struct drm_file *file) +{ + struct drm_i915_file_private *file_priv = file->driver_priv; + struct drm_i915_gem_context_param *args = data; + struct i915_gem_context *ctx; + int ret = 0; + + ctx = i915_gem_context_lookup(file_priv, args->ctx_id); + if (!ctx) + return -ENOENT; + + switch (args->param) { + case I915_CONTEXT_PARAM_NO_ZEROMAP: + args->size = 0; + args->value = test_bit(UCONTEXT_NO_ZEROMAP, &ctx->user_flags); + break; + + case I915_CONTEXT_PARAM_GTT_SIZE: + args->size = 0; + if (ctx->ppgtt) + args->value = ctx->ppgtt->vm.total; + else if (to_i915(dev)->mm.aliasing_ppgtt) + args->value = to_i915(dev)->mm.aliasing_ppgtt->vm.total; + else + args->value = to_i915(dev)->ggtt.vm.total; + break; + + case I915_CONTEXT_PARAM_NO_ERROR_CAPTURE: + args->size = 0; + args->value = i915_gem_context_no_error_capture(ctx); + break; + + case I915_CONTEXT_PARAM_BANNABLE: + args->size = 0; + args->value = i915_gem_context_is_bannable(ctx); + break; + + case I915_CONTEXT_PARAM_PRIORITY: + args->size = 0; + args->value = ctx->sched.priority >> I915_USER_PRIORITY_SHIFT; + break; + + case I915_CONTEXT_PARAM_SSEU: + ret = get_sseu(ctx, args); + break; + + case I915_CONTEXT_PARAM_VM: + ret = get_ppgtt(ctx, args); + break; + + case I915_CONTEXT_PARAM_BAN_PERIOD: + default: + ret = -EINVAL; + break; + } + + i915_gem_context_put(ctx); + return ret; +} + +int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, + struct drm_file *file) +{ + struct drm_i915_file_private *file_priv = file->driver_priv; + struct drm_i915_gem_context_param *args = data; + struct i915_gem_context *ctx; + int ret; + + ctx = i915_gem_context_lookup(file_priv, args->ctx_id); + if (!ctx) + return -ENOENT; + + ret = ctx_setparam(ctx, args); + i915_gem_context_put(ctx); return ret; } diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 2cd79639d6b5..c9ba7e408117 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -389,6 +389,7 @@ typedef struct _drm_i915_sarea { #define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey) #define DRM_IOCTL_I915_GEM_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait) #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_CREATE_EXT DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create_ext) #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_GET_RESET_STATS DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GET_RESET_STATS, struct drm_i915_reset_stats) @@ -1438,85 +1439,14 @@ struct drm_i915_gem_wait { }; struct drm_i915_gem_context_create { - /* output: id of new context*/ - __u32 ctx_id; - __u32 pad; -}; - -struct drm_i915_gem_context_destroy { - __u32 ctx_id; + __u32 ctx_id; /* output: id of new context*/ __u32 pad; }; -/* - * DRM_I915_GEM_VM_CREATE - - * - * Create a new virtual memory address space (ppGTT) for use within a context - * on the same file. Extensions can be provided to configure exactly how the - * address space is setup upon creation. - * - * The id of new VM (bound to the fd) for use with I915_CONTEXT_PARAM_VM is - * returned. - * - * DRM_I915_GEM_VM_DESTROY - - * - * Destroys a previously created VM id. - */ -struct drm_i915_gem_vm_control { - __u64 extensions; +struct drm_i915_gem_context_create_ext { + __u32 ctx_id; /* output: id of new context*/ __u32 flags; - __u32 id; -}; - -struct drm_i915_reg_read { - /* - * Register offset. - * For 64bit wide registers where the upper 32bits don't immediately - * follow the lower 32bits, the offset of the lower 32bits must - * be specified - */ - __u64 offset; -#define I915_REG_READ_8B_WA (1ul << 0) - - __u64 val; /* Return value */ -}; -/* Known registers: - * - * Render engine timestamp - 0x2358 + 64bit - gen7+ - * - Note this register returns an invalid value if using the default - * single instruction 8byte read, in order to workaround that pass - * flag I915_REG_READ_8B_WA in offset field. - * - */ - -struct drm_i915_reset_stats { - __u32 ctx_id; - __u32 flags; - - /* All resets since boot/module reload, for all contexts */ - __u32 reset_count; - - /* Number of batches lost when active in GPU, for this context */ - __u32 batch_active; - - /* Number of batches lost pending for execution, for this context */ - __u32 batch_pending; - - __u32 pad; -}; - -struct drm_i915_gem_userptr { - __u64 user_ptr; - __u64 user_size; - __u32 flags; -#define I915_USERPTR_READ_ONLY 0x1 -#define I915_USERPTR_UNSYNCHRONIZED 0x80000000 - /** - * Returned handle for the object. - * - * Object handles are nonzero. - */ - __u32 handle; + __u64 extensions; }; struct drm_i915_gem_context_param { @@ -1610,6 +1540,89 @@ struct drm_i915_gem_context_param_sseu { __u32 rsvd; }; +struct drm_i915_gem_context_create_ext_setparam { +#define I915_CONTEXT_CREATE_EXT_SETPARAM 0 + struct i915_user_extension base; + struct drm_i915_gem_context_param setparam; +}; + +struct drm_i915_gem_context_destroy { + __u32 ctx_id; + __u32 pad; +}; + +/* + * DRM_I915_GEM_VM_CREATE - + * + * Create a new virtual memory address space (ppGTT) for use within a context + * on the same file. Extensions can be provided to configure exactly how the + * address space is setup upon creation. + * + * The id of new VM (bound to the fd) for use with I915_CONTEXT_PARAM_VM is + * returned. + * + * DRM_I915_GEM_VM_DESTROY - + * + * Destroys a previously created VM id. + */ +struct drm_i915_gem_vm_control { + __u64 extensions; + __u32 flags; + __u32 id; +}; + +struct drm_i915_reg_read { + /* + * Register offset. + * For 64bit wide registers where the upper 32bits don't immediately + * follow the lower 32bits, the offset of the lower 32bits must + * be specified + */ + __u64 offset; +#define I915_REG_READ_8B_WA (1ul << 0) + + __u64 val; /* Return value */ +}; + +/* Known registers: + * + * Render engine timestamp - 0x2358 + 64bit - gen7+ + * - Note this register returns an invalid value if using the default + * single instruction 8byte read, in order to workaround that pass + * flag I915_REG_READ_8B_WA in offset field. + * + */ + +struct drm_i915_reset_stats { + __u32 ctx_id; + __u32 flags; + + /* All resets since boot/module reload, for all contexts */ + __u32 reset_count; + + /* Number of batches lost when active in GPU, for this context */ + __u32 batch_active; + + /* Number of batches lost pending for execution, for this context */ + __u32 batch_pending; + + __u32 pad; +}; + +struct drm_i915_gem_userptr { + __u64 user_ptr; + __u64 user_size; + __u32 flags; +#define I915_USERPTR_READ_ONLY 0x1 +#define I915_USERPTR_UNSYNCHRONIZED 0x80000000 + /** + * Returned handle for the object. + * + * Object handles are nonzero. + */ + __u32 handle; +}; + enum drm_i915_oa_format { I915_OA_FORMAT_A13 = 1, /* HSW only */ I915_OA_FORMAT_A29, /* HSW only */
It can be useful to have a single ioctl to create a context with all the initial parameters instead of a series of create + setparam + setparam ioctls. This extension to create context allows any of the parameters to be passed in as a linked list to be applied to the newly constructed context. v2: Make a local copy of user setparam (Tvrtko) Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_gem_context.c | 428 +++++++++++++----------- include/uapi/drm/i915_drm.h | 163 ++++----- 3 files changed, 325 insertions(+), 268 deletions(-)