UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Fix some NULL vs IS_ERR() conditions 

There were several places which check for NULL when they should have
been checking for IS_ERR().

Fixes: d8af05ff38 ("drm/i915: Allow sharing the idle-barrier from other kernel requests")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190807122832.GA10517@mwanda
This commit is contained in:
Dan Carpenter 2019-08-07 15:28:32 +03:00 committed by Chris Wilson
parent 9ae06cad82
commit ed29da7123
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/i915/gt/selftest_context.c
View File

@ -86,8 +86,8 @@ static int __live_active_context(struct intel_engine_cs *engine,
}
ce = intel_context_create(fixme, engine);
if (!ce)
return -ENOMEM;
if (IS_ERR(ce))
return PTR_ERR(ce);
for (pass = 0; pass <= 2; pass++) {
struct i915_request *rq;
@ -161,8 +161,8 @@ static int live_active_context(void *arg)
mutex_lock(&gt->i915->drm.struct_mutex);
fixme = live_context(gt->i915, file);
if (!fixme) {
err = -ENOMEM;
if (IS_ERR(fixme)) {
err = PTR_ERR(fixme);
goto unlock;
}
@ -226,12 +226,12 @@ static int __live_remote_context(struct intel_engine_cs *engine,
*/
remote = intel_context_create(fixme, engine);
if (!remote)
return -ENOMEM;
if (IS_ERR(remote))
return PTR_ERR(remote);
local = intel_context_create(fixme, engine);
if (!local) {
err = -ENOMEM;
if (IS_ERR(local)) {
err = PTR_ERR(local);
goto err_remote;
}
@ -274,8 +274,8 @@ static int live_remote_context(void *arg)
mutex_lock(&gt->i915->drm.struct_mutex);
fixme = live_context(gt->i915, file);
if (!fixme) {
err = -ENOMEM;
if (IS_ERR(fixme)) {
err = PTR_ERR(fixme);
goto unlock;
}