From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Wed, 07 Aug 2019 12:28:32 +0000 Subject: [PATCH] drm/i915: Fix some NULL vs IS_ERR() conditions Message-Id: <20190807122832.GA10517@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Jani Nikula , Chris Wilson Cc: Tvrtko Ursulin , David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi There were several places which check for NULL when they should have been checking for IS_ERR(). Fixes: d8af05ff38ae ("drm/i915: Allow sharing the idle-barrier from other kernel requests") Signed-off-by: Dan Carpenter --- drivers/gpu/drm/i915/gt/selftest_context.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/selftest_context.c b/drivers/gpu/drm/i915/gt/selftest_context.c index d39b5594cb02..6e7e9a6fd235 100644 --- a/drivers/gpu/drm/i915/gt/selftest_context.c +++ b/drivers/gpu/drm/i915/gt/selftest_context.c @@ -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(>->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(>->i915->drm.struct_mutex); fixme = live_context(gt->i915, file); - if (!fixme) { - err = -ENOMEM; + if (IS_ERR(fixme)) { + err = PTR_ERR(fixme); goto unlock; } -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm/i915: Fix some NULL vs IS_ERR() conditions Date: Wed, 7 Aug 2019 15:28:32 +0300 Message-ID: <20190807122832.GA10517@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jani Nikula , Chris Wilson Cc: Tvrtko Ursulin , David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi List-Id: dri-devel@lists.freedesktop.org VGhlcmUgd2VyZSBzZXZlcmFsIHBsYWNlcyB3aGljaCBjaGVjayBmb3IgTlVMTCB3aGVuIHRoZXkg c2hvdWxkIGhhdmUKYmVlbiBjaGVja2luZyBmb3IgSVNfRVJSKCkuCgpGaXhlczogZDhhZjA1ZmYz OGFlICgiZHJtL2k5MTU6IEFsbG93IHNoYXJpbmcgdGhlIGlkbGUtYmFycmllciBmcm9tIG90aGVy IGtlcm5lbCByZXF1ZXN0cyIpClNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJw ZW50ZXJAb3JhY2xlLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9zZWxmdGVzdF9j b250ZXh0LmMgfCAyMCArKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGlu c2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2d0L3NlbGZ0ZXN0X2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L3Nl bGZ0ZXN0X2NvbnRleHQuYwppbmRleCBkMzliNTU5NGNiMDIuLjZlN2U5YTZmZDIzNSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Qvc2VsZnRlc3RfY29udGV4dC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2d0L3NlbGZ0ZXN0X2NvbnRleHQuYwpAQCAtODYsOCArODYsOCBA QCBzdGF0aWMgaW50IF9fbGl2ZV9hY3RpdmVfY29udGV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUsCiAJfQogCiAJY2UgPSBpbnRlbF9jb250ZXh0X2NyZWF0ZShmaXhtZSwgZW5naW5l KTsKLQlpZiAoIWNlKQotCQlyZXR1cm4gLUVOT01FTTsKKwlpZiAoSVNfRVJSKGNlKSkKKwkJcmV0 dXJuIFBUUl9FUlIoY2UpOwogCiAJZm9yIChwYXNzID0gMDsgcGFzcyA8PSAyOyBwYXNzKyspIHsK IAkJc3RydWN0IGk5MTVfcmVxdWVzdCAqcnE7CkBAIC0xNjEsOCArMTYxLDggQEAgc3RhdGljIGlu dCBsaXZlX2FjdGl2ZV9jb250ZXh0KHZvaWQgKmFyZykKIAltdXRleF9sb2NrKCZndC0+aTkxNS0+ ZHJtLnN0cnVjdF9tdXRleCk7CiAKIAlmaXhtZSA9IGxpdmVfY29udGV4dChndC0+aTkxNSwgZmls ZSk7Ci0JaWYgKCFmaXhtZSkgewotCQllcnIgPSAtRU5PTUVNOworCWlmIChJU19FUlIoZml4bWUp KSB7CisJCWVyciA9IFBUUl9FUlIoZml4bWUpOwogCQlnb3RvIHVubG9jazsKIAl9CiAKQEAgLTIy NiwxMiArMjI2LDEyIEBAIHN0YXRpYyBpbnQgX19saXZlX3JlbW90ZV9jb250ZXh0KHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkgKi8KIAogCXJlbW90ZSA9IGludGVsX2NvbnRleHRf Y3JlYXRlKGZpeG1lLCBlbmdpbmUpOwotCWlmICghcmVtb3RlKQotCQlyZXR1cm4gLUVOT01FTTsK KwlpZiAoSVNfRVJSKHJlbW90ZSkpCisJCXJldHVybiBQVFJfRVJSKHJlbW90ZSk7CiAKIAlsb2Nh bCA9IGludGVsX2NvbnRleHRfY3JlYXRlKGZpeG1lLCBlbmdpbmUpOwotCWlmICghbG9jYWwpIHsK LQkJZXJyID0gLUVOT01FTTsKKwlpZiAoSVNfRVJSKGxvY2FsKSkgeworCQllcnIgPSBQVFJfRVJS KGxvY2FsKTsKIAkJZ290byBlcnJfcmVtb3RlOwogCX0KIApAQCAtMjc0LDggKzI3NCw4IEBAIHN0 YXRpYyBpbnQgbGl2ZV9yZW1vdGVfY29udGV4dCh2b2lkICphcmcpCiAJbXV0ZXhfbG9jaygmZ3Qt Pmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCiAJZml4bWUgPSBsaXZlX2NvbnRleHQoZ3QtPmk5 MTUsIGZpbGUpOwotCWlmICghZml4bWUpIHsKLQkJZXJyID0gLUVOT01FTTsKKwlpZiAoSVNfRVJS KGZpeG1lKSkgeworCQllcnIgPSBQVFJfRVJSKGZpeG1lKTsKIAkJZ290byB1bmxvY2s7CiAJfQog Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bA==