drm/i915/gt: Use the correct error value when kernel_context() fails
Subsystems (2)
PATCH 1/1 drm/i915/gt: Use the correct error value when kernel_context() fails
kernel_context() returns an error pointer. Use pointer-error conversion functions to evaluate its return value, rather than checking for a '0' return.
Fixes eb5c10cbbc2f ("drm/i915: Remove I915_USER_PRIORITY_SHIFT")
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Andi Shyti <[email protected]>
Cc Chris Wilson < [email protected]>
Cc <[email protected]> # v5.13+
--- drivers/gpu/drm/i915/gt/selftest_execlists.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gt/selftest_execlists.c +8 -4
@@ -1530,8 +1530,8 @@ static int live_busywait_preempt(void *arg)struct drm_i915_gem_object *obj;struct i915_vma *vma;enum intel_engine_id id; -int err = -ENOMEM ;u32 *map; +int err;/* * Verify that even without HAS_LOGICAL_RING_PREEMPTION, we can
@@ -1539,13 +1539,17 @@ static int live_busywait_preempt(void *arg)*/ ctx_hi =kernel_context (gt->i915,NULL ); -if (!ctx_hi) -return -ENOMEM ; +if (IS_ERR (ctx_hi)) +return PTR_ERR (ctx_hi); + ctx_hi->sched.priority =I915_CONTEXT_MAX_USER_PRIORITY ; ctx_lo =kernel_context (gt->i915,NULL ); -if (!ctx_lo) +if (IS_ERR (ctx_lo)) { + err =PTR_ERR (ctx_lo); goto err_ctx_hi; + } + ctx_lo->sched.priority =I915_CONTEXT_MIN_USER_PRIORITY ; obj =i915_gem_object_create_internal (gt->i915,PAGE_SIZE );
Signature · 1 line
2.40.1
Hi Nathan and all,
please ignore, I sent the wrong file.
Andi
Quoted 50 lines · Andi Shyti
kernel_context()returns an error pointer. Use pointer-error conversion functions to evaluate its return value, rather than checking for a '0' return.Fixes eb5c10cbbc2f ("drm/i915: Remove I915_USER_PRIORITY_SHIFT")Reported-by Dan Carpenter <[email protected]>Signed-off-by Andi Shyti <[email protected]>Cc Chris Wilson < [email protected]>Cc <[email protected]> # v5.13+--- drivers/gpu/drm/i915/gt/selftest_execlists.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/gt/selftest_execlists.c +8
-4@@ -1530,8 +1530,8 @@ static int live_busywait_preempt(void *arg)struct drm_i915_gem_object *obj;struct i915_vma *vma;enum intel_engine_id id; -int err = -ENOMEM ;u32 *map; +int err;/* * Verify that even without HAS_LOGICAL_RING_PREEMPTION, we can @@ -1539,13 +1539,17 @@ static int live_busywait_preempt(void *arg)*/ ctx_hi =kernel_context (gt->i915,NULL ); -if (!ctx_hi) -return -ENOMEM ; +if (IS_ERR (ctx_hi)) +return PTR_ERR (ctx_hi); + ctx_hi->sched.priority =I915_CONTEXT_MAX_USER_PRIORITY ; ctx_lo =kernel_context (gt->i915,NULL ); -if (!ctx_lo) +if (IS_ERR (ctx_lo)) { + err =PTR_ERR (ctx_lo); goto err_ctx_hi; + } + ctx_lo->sched.priority =I915_CONTEXT_MIN_USER_PRIORITY ; obj =i915_gem_object_create_internal (gt->i915,PAGE_SIZE );Signature · 1 line
2.40.1