From: James Ausmus Subject: [PATCH v5] drm/i915: Handle drm-layer errors in intel_dp_add_mst_connector Date: Fri, 13 Oct 2017 11:01:44 -0700 Message-ID: <20171013180144.15865-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3DC076E06F for ; Fri, 13 Oct 2017 18:02:56 +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 aW9uIGZpeHVwLCBzdHlsZSBmaXhlcyAoVmlsbGUpCgp2NDogQ2xhcmlmeSB1c2FnZSBvZiBpbnRl bF9jb25uZWN0b3JfZnJlZSwgYW5kIGZpeCB1c2FnZSBvZgppbnRlbF9jb25uZWN0b3JfZnJlZQoK djU6IFJlYmFzZQoKQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IEphbWVzIEF1c211cyA8amFtZXMuYXVzbXVzQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxMyArKysrKysr KysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYyAgfCAyNyArKysrKysr KysrKysrKysrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAg ICB8ICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMTg1YmU1NzI2YjVlLi43 OTZlYWQ0MjVmMjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTYxMzks NiArNjEzOSwxOSBAQCBzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3JfYWxs b2Modm9pZCkKIAlyZXR1cm4gY29ubmVjdG9yOwogfQogCisvKgorICogRnJlZSB0aGUgYml0cyBh bGxvY2F0ZWQgYnkgaW50ZWxfY29ubmVjdG9yX2FsbG9jLgorICogVGhpcyBzaG91bGQgb25seSBi ZSB1c2VkIGFmdGVyIGludGVsX2Nvbm5lY3Rvcl9hbGxvYyBoYXMgcmV0dXJuZWQKKyAqIHN1Y2Nl c3NmdWxseSwgYW5kIGJlZm9yZSBkcm1fY29ubmVjdG9yX2luaXQgcmV0dXJucyBzdWNjZXNzZnVs bHkuCisgKiBPdGhlcndpc2UgdGhlIGRlc3Ryb3kgY2FsbGJhY2tzIGZvciB0aGUgY29ubmVjdG9y IGFuZCB0aGUgc3RhdGUgc2hvdWxkCisgKiB0YWtlIGNhcmUgb2YgcHJvcGVyIGNsZWFudXAvZnJl ZQorICovCit2b2lkIGludGVsX2Nvbm5lY3Rvcl9mcmVlKHN0cnVjdCBpbnRlbF9jb25uZWN0b3Ig KmNvbm5lY3RvcikKK3sKKwlrZnJlZSh0b19pbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9zdGF0ZShj b25uZWN0b3ItPmJhc2Uuc3RhdGUpKTsKKwlrZnJlZShjb25uZWN0b3IpOworfQorCiAvKiBTaW1w bGUgY29ubmVjdG9yLT5nZXRfaHdfc3RhdGUgaW1wbGVtZW50YXRpb24gZm9yIGVuY29kZXJzIHRo YXQgc3VwcG9ydCBvbmx5CiAgKiBvbmUgY29ubmVjdG9yIGFuZCBubyBjbG9uaW5nIGFuZCBoZW5j ZSB0aGUgZW5jb2RlciBzdGF0ZSBkZXRlcm1pbmVzIHRoZSBzdGF0ZQogICogb2YgdGhlIGNvbm5l Y3Rvci4gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKaW5kZXggZjdjNzgyNTc2MTYy Li43NzI1MjE0NDBhOWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw X21zdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCkBAIC00NTgs MTMgKzQ1OCwyMCBAQCBzdGF0aWMgc3RydWN0IGRybV9jb25uZWN0b3IgKmludGVsX2RwX2FkZF9t c3RfY29ubmVjdG9yKHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sbwogCXN0cnVjdCBpbnRlbF9jb25u ZWN0b3IgKmludGVsX2Nvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y OwogCWVudW0gcGlwZSBwaXBlOworCWludCByZXQ7CiAKIAlpbnRlbF9jb25uZWN0b3IgPSBpbnRl bF9jb25uZWN0b3JfYWxsb2MoKTsKIAlpZiAoIWludGVsX2Nvbm5lY3RvcikKIAkJcmV0dXJuIE5V TEw7CiAKIAljb25uZWN0b3IgPSAmaW50ZWxfY29ubmVjdG9yLT5iYXNlOwotCWRybV9jb25uZWN0 b3JfaW5pdChkZXYsIGNvbm5lY3RvciwgJmludGVsX2RwX21zdF9jb25uZWN0b3JfZnVuY3MsIERS TV9NT0RFX0NPTk5FQ1RPUl9EaXNwbGF5UG9ydCk7CisJcmV0ID0gZHJtX2Nvbm5lY3Rvcl9pbml0 KGRldiwgY29ubmVjdG9yLCAmaW50ZWxfZHBfbXN0X2Nvbm5lY3Rvcl9mdW5jcywKKwkJCQkgRFJN X01PREVfQ09OTkVDVE9SX0Rpc3BsYXlQb3J0KTsKKwlpZiAocmV0KSB7CisJCWludGVsX2Nvbm5l Y3Rvcl9mcmVlKGludGVsX2Nvbm5lY3Rvcik7CisJCXJldHVybiBOVUxMOworCX0KKwogCWRybV9j b25uZWN0b3JfaGVscGVyX2FkZChjb25uZWN0b3IsICZpbnRlbF9kcF9tc3RfY29ubmVjdG9yX2hl bHBlcl9mdW5jcyk7CiAKIAlpbnRlbF9jb25uZWN0b3ItPmdldF9od19zdGF0ZSA9IGludGVsX2Rw X21zdF9nZXRfaHdfc3RhdGU7CkBAIC00NzIsMTUgKzQ3OSwyNyBAQCBzdGF0aWMgc3RydWN0IGRy bV9jb25uZWN0b3IgKmludGVsX2RwX2FkZF9tc3RfY29ubmVjdG9yKHN0cnVjdCBkcm1fZHBfbXN0 X3RvcG9sbwogCWludGVsX2Nvbm5lY3Rvci0+cG9ydCA9IHBvcnQ7CiAKIAlmb3JfZWFjaF9waXBl KGRldl9wcml2LCBwaXBlKSB7Ci0JCWRybV9tb2RlX2Nvbm5lY3Rvcl9hdHRhY2hfZW5jb2Rlcigm aW50ZWxfY29ubmVjdG9yLT5iYXNlLAotCQkJCQkJICAmaW50ZWxfZHAtPm1zdF9lbmNvZGVyc1tw aXBlXS0+YmFzZS5iYXNlKTsKKwkJc3RydWN0IGRybV9lbmNvZGVyICplbmMgPQorCQkJJmludGVs X2RwLT5tc3RfZW5jb2RlcnNbcGlwZV0tPmJhc2UuYmFzZTsKKworCQlyZXQgPSBkcm1fbW9kZV9j b25uZWN0b3JfYXR0YWNoX2VuY29kZXIoJmludGVsX2Nvbm5lY3Rvci0+YmFzZSwKKwkJCQkJCQll bmMpOworCQlpZiAocmV0KQorCQkJZ290byBlcnI7CiAJfQogCiAJZHJtX29iamVjdF9hdHRhY2hf cHJvcGVydHkoJmNvbm5lY3Rvci0+YmFzZSwgZGV2LT5tb2RlX2NvbmZpZy5wYXRoX3Byb3BlcnR5 LCAwKTsKIAlkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmY29ubmVjdG9yLT5iYXNlLCBkZXYt Pm1vZGVfY29uZmlnLnRpbGVfcHJvcGVydHksIDApOwogCi0JZHJtX21vZGVfY29ubmVjdG9yX3Nl dF9wYXRoX3Byb3BlcnR5KGNvbm5lY3RvciwgcGF0aHByb3ApOworCXJldCA9IGRybV9tb2RlX2Nv bm5lY3Rvcl9zZXRfcGF0aF9wcm9wZXJ0eShjb25uZWN0b3IsIHBhdGhwcm9wKTsKKwlpZiAocmV0 KQorCQlnb3RvIGVycjsKKwogCXJldHVybiBjb25uZWN0b3I7CisKK2VycjoKKwlkcm1fY29ubmVj dG9yX2NsZWFudXAoY29ubmVjdG9yKTsKKwlyZXR1cm4gTlVMTDsKIH0KIAogc3RhdGljIHZvaWQg aW50ZWxfZHBfcmVnaXN0ZXJfbXN0X2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkNjE5ODVmOTNkNDAuLmY4NjNh MGNhMzlkOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTEzNjMsNiArMTM2Myw3IEBA IHZvaWQgaW50ZWxfcHBzX3VubG9ja19yZWdzX3dhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CiB2b2lkIGludGVsX2VuY29kZXJfZGVzdHJveShzdHJ1Y3QgZHJtX2VuY29kZXIg KmVuY29kZXIpOwogaW50IGludGVsX2Nvbm5lY3Rvcl9pbml0KHN0cnVjdCBpbnRlbF9jb25uZWN0 b3IgKik7CiBzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3JfYWxsb2Modm9p ZCk7Cit2b2lkIGludGVsX2Nvbm5lY3Rvcl9mcmVlKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNv bm5lY3Rvcik7CiBib29sIGludGVsX2Nvbm5lY3Rvcl9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVs X2Nvbm5lY3RvciAqY29ubmVjdG9yKTsKIHZvaWQgaW50ZWxfY29ubmVjdG9yX2F0dGFjaF9lbmNv ZGVyKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJCQkgICAgc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIpOwotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK