From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH] drm/i915: check for drm_universal_plane_init error Date: Mon, 21 Mar 2016 13:19:24 +0000 Message-ID: <1458566364-31718-1-git-send-email-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E6676E173 for ; Mon, 21 Mar 2016 13:19:35 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDMyICsrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMTEg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDc0YjAx NjUuLmI3MjhmMzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzOTY1 LDYgKzEzOTY1LDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX3ByaW1hcnlfcGxh bmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGludGVsX3BsYW5lX3N0 YXRlICpzdGF0ZTsKIAljb25zdCB1aW50MzJfdCAqaW50ZWxfcHJpbWFyeV9mb3JtYXRzOwogCXVu c2lnbmVkIGludCBudW1fZm9ybWF0czsKKwlpbnQgcmV0OwogCiAJcHJpbWFyeSA9IGt6YWxsb2Mo c2l6ZW9mKCpwcmltYXJ5KSwgR0ZQX0tFUk5FTCk7CiAJaWYgKHByaW1hcnkgPT0gTlVMTCkKQEAg LTE0MDE2LDEwICsxNDAxNywxNCBAQCBzdGF0aWMgc3RydWN0IGRybV9wbGFuZSAqaW50ZWxfcHJp bWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcHJpbWFyeS0+ZGlz YWJsZV9wbGFuZSA9IGk5eHhfZGlzYWJsZV9wcmltYXJ5X3BsYW5lOwogCX0KIAotCWRybV91bml2 ZXJzYWxfcGxhbmVfaW5pdChkZXYsICZwcmltYXJ5LT5iYXNlLCAwLAotCQkJCSAmaW50ZWxfcGxh bmVfZnVuY3MsCi0JCQkJIGludGVsX3ByaW1hcnlfZm9ybWF0cywgbnVtX2Zvcm1hdHMsCi0JCQkJ IERSTV9QTEFORV9UWVBFX1BSSU1BUlksIE5VTEwpOworCXJldCA9IGRybV91bml2ZXJzYWxfcGxh bmVfaW5pdChkZXYsICZwcmltYXJ5LT5iYXNlLCAwLAorCQkJCSAgICAgICAmaW50ZWxfcGxhbmVf ZnVuY3MsCisJCQkJICAgICAgIGludGVsX3ByaW1hcnlfZm9ybWF0cywgbnVtX2Zvcm1hdHMsCisJ CQkJICAgICAgIERSTV9QTEFORV9UWVBFX1BSSU1BUlksIE5VTEwpOworCWlmIChyZXQpIHsKKwkJ a2ZyZWUocHJpbWFyeSk7CisJCXJldHVybiBFUlJfUFRSKHJldCk7CisJfQogCiAJaWYgKElOVEVM X0lORk8oZGV2KS0+Z2VuID49IDQpCiAJCWludGVsX2NyZWF0ZV9yb3RhdGlvbl9wcm9wZXJ0eShk ZXYsIHByaW1hcnkpOwpAQCAtMTQxNDUsNiArMTQxNTAsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9w bGFuZSAqaW50ZWxfY3Vyc29yX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog ewogCXN0cnVjdCBpbnRlbF9wbGFuZSAqY3Vyc29yOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqc3RhdGU7CisJaW50IHJldDsKIAogCWN1cnNvciA9IGt6YWxsb2Moc2l6ZW9mKCpjdXJzb3Ip LCBHRlBfS0VSTkVMKTsKIAlpZiAoY3Vyc29yID09IE5VTEwpCkBAIC0xNDE2NiwxMSArMTQxNzIs MTUgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX2N1cnNvcl9wbGFuZV9jcmVhdGUo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAljdXJzb3ItPnVwZGF0ZV9wbGFuZSA9IGludGVsX3Vw ZGF0ZV9jdXJzb3JfcGxhbmU7CiAJY3Vyc29yLT5kaXNhYmxlX3BsYW5lID0gaW50ZWxfZGlzYWJs ZV9jdXJzb3JfcGxhbmU7CiAKLQlkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoZGV2LCAmY3Vyc29y LT5iYXNlLCAwLAotCQkJCSAmaW50ZWxfcGxhbmVfZnVuY3MsCi0JCQkJIGludGVsX2N1cnNvcl9m b3JtYXRzLAotCQkJCSBBUlJBWV9TSVpFKGludGVsX2N1cnNvcl9mb3JtYXRzKSwKLQkJCQkgRFJN X1BMQU5FX1RZUEVfQ1VSU09SLCBOVUxMKTsKKwlyZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2lu aXQoZGV2LCAmY3Vyc29yLT5iYXNlLCAwLAorCQkJCSAgICAgICAmaW50ZWxfcGxhbmVfZnVuY3Ms CisJCQkJICAgICAgIGludGVsX2N1cnNvcl9mb3JtYXRzLAorCQkJCSAgICAgICBBUlJBWV9TSVpF KGludGVsX2N1cnNvcl9mb3JtYXRzKSwKKwkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVfQ1VSU09S LCBOVUxMKTsKKwlpZiAocmV0KSB7CisJCWtmcmVlKGN1cnNvcik7CisJCXJldHVybiBFUlJfUFRS KHJldCk7CisJfQogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDQpIHsKIAkJaWYgKCFk ZXYtPm1vZGVfY29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5KQpAQCAtMTQyMzksMTEgKzE0MjQ5LDEx IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBp bnQgcGlwZSkKIAl9CiAKIAlwcmltYXJ5ID0gaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUoZGV2 LCBwaXBlKTsKLQlpZiAoIXByaW1hcnkpCisJaWYgKElTX0VSUl9PUl9OVUxMKHByaW1hcnkpKQog CQlnb3RvIGZhaWw7CiAKIAljdXJzb3IgPSBpbnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRlKGRldiwg cGlwZSk7Ci0JaWYgKCFjdXJzb3IpCisJaWYgKElTX0VSUl9PUl9OVUxMKGN1cnNvcikpCiAJCWdv dG8gZmFpbDsKIAogCXJldCA9IGRybV9jcnRjX2luaXRfd2l0aF9wbGFuZXMoZGV2LCAmaW50ZWxf Y3J0Yy0+YmFzZSwgcHJpbWFyeSwKLS0gCjIuNC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK