drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gem / i915_gem_context.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index fd8ee52..ddc3cc3 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1046,7 +1046,6 @@ struct context_barrier_task {
        void *data;
 };
 
-__i915_active_call
 static void cb_retire(struct i915_active *base)
 {
        struct context_barrier_task *cb = container_of(base, typeof(*cb), base);
@@ -1080,7 +1079,7 @@ static int context_barrier_task(struct i915_gem_context *ctx,
        if (!cb)
                return -ENOMEM;
 
-       i915_active_init(&cb->base, NULL, cb_retire);
+       i915_active_init(&cb->base, NULL, cb_retire, 0);
        err = i915_active_acquire(&cb->base);
        if (err) {
                kfree(cb);
@@ -1191,7 +1190,7 @@ static void set_ppgtt_barrier(void *data)
 {
        struct i915_address_space *old = data;
 
-       if (INTEL_GEN(old->i915) < 8)
+       if (GRAPHICS_VER(old->i915) < 8)
                gen6_ppgtt_unpin_all(i915_vm_to_ppgtt(old));
 
        i915_vm_close(old);
@@ -1335,63 +1334,6 @@ out:
        return err;
 }
 
-static int __apply_ringsize(struct intel_context *ce, void *sz)
-{
-       return intel_context_set_ring_size(ce, (unsigned long)sz);
-}
-
-static int set_ringsize(struct i915_gem_context *ctx,
-                       struct drm_i915_gem_context_param *args)
-{
-       if (!HAS_LOGICAL_RING_CONTEXTS(ctx->i915))
-               return -ENODEV;
-
-       if (args->size)
-               return -EINVAL;
-
-       if (!IS_ALIGNED(args->value, I915_GTT_PAGE_SIZE))
-               return -EINVAL;
-
-       if (args->value < I915_GTT_PAGE_SIZE)
-               return -EINVAL;
-
-       if (args->value > 128 * I915_GTT_PAGE_SIZE)
-               return -EINVAL;
-
-       return context_apply_all(ctx,
-                                __apply_ringsize,
-                                __intel_context_ring_size(args->value));
-}
-
-static int __get_ringsize(struct intel_context *ce, void *arg)
-{
-       long sz;
-
-       sz = intel_context_get_ring_size(ce);
-       GEM_BUG_ON(sz > INT_MAX);
-
-       return sz; /* stop on first engine */
-}
-
-static int get_ringsize(struct i915_gem_context *ctx,
-                       struct drm_i915_gem_context_param *args)
-{
-       int sz;
-
-       if (!HAS_LOGICAL_RING_CONTEXTS(ctx->i915))
-               return -ENODEV;
-
-       if (args->size)
-               return -EINVAL;
-
-       sz = context_apply_all(ctx, __get_ringsize, NULL);
-       if (sz < 0)
-               return sz;
-
-       args->value = sz;
-       return 0;
-}
-
 int
 i915_gem_user_to_context_sseu(struct intel_gt *gt,
                              const struct drm_i915_gem_context_param_sseu *user,
@@ -1437,7 +1379,7 @@ i915_gem_user_to_context_sseu(struct intel_gt *gt,
        context->max_eus_per_subslice = user->max_eus_per_subslice;
 
        /* Part specific restrictions. */
-       if (IS_GEN(i915, 11)) {
+       if (GRAPHICS_VER(i915) == 11) {
                unsigned int hw_s = hweight8(device->slice_mask);
                unsigned int hw_ss_per_s = hweight8(device->subslice_mask[0]);
                unsigned int req_s = hweight8(context->slice_mask);
@@ -1504,7 +1446,7 @@ static int set_sseu(struct i915_gem_context *ctx,
        if (args->size < sizeof(user_sseu))
                return -EINVAL;
 
-       if (!IS_GEN(i915, 11))
+       if (GRAPHICS_VER(i915) != 11)
                return -ENODEV;
 
        if (copy_from_user(&user_sseu, u64_to_user_ptr(args->value),
@@ -2037,11 +1979,8 @@ static int ctx_setparam(struct drm_i915_file_private *fpriv,
                ret = set_persistence(ctx, args);
                break;
 
-       case I915_CONTEXT_PARAM_RINGSIZE:
-               ret = set_ringsize(ctx, args);
-               break;
-
        case I915_CONTEXT_PARAM_BAN_PERIOD:
+       case I915_CONTEXT_PARAM_RINGSIZE:
        default:
                ret = -EINVAL;
                break;
@@ -2069,18 +2008,6 @@ static int create_setparam(struct i915_user_extension __user *ext, void *data)
        return ctx_setparam(arg->fpriv, arg->ctx, &local.param);
 }
 
-static int copy_ring_size(struct intel_context *dst,
-                         struct intel_context *src)
-{
-       long sz;
-
-       sz = intel_context_get_ring_size(src);
-       if (sz < 0)
-               return sz;
-
-       return intel_context_set_ring_size(dst, sz);
-}
-
 static int clone_engines(struct i915_gem_context *dst,
                         struct i915_gem_context *src)
 {
@@ -2125,12 +2052,6 @@ static int clone_engines(struct i915_gem_context *dst,
                }
 
                intel_context_set_gem(clone->engines[n], dst);
-
-               /* Copy across the preferred ringsize */
-               if (copy_ring_size(clone->engines[n], e->engines[n])) {
-                       __free_engines(clone, n + 1);
-                       goto err_unlock;
-               }
        }
        clone->num_engines = n;
        i915_sw_fence_complete(&e->fence);
@@ -2490,11 +2411,8 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data,
                args->value = i915_gem_context_is_persistent(ctx);
                break;
 
-       case I915_CONTEXT_PARAM_RINGSIZE:
-               ret = get_ringsize(ctx, args);
-               break;
-
        case I915_CONTEXT_PARAM_BAN_PERIOD:
+       case I915_CONTEXT_PARAM_RINGSIZE:
        default:
                ret = -EINVAL;
                break;