From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3.1 3/3] drm/i915: Don't try to remove MST cleanly when force removed. Date: Thu, 6 Aug 2015 13:47:37 +0200 Message-ID: <1438861657-14109-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1438771031-23227-4-git-send-email-maarten.lankhorst@linux.intel.com> <1438861657-14109-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id A7A806EB73 for ; Thu, 6 Aug 2015 04:47:43 -0700 (PDT) In-Reply-To: <1438861657-14109-1-git-send-email-maarten.lankhorst@linux.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 UGh5c2ljYWxseSBkaXNjb25uZWN0aW5nIGEgRFAgY29ubmVjdG9yIHdpdGggYW4gYWN0aXZlIE1T VCBzdHJlYW0KY2FuIGxlYWQgdG8gYSBrZXJuZWwgcGFuaWMgaW4gaW50ZWxfbXN0X2Rpc2FibGVf ZHAgd2hlbiBjYWxsaW5nCmRybV9kcF91cGRhdGVfcGF5bG9hZF9wYXJ0MS4gRXhhbWluaW5nIHRo ZSBjb2RlIGl0IHNlZW1zIHRoYXQgdGhlCnBvcnQgaXMgZnJlZWQgd2hpbGUgd29yayB0byByZW1v dmUgdGhlIGNvbm5lY3RvciBpcyBzY2hlZHVsZWQuCgpUaGlzIHByb2JhYmx5IG1lYW5zIGl0J3Mg ZmluZSB0byBza2lwIGNhbGwgYWxsIHRoZSBtc3QgaGVscGVyIGNhbGxzCmFuZCBvbmx5IGF0dGVt cHQgdG8gZGlzYWJsZSB0aGUgcmVhbCBlbmNvZGVyLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBM YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYyB8IDE5ICsrKysrKysrKysrKysrLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHBfbXN0LmMKaW5kZXggOTFhZDE3MTEwYzJmLi4xOWM5ZTQ5ZDc0ZTAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCkBAIC0xMTAsNiArMTEwLDkgQEAgc3RhdGlj IHZvaWQgaW50ZWxfbXN0X2Rpc2FibGVfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIp CiAKIAlEUk1fREVCVUdfS01TKCIlZFxuIiwgaW50ZWxfZHAtPmFjdGl2ZV9tc3RfbGlua3MpOwog CisJaWYgKCFpbnRlbF9tc3QtPnBvcnQpCisJCXJldHVybjsKKwogCWRybV9kcF9tc3RfcmVzZXRf dmNwaV9zbG90cygmaW50ZWxfZHAtPm1zdF9tZ3IsIGludGVsX21zdC0+cG9ydCk7CiAKIAlyZXQg PSBkcm1fZHBfdXBkYXRlX3BheWxvYWRfcGFydDEoJmludGVsX2RwLT5tc3RfbWdyKTsKQEAgLTEy NiwxMiArMTI5LDE0IEBAIHN0YXRpYyB2b2lkIGludGVsX21zdF9wb3N0X2Rpc2FibGVfZHAoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAKIAlEUk1fREVCVUdfS01TKCIlZFxuIiwgaW50 ZWxfZHAtPmFjdGl2ZV9tc3RfbGlua3MpOwogCi0JLyogdGhpcyBjYW4gZmFpbCAqLwotCWRybV9k cF9jaGVja19hY3Rfc3RhdHVzKCZpbnRlbF9kcC0+bXN0X21ncik7Ci0JLyogYW5kIHRoaXMgY2Fu IGFsc28gZmFpbCAqLwotCWRybV9kcF91cGRhdGVfcGF5bG9hZF9wYXJ0MigmaW50ZWxfZHAtPm1z dF9tZ3IpOworCWlmIChpbnRlbF9tc3QtPnBvcnQpIHsKKwkJLyogdGhpcyBjYW4gZmFpbCAqLwor CQlkcm1fZHBfY2hlY2tfYWN0X3N0YXR1cygmaW50ZWxfZHAtPm1zdF9tZ3IpOworCQkvKiBhbmQg dGhpcyBjYW4gYWxzbyBmYWlsICovCisJCWRybV9kcF91cGRhdGVfcGF5bG9hZF9wYXJ0MigmaW50 ZWxfZHAtPm1zdF9tZ3IpOwogCi0JZHJtX2RwX21zdF9kZWFsbG9jYXRlX3ZjcGkoJmludGVsX2Rw LT5tc3RfbWdyLCBpbnRlbF9tc3QtPnBvcnQpOworCQlkcm1fZHBfbXN0X2RlYWxsb2NhdGVfdmNw aSgmaW50ZWxfZHAtPm1zdF9tZ3IsIGludGVsX21zdC0+cG9ydCk7CisJfQogCiAJaW50ZWxfZHAt PmFjdGl2ZV9tc3RfbGlua3MtLTsKIAlpbnRlbF9tc3QtPnBvcnQgPSBOVUxMOwpAQCAtNDcxLDkg KzQ3NiwxMyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9kZXN0cm95X21zdF9jb25uZWN0b3Ioc3Ry dWN0IGRybV9kcF9tc3RfdG9wb2xvZ3lfbWdyICptZ3IsCiAJLyogbmVlZCB0byBudWtlIHRoZSBj b25uZWN0b3IgKi8KIAlkcm1fbW9kZXNldF9sb2NrX2FsbChkZXYpOwogCWlmIChjb25uZWN0b3It PnN0YXRlLT5jcnRjKSB7CisJCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciA9IGNvbm5lY3Rv ci0+c3RhdGUtPmJlc3RfZW5jb2RlcjsKKwkJc3RydWN0IGludGVsX2RwX21zdF9lbmNvZGVyICpp bnRlbF9tc3QgPSBlbmNfdG9fbXN0KGVuY29kZXIpOwogCQlzdHJ1Y3QgZHJtX21vZGVfc2V0IHNl dDsKIAkJaW50IHJldDsKIAorCQlpbnRlbF9tc3QtPnBvcnQgPSBOVUxMOworCiAJCW1lbXNldCgm c2V0LCAwLCBzaXplb2Yoc2V0KSk7CiAJCXNldC5jcnRjID0gY29ubmVjdG9yLT5zdGF0ZS0+Y3J0 YywKIAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==