From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH 2/2] drm/dp/mst: fixup handling hotplug on port removal. Date: Wed, 16 Sep 2015 11:22:12 +1000 Message-ID: <1442366532-23024-2-git-send-email-airlied@gmail.com> References: <1442366532-23024-1-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 895236E1C0 for ; Tue, 15 Sep 2015 18:22:17 -0700 (PDT) Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id A34EE8EA47 for ; Wed, 16 Sep 2015 01:22:16 +0000 (UTC) Received: from dreadlord-bne-redhat-com.bne.redhat.com (dhcp-40-179.bne.redhat.com [10.64.40.179]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8G1MDBs031413 for ; Tue, 15 Sep 2015 21:22:16 -0400 In-Reply-To: <1442366532-23024-1-git-send-email-airlied@gmail.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 RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KCm91dHB1dCBwb3J0cyBzaG91 bGQgYWx3YXlzIGhhdmUgYSBjb25uZWN0b3IsIHVubGVzcwppbiB0aGUgcmFyZSBjYXNlIGNvbm5l Y3RvciBhbGxvY2F0aW9uIGZhaWxzIGluIHRoZQpkcml2ZXIuCgpJbiB0aGlzIGNhc2Ugd2Ugb25s eSBuZWVkIHRvIHRlYXJkb3duIHRoZSBwZHQsCmFuZCBmcmVlIHRoZSBzdHJ1Y3QsIGFuZCB0aGVy ZSBpcyBubyBuZWVkIHRvCnNlbmQgYSBob3RwbHVnIG1zZy4KCkluIHRoZSBjYXNlIHdlcmUgd2Ug YWRkIHRoZSBwb3J0IHRvIHRoZSBkZXN0cm95Cmxpc3Qgd2UgbmVlZCB0byBzZW5kIGEgaG90cGx1 ZyBpZiB3ZSBkZXN0cm95CmFueSBjb25uZWN0b3JzLCBzbyB1c2Vyc3BhY2Uga25vd3MgdG8gcmVw cm9iZQpzdHVmZi4KCnRoaXMgcGF0Y2ggYWxzbyBoYW5kbGVzIHBvcnQtPmNvbm5lY3RvciBhbGxv Y2F0aW9uCmZhaWxpbmcgd2hpY2ggc2hvdWxkIGJlIGEgcmFyZSBldmVudCwgYnV0IG1ha2VzCnRo ZSBjb2RlIGNvbnNpc3RlbnQuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEFpcmxpZSA8YWlybGllZEBy ZWRoYXQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMgfCAz NiArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI2 IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2RwX21zdF90 b3BvbG9neS5jCmluZGV4IDg3MTEyZDMuLmQxMTA1MmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9kcF9t c3RfdG9wb2xvZ3kuYwpAQCAtODYzLDI5ICs4NjMsMzMgQEAgc3RhdGljIHZvaWQgZHJtX2RwX2Rl c3Ryb3lfcG9ydChzdHJ1Y3Qga3JlZiAqa3JlZikKIHsKIAlzdHJ1Y3QgZHJtX2RwX21zdF9wb3J0 ICpwb3J0ID0gY29udGFpbmVyX29mKGtyZWYsIHN0cnVjdCBkcm1fZHBfbXN0X3BvcnQsIGtyZWYp OwogCXN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyID0gcG9ydC0+bWdyOworCiAJ aWYgKCFwb3J0LT5pbnB1dCkgewogCQlwb3J0LT52Y3BpLm51bV9zbG90cyA9IDA7CiAKIAkJa2Zy ZWUocG9ydC0+Y2FjaGVkX2VkaWQpOwogCi0JCS8qIHdlIGNhbid0IGRlc3Ryb3kgdGhlIGNvbm5l Y3RvciBoZXJlLCBhcwotCQkgICB3ZSBtaWdodCBiZSBob2xkaW5nIHRoZSBtb2RlX2NvbmZpZy5t dXRleAotCQkgICBmcm9tIGFuIEVESUQgcmV0cmlldmFsICovCisJCS8qCisJCSAqIFRoZSBvbmx5 IHRpbWUgd2UgZG9uJ3QgaGF2ZSBhIGNvbm5lY3RvcgorCQkgKiBvbiBhbiBvdXRwdXQgcG9ydCBp cyBpZiB0aGUgY29ubmVjdG9yIGluaXQKKwkJICogZmFpbHMuCisJCSAqLwogCQlpZiAocG9ydC0+ Y29ubmVjdG9yKSB7CisJCQkvKiB3ZSBjYW4ndCBkZXN0cm95IHRoZSBjb25uZWN0b3IgaGVyZSwg YXMKKwkJCSAqIHdlIG1pZ2h0IGJlIGhvbGRpbmcgdGhlIG1vZGVfY29uZmlnLm11dGV4CisJCQkg KiBmcm9tIGFuIEVESUQgcmV0cmlldmFsICovCisKIAkJCW11dGV4X2xvY2soJm1nci0+ZGVzdHJv eV9jb25uZWN0b3JfbG9jayk7CiAJCQlsaXN0X2FkZCgmcG9ydC0+bmV4dCwgJm1nci0+ZGVzdHJv eV9jb25uZWN0b3JfbGlzdCk7CiAJCQltdXRleF91bmxvY2soJm1nci0+ZGVzdHJveV9jb25uZWN0 b3JfbG9jayk7CiAJCQlzY2hlZHVsZV93b3JrKCZtZ3ItPmRlc3Ryb3lfY29ubmVjdG9yX3dvcmsp OwogCQkJcmV0dXJuOwogCQl9CisJCS8qIG5vIG5lZWQgdG8gY2xlYW4gdXAgdmNwaQorCQkgKiBh cyBpZiB3ZSBoYXZlIG5vIGNvbm5lY3RvciB3ZSBuZXZlciBzZXR1cCBhIHZjcGkgKi8KIAkJZHJt X2RwX3BvcnRfdGVhcmRvd25fcGR0KHBvcnQsIHBvcnQtPnBkdCk7Ci0KLQkJaWYgKCFwb3J0LT5p bnB1dCAmJiBwb3J0LT52Y3BpLnZjcGkgPiAwKQotCQkJZHJtX2RwX21zdF9wdXRfcGF5bG9hZF9p ZChtZ3IsIHBvcnQtPnZjcGkudmNwaSk7CiAJfQogCWtmcmVlKHBvcnQpOwotCi0JKCptZ3ItPmNi cy0+aG90cGx1ZykobWdyKTsKIH0KIAogc3RhdGljIHZvaWQgZHJtX2RwX3B1dF9wb3J0KHN0cnVj dCBkcm1fZHBfbXN0X3BvcnQgKnBvcnQpCkBAIC0xMTE2LDEyICsxMTIwLDIxIEBAIHN0YXRpYyB2 b2lkIGRybV9kcF9hZGRfcG9ydChzdHJ1Y3QgZHJtX2RwX21zdF9icmFuY2ggKm1zdGIsCiAKIAkJ YnVpbGRfbXN0X3Byb3BfcGF0aChtc3RiLCBwb3J0LT5wb3J0X251bSwgcHJvcHBhdGgsIHNpemVv Zihwcm9wcGF0aCkpOwogCQlwb3J0LT5jb25uZWN0b3IgPSAoKm1zdGItPm1nci0+Y2JzLT5hZGRf Y29ubmVjdG9yKShtc3RiLT5tZ3IsIHBvcnQsIHByb3BwYXRoKTsKLQorCQlpZiAoIXBvcnQtPmNv bm5lY3RvcikgeworCQkJLyogcmVtb3ZlIGl0IGZyb20gdGhlIHBvcnQgbGlzdCAqLworCQkJbXV0 ZXhfbG9jaygmbXN0Yi0+bWdyLT5sb2NrKTsKKwkJCWxpc3RfZGVsKCZwb3J0LT5uZXh0KTsKKwkJ CW11dGV4X3VubG9jaygmbXN0Yi0+bWdyLT5sb2NrKTsKKwkJCS8qIGRyb3AgcG9ydCBsaXN0IHJl ZmVyZW5jZSAqLworCQkJZHJtX2RwX3B1dF9wb3J0KHBvcnQpOworCQkJZ290byBvdXQ7CisJCX0K IAkJaWYgKHBvcnQtPnBvcnRfbnVtID49IDgpIHsKIAkJCXBvcnQtPmNhY2hlZF9lZGlkID0gZHJt X2dldF9lZGlkKHBvcnQtPmNvbm5lY3RvciwgJnBvcnQtPmF1eC5kZGMpOwogCQl9CiAJfQogCitv dXQ6CiAJLyogcHV0IHJlZmVyZW5jZSB0byB0aGlzIHBvcnQgKi8KIAlkcm1fZHBfcHV0X3BvcnQo cG9ydCk7CiB9CkBAIC0yNjcyLDcgKzI2ODUsNyBAQCBzdGF0aWMgdm9pZCBkcm1fZHBfZGVzdHJv eV9jb25uZWN0b3Jfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiB7CiAJc3RydWN0IGRy bV9kcF9tc3RfdG9wb2xvZ3lfbWdyICptZ3IgPSBjb250YWluZXJfb2Yod29yaywgc3RydWN0IGRy bV9kcF9tc3RfdG9wb2xvZ3lfbWdyLCBkZXN0cm95X2Nvbm5lY3Rvcl93b3JrKTsKIAlzdHJ1Y3Qg ZHJtX2RwX21zdF9wb3J0ICpwb3J0OwotCisJYm9vbCBzZW5kX2hvdHBsdWcgPSBmYWxzZTsKIAkv KgogCSAqIE5vdCBhIHJlZ3VsYXIgbGlzdCB0cmF2ZXJzZSBhcyB3ZSBoYXZlIHRvIGRyb3AgdGhl IGRlc3Ryb3kKIAkgKiBjb25uZWN0b3IgbG9jayBiZWZvcmUgZGVzdHJveWluZyB0aGUgY29ubmVj dG9yLCB0byBhdm9pZCBBQi0+QkEKQEAgLTI2OTUsNyArMjcwOCwxMCBAQCBzdGF0aWMgdm9pZCBk cm1fZHBfZGVzdHJveV9jb25uZWN0b3Jfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJ CWlmICghcG9ydC0+aW5wdXQgJiYgcG9ydC0+dmNwaS52Y3BpID4gMCkKIAkJCWRybV9kcF9tc3Rf cHV0X3BheWxvYWRfaWQobWdyLCBwb3J0LT52Y3BpLnZjcGkpOwogCQlrZnJlZShwb3J0KTsKKwkJ c2VuZF9ob3RwbHVnID0gdHJ1ZTsKIAl9CisJaWYgKHNlbmRfaG90cGx1ZykKKwkJKCptZ3ItPmNi cy0+aG90cGx1ZykobWdyKTsKIH0KIAogLyoqCi0tIAoyLjQuMwoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK