From: James Ausmus Subject: [PATCH v3] drm/i915: Handle drm-layer errors in intel_dp_add_mst_connector Date: Fri, 15 Sep 2017 12:42:42 -0700 Message-ID: <20170915194242.29569-1-james.ausmus@intel.com> References: <20170914195935.2408-1-james.ausmus@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id E77DE6ECBB for ; Fri, 15 Sep 2017 19:43:57 +0000 (UTC) In-Reply-To: <20170914195935.2408-1-james.ausmus@intel.com> 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 TWFrZSBpbnRlbF9kcF9hZGRfbXN0X2Nvbm5lY3RvciBoYW5kbGUgZXJyb3IgcmV0dXJucyBmcm9t IHRoZSBkcm1fIGNhbGxzLgpBZGQgaW50ZWxfY29ubmVjdG9yX2ZyZWUgdG8gc3VwcG9ydCBjbGVh bnVwIG9uIHRoZSBlcnJvciBwYXRoLgoKdjI6IFJlbmFtZSBuZXcgZnVuY3Rpb24gdG8gYXZvaWQg Y29uZnVzaW9uLCBhbmQgc2ltcGxpZnkgZXJyb3IKcGF0aHMgKFZpbGxlKQoKdjM6IEluZGVudGF0 aW9uIGZpeHVwLCBzdHlsZSBmaXhlcyAoVmlsbGUpCgpTaWduZWQtb2ZmLWJ5OiBKYW1lcyBBdXNt dXMgPGphbWVzLmF1c211c0BpbnRlbC5jb20+Ci0tLQoKTm90ZSB0aGF0IHRoaXMgcGF0Y2ggaXMg Y29tcGlsZS9ib290IHRlc3RlZCBvbmx5IG9uIG5vbi1NU1QsIGFzIEkKY3VycmVudGx5IGRvbid0 IGhhdmUgTVNULWVuYWJsZWQgSFcuCgogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgMTAgKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMg IHwgMjcgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCAgICAgfCAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyks IDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDg1 OTllNDI1YWJiMS4uZTNiMWE2ZWFkNGZiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC02MTQ2LDYgKzYxNDYsMTYgQEAgc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxf Y29ubmVjdG9yX2FsbG9jKHZvaWQpCiAJcmV0dXJuIGNvbm5lY3RvcjsKIH0KIAorLyoKKyAqIEZy ZWUgdGhlIGJpdHMgYWxsb2NhdGVkIGJ5IGludGVsX2Nvbm5lY3Rvcl9hbGxvYy4KKyAqIFR5cGUt c3BlY2lmaWMgY29ubmVjdG9yIGNsZWFudXAgc2hvdWxkIGJlIGRvbmUgcHJpb3IgdG8gdGhpcy4K KyAqLwordm9pZCBpbnRlbF9jb25uZWN0b3JfZnJlZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpj b25uZWN0b3IpCit7CisJa2ZyZWUodG9faW50ZWxfZGlnaXRhbF9jb25uZWN0b3Jfc3RhdGUoY29u bmVjdG9yLT5iYXNlLnN0YXRlKSk7CisJa2ZyZWUoY29ubmVjdG9yKTsKK30KKwogLyogU2ltcGxl IGNvbm5lY3Rvci0+Z2V0X2h3X3N0YXRlIGltcGxlbWVudGF0aW9uIGZvciBlbmNvZGVycyB0aGF0 IHN1cHBvcnQgb25seQogICogb25lIGNvbm5lY3RvciBhbmQgbm8gY2xvbmluZyBhbmQgaGVuY2Ug dGhlIGVuY29kZXIgc3RhdGUgZGV0ZXJtaW5lcyB0aGUgc3RhdGUKICAqIG9mIHRoZSBjb25uZWN0 b3IuICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCmluZGV4IDhlM2FhZDBlYTYwYi4u NDViZjM3MDNiYzVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9t c3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYwpAQCAtNDUxLDE0 ICs0NTEsMTggQEAgc3RhdGljIHN0cnVjdCBkcm1fY29ubmVjdG9yICppbnRlbF9kcF9hZGRfbXN0 X2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2RwX21zdF90b3BvbG8KIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7CiAJc3RydWN0IGludGVsX2Nvbm5l Y3RvciAqaW50ZWxfY29ubmVjdG9yOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7 Ci0JaW50IGk7CisJaW50IGksIHJldDsKIAogCWludGVsX2Nvbm5lY3RvciA9IGludGVsX2Nvbm5l Y3Rvcl9hbGxvYygpOwogCWlmICghaW50ZWxfY29ubmVjdG9yKQogCQlyZXR1cm4gTlVMTDsKIAog CWNvbm5lY3RvciA9ICZpbnRlbF9jb25uZWN0b3ItPmJhc2U7Ci0JZHJtX2Nvbm5lY3Rvcl9pbml0 KGRldiwgY29ubmVjdG9yLCAmaW50ZWxfZHBfbXN0X2Nvbm5lY3Rvcl9mdW5jcywgRFJNX01PREVf Q09OTkVDVE9SX0Rpc3BsYXlQb3J0KTsKKwlyZXQgPSBkcm1fY29ubmVjdG9yX2luaXQoZGV2LCBj b25uZWN0b3IsICZpbnRlbF9kcF9tc3RfY29ubmVjdG9yX2Z1bmNzLAorCQkJCSBEUk1fTU9ERV9D T05ORUNUT1JfRGlzcGxheVBvcnQpOworCWlmIChyZXQpCisJCWdvdG8gb3V0X2ZyZWU7CisKIAlk cm1fY29ubmVjdG9yX2hlbHBlcl9hZGQoY29ubmVjdG9yLCAmaW50ZWxfZHBfbXN0X2Nvbm5lY3Rv cl9oZWxwZXJfZnVuY3MpOwogCiAJaW50ZWxfY29ubmVjdG9yLT5nZXRfaHdfc3RhdGUgPSBpbnRl bF9kcF9tc3RfZ2V0X2h3X3N0YXRlOwpAQCAtNDY2LDE1ICs0NzAsMjggQEAgc3RhdGljIHN0cnVj dCBkcm1fY29ubmVjdG9yICppbnRlbF9kcF9hZGRfbXN0X2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2Rw X21zdF90b3BvbG8KIAlpbnRlbF9jb25uZWN0b3ItPnBvcnQgPSBwb3J0OwogCiAJZm9yIChpID0g UElQRV9BOyBpIDw9IFBJUEVfQzsgaSsrKSB7Ci0JCWRybV9tb2RlX2Nvbm5lY3Rvcl9hdHRhY2hf ZW5jb2RlcigmaW50ZWxfY29ubmVjdG9yLT5iYXNlLAotCQkJCQkJICAmaW50ZWxfZHAtPm1zdF9l bmNvZGVyc1tpXS0+YmFzZS5iYXNlKTsKKwkJc3RydWN0IGRybV9lbmNvZGVyICplbmMgPSAmaW50 ZWxfZHAtPm1zdF9lbmNvZGVyc1tpXS0+YmFzZS5iYXNlOworCisJCXJldCA9IGRybV9tb2RlX2Nv bm5lY3Rvcl9hdHRhY2hfZW5jb2RlcigmaW50ZWxfY29ubmVjdG9yLT5iYXNlLAorCQkJCQkJCWVu Yyk7CisJCWlmIChyZXQpCisJCQlnb3RvIG91dF9jbGVhbnVwOwogCX0KIAogCWRybV9vYmplY3Rf YXR0YWNoX3Byb3BlcnR5KCZjb25uZWN0b3ItPmJhc2UsIGRldi0+bW9kZV9jb25maWcucGF0aF9w cm9wZXJ0eSwgMCk7CiAJZHJtX29iamVjdF9hdHRhY2hfcHJvcGVydHkoJmNvbm5lY3Rvci0+YmFz ZSwgZGV2LT5tb2RlX2NvbmZpZy50aWxlX3Byb3BlcnR5LCAwKTsKIAotCWRybV9tb2RlX2Nvbm5l Y3Rvcl9zZXRfcGF0aF9wcm9wZXJ0eShjb25uZWN0b3IsIHBhdGhwcm9wKTsKKwlyZXQgPSBkcm1f bW9kZV9jb25uZWN0b3Jfc2V0X3BhdGhfcHJvcGVydHkoY29ubmVjdG9yLCBwYXRocHJvcCk7CisJ aWYgKHJldCkKKwkJZ290byBvdXRfY2xlYW51cDsKKwogCXJldHVybiBjb25uZWN0b3I7CisKK291 dF9jbGVhbnVwOgorCWRybV9jb25uZWN0b3JfY2xlYW51cChjb25uZWN0b3IpOworb3V0X2ZyZWU6 CisJaW50ZWxfY29ubmVjdG9yX2ZyZWUoaW50ZWxfY29ubmVjdG9yKTsKKwlyZXR1cm4gTlVMTDsK IH0KIAogc3RhdGljIHZvaWQgaW50ZWxfZHBfcmVnaXN0ZXJfbXN0X2Nvbm5lY3RvcihzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAz MDc4MDc2NzI4OTYuLjJhNWNlZTQzMDJmNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAg LTEzNTgsNiArMTM1OCw3IEBAIHZvaWQgaW50ZWxfcHBzX3VubG9ja19yZWdzX3dhKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX2VuY29kZXJfZGVzdHJveShz dHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpOwogaW50IGludGVsX2Nvbm5lY3Rvcl9pbml0KHN0 cnVjdCBpbnRlbF9jb25uZWN0b3IgKik7CiBzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9j b25uZWN0b3JfYWxsb2Modm9pZCk7Cit2b2lkIGludGVsX2Nvbm5lY3Rvcl9mcmVlKHN0cnVjdCBp bnRlbF9jb25uZWN0b3IgKmNvbm5lY3Rvcik7CiBib29sIGludGVsX2Nvbm5lY3Rvcl9nZXRfaHdf c3RhdGUoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKTsKIHZvaWQgaW50ZWxfY29u bmVjdG9yX2F0dGFjaF9lbmNvZGVyKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvciwK IAkJCQkgICAgc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwotLSAKMi4xNC4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK