Merge tag 'drm-intel-gt-next-2021-04-06' of git://anongit.freedesktop.org/drm/drm...

[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 66a769d..fd8ee52 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -649,7 +649,7 @@ __create_context(struct drm_i915_private *i915)
 
        kref_init(&ctx->ref);
        ctx->i915 = i915;
-       ctx->sched.priority = I915_USER_PRIORITY(I915_PRIORITY_NORMAL);
+       ctx->sched.priority = I915_PRIORITY_NORMAL;
        mutex_init(&ctx->mutex);
        INIT_LIST_HEAD(&ctx->link);
 
@@ -1966,7 +1966,7 @@ static int set_priority(struct i915_gem_context *ctx,
            !capable(CAP_SYS_NICE))
                return -EPERM;
 
-       ctx->sched.priority = I915_USER_PRIORITY(priority);
+       ctx->sched.priority = priority;
        context_apply_all(ctx, __apply_priority, ctx);
 
        return 0;
@@ -2470,7 +2470,7 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data,
 
        case I915_CONTEXT_PARAM_PRIORITY:
                args->size = 0;
-               args->value = ctx->sched.priority >> I915_USER_PRIORITY_SHIFT;
+               args->value = ctx->sched.priority;
                break;
 
        case I915_CONTEXT_PARAM_SSEU: