From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve Longerbeam Subject: [PATCH 52/72] imx-drm: Reset ipu unit pointers to NULL on errors Date: Fri, 31 Oct 2014 15:54:35 -0700 Message-ID: <1414796095-10107-53-git-send-email-steve_longerbeam@mentor.com> References: <1414796095-10107-1-git-send-email-steve_longerbeam@mentor.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 048516E850 for ; Fri, 31 Oct 2014 15:57:31 -0700 (PDT) Received: by mail-pa0-f43.google.com with SMTP id eu11so8609484pac.2 for ; Fri, 31 Oct 2014 15:57:30 -0700 (PDT) In-Reply-To: <1414796095-10107-1-git-send-email-steve_longerbeam@mentor.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SW4gdGhlIGNydGMgYW5kIHBsYW5lIGRyaXZlcnMgaXQgaXMgcG9zc2libGUgdGhlIGlwdSB1bml0 IHBvaW50ZXJzCmNvdWxkIGJlIGxlZnQgYXQgZXJyb3IgcG9pbnRlciB2YWx1ZXMuIFJlc2V0IHRo ZW0gdG8gTlVMTCBvbiBlcnJvcnMKdG8gcHJldmVudCB0aGlzLiBBbHNvIGlwdV9wdXRfcmVzb3Vy Y2VzKCkgc2hvdWxkIHJlc2V0IHRoZSB1bml0cyB0bwpOVUxMIGFmdGVyIHJlbGVhc2luZyB0aGVt LgoKU2lnbmVkLW9mZi1ieTogU3RldmUgTG9uZ2VyYmVhbSA8c3RldmVfbG9uZ2VyYmVhbUBtZW50 b3IuY29tPgotLS0KIGRyaXZlcnMvc3RhZ2luZy9pbXgtZHJtL2lwdXYzLWNydGMuYyAgfCAgIDEx ICsrKysrKysrKy0tCiBkcml2ZXJzL3N0YWdpbmcvaW14LWRybS9pcHV2My1wbGFuZS5jIHwgICAx NSArKysrKysrKysrKystLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgNSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvaW14LWRybS9pcHV2My1j cnRjLmMgYi9kcml2ZXJzL3N0YWdpbmcvaW14LWRybS9pcHV2My1jcnRjLmMKaW5kZXggNDIzYjAw NC4uMzA0MGY4ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2lteC1kcm0vaXB1djMtY3J0 Yy5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9pbXgtZHJtL2lwdXYzLWNydGMuYwpAQCAtMzc1LDEz ICszNzUsMTggQEAgZGV2X3B1dDoKIAogc3RhdGljIHZvaWQgaXB1X3B1dF9yZXNvdXJjZXMoc3Ry dWN0IGlwdV9jcnRjICppcHVfY3J0YykKIHsKLQlpZiAoIUlTX0VSUl9PUl9OVUxMKGlwdV9jcnRj LT5kYykpCisJaWYgKCFJU19FUlJfT1JfTlVMTChpcHVfY3J0Yy0+ZGMpKSB7CiAJCWlwdV9kY19w dXQoaXB1X2NydGMtPmRjKTsKLQlpZiAoIUlTX0VSUl9PUl9OVUxMKGlwdV9jcnRjLT5kaSkpCisJ CWlwdV9jcnRjLT5kYyA9IE5VTEw7CisJfQorCWlmICghSVNfRVJSX09SX05VTEwoaXB1X2NydGMt PmRpKSkgewogCQlpcHVfZGlfcHV0KGlwdV9jcnRjLT5kaSk7CisJCWlwdV9jcnRjLT5kaSA9IE5V TEw7CisJfQogCWlmICghSVNfRVJSX09SX05VTEwoaXB1X2NydGMtPmlwdV9kZXYpKSB7CiAJCW1v ZHVsZV9wdXQoaXB1X2NydGMtPmlwdV9kZXYtPmRyaXZlci0+b3duZXIpOwogCQlwdXRfZGV2aWNl KGlwdV9jcnRjLT5pcHVfZGV2KTsKKwkJaXB1X2NydGMtPmlwdV9kZXYgPSBOVUxMOwogCX0KIH0K IApAQCAtNDExLDYgKzQxNiw3IEBAIHN0YXRpYyBpbnQgaXB1X2dldF9yZXNvdXJjZXMoc3RydWN0 IGlwdV9jcnRjICppcHVfY3J0YywKIAlpcHVfY3J0Yy0+ZGkgPSBpcHVfZGlfZ2V0KGlwdV9jcnRj LT5pcHUsIGRpKTsKIAlpZiAoSVNfRVJSKGlwdV9jcnRjLT5kaSkpIHsKIAkJcmV0ID0gUFRSX0VS UihpcHVfY3J0Yy0+ZGkpOworCQlpcHVfY3J0Yy0+ZGkgPSBOVUxMOwogCQlnb3RvIGVycl9vdXQ7 CiAJfQogCkBAIC00MjUsNiArNDMxLDcgQEAgc3RhdGljIGludCBpcHVfZ2V0X3Jlc291cmNlcyhz dHJ1Y3QgaXB1X2NydGMgKmlwdV9jcnRjLAogCWlwdV9jcnRjLT5kYyA9IGlwdV9kY19nZXQoaXB1 X2NydGMtPmlwdSwgaXB1X2NydGMtPmNoLT5kYyk7CiAJaWYgKElTX0VSUihpcHVfY3J0Yy0+ZGMp KSB7CiAJCXJldCA9IFBUUl9FUlIoaXB1X2NydGMtPmRjKTsKKwkJaXB1X2NydGMtPmRjID0gTlVM TDsKIAkJZ290byBlcnJfb3V0OwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2lt eC1kcm0vaXB1djMtcGxhbmUuYyBiL2RyaXZlcnMvc3RhZ2luZy9pbXgtZHJtL2lwdXYzLXBsYW5l LmMKaW5kZXggNzZhYzE3OC4uM2ExZWJmZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2lt eC1kcm0vaXB1djMtcGxhbmUuYworKysgYi9kcml2ZXJzL3N0YWdpbmcvaW14LWRybS9pcHV2My1w bGFuZS5jCkBAIC0yODUsMTIgKzI4NSwxOCBAQCB2b2lkIGlwdV9wbGFuZV9wdXRfcmVzb3VyY2Vz KHN0cnVjdCBpcHVfcGxhbmUgKmlwdV9wbGFuZSkKIAkJCSAgICAgIGlwdV9wbGFuZS0+aXJxLCBp cHVfcGxhbmUpOwogCQlpcHVfcGxhbmUtPmlycSA9IDA7CiAJfQotCWlmICghSVNfRVJSX09SX05V TEwoaXB1X3BsYW5lLT5kcCkpCisJaWYgKCFJU19FUlJfT1JfTlVMTChpcHVfcGxhbmUtPmRwKSkg ewogCQlpcHVfZHBfcHV0KGlwdV9wbGFuZS0+ZHApOwotCWlmICghSVNfRVJSX09SX05VTEwoaXB1 X3BsYW5lLT5kbWZjKSkKKwkJaXB1X3BsYW5lLT5kcCA9IE5VTEw7CisJfQorCWlmICghSVNfRVJS X09SX05VTEwoaXB1X3BsYW5lLT5kbWZjKSkgewogCQlpcHVfZG1mY19wdXQoaXB1X3BsYW5lLT5k bWZjKTsKLQlpZiAoIUlTX0VSUl9PUl9OVUxMKGlwdV9wbGFuZS0+aXB1X2NoKSkKKwkJaXB1X3Bs YW5lLT5kbWZjID0gTlVMTDsKKwl9CisJaWYgKCFJU19FUlJfT1JfTlVMTChpcHVfcGxhbmUtPmlw dV9jaCkpIHsKIAkJaXB1X2lkbWFjX3B1dChpcHVfcGxhbmUtPmlwdV9jaCk7CisJCWlwdV9wbGFu ZS0+aXB1X2NoID0gTlVMTDsKKwl9CiB9CiAKIGludCBpcHVfcGxhbmVfZ2V0X3Jlc291cmNlcyhz dHJ1Y3QgaXB1X3BsYW5lICppcHVfcGxhbmUpCkBAIC0zMDAsNiArMzA2LDcgQEAgaW50IGlwdV9w bGFuZV9nZXRfcmVzb3VyY2VzKHN0cnVjdCBpcHVfcGxhbmUgKmlwdV9wbGFuZSkKIAlpcHVfcGxh bmUtPmlwdV9jaCA9IGlwdV9pZG1hY19nZXQoaXB1X3BsYW5lLT5pcHUsIGlwdV9wbGFuZS0+ZG1h KTsKIAlpZiAoSVNfRVJSKGlwdV9wbGFuZS0+aXB1X2NoKSkgewogCQlyZXQgPSBQVFJfRVJSKGlw dV9wbGFuZS0+aXB1X2NoKTsKKwkJaXB1X3BsYW5lLT5pcHVfY2ggPSBOVUxMOwogCQlEUk1fRVJS T1IoImZhaWxlZCB0byBnZXQgaWRtYWMgY2hhbm5lbDogJWRcbiIsIHJldCk7CiAJCXJldHVybiBy ZXQ7CiAJfQpAQCAtMzA3LDYgKzMxNCw3IEBAIGludCBpcHVfcGxhbmVfZ2V0X3Jlc291cmNlcyhz dHJ1Y3QgaXB1X3BsYW5lICppcHVfcGxhbmUpCiAJaXB1X3BsYW5lLT5kbWZjID0gaXB1X2RtZmNf Z2V0KGlwdV9wbGFuZS0+aXB1LCBpcHVfcGxhbmUtPmRtYSk7CiAJaWYgKElTX0VSUihpcHVfcGxh bmUtPmRtZmMpKSB7CiAJCXJldCA9IFBUUl9FUlIoaXB1X3BsYW5lLT5kbWZjKTsKKwkJaXB1X3Bs YW5lLT5kbWZjID0gTlVMTDsKIAkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gZ2V0IGRtZmM6IHJldCAl ZFxuIiwgcmV0KTsKIAkJZ290byBlcnJfb3V0OwogCX0KQEAgLTMxNSw2ICszMjMsNyBAQCBpbnQg aXB1X3BsYW5lX2dldF9yZXNvdXJjZXMoc3RydWN0IGlwdV9wbGFuZSAqaXB1X3BsYW5lKQogCQlp cHVfcGxhbmUtPmRwID0gaXB1X2RwX2dldChpcHVfcGxhbmUtPmlwdSwgaXB1X3BsYW5lLT5kcF9m bG93KTsKIAkJaWYgKElTX0VSUihpcHVfcGxhbmUtPmRwKSkgewogCQkJcmV0ID0gUFRSX0VSUihp cHVfcGxhbmUtPmRwKTsKKwkJCWlwdV9wbGFuZS0+ZHAgPSBOVUxMOwogCQkJRFJNX0VSUk9SKCJm YWlsZWQgdG8gZ2V0IGRwIGZsb3c6ICVkXG4iLCByZXQpOwogCQkJZ290byBlcnJfb3V0OwogCQl9 Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo=