From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/i915: Update atomic state when removing mst connector. Date: Tue, 21 Jul 2015 09:56:15 +0200 Message-ID: <1437465375-29209-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 D2ECA6E8C7 for ; Tue, 21 Jul 2015 00:56:31 -0700 (PDT) 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 U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYyB8IDQ0 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA0 MyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9t c3QuYwppbmRleCBlZGQ4ZmE0MWU4NWUuLmZiNGYyNzE1Yzk2ZiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHBfbXN0LmMKQEAgLTQ0OSw2ICs0NDksNDggQEAgc3RhdGljIHN0cnVjdCBkcm1fY29u bmVjdG9yICppbnRlbF9kcF9hZGRfbXN0X2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2RwX21zdF90b3Bv bG8KIAlyZXR1cm4gY29ubmVjdG9yOwogfQogCitzdGF0aWMgdm9pZCBpbnRlbF9kcF91bmJpbmRf bXN0X2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCSAgc3RydWN0IGRybV9j b25uZWN0b3IgKmNvbm5lY3RvcikKK3sKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7 CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGU7CisJc3RydWN0IGRybV9j cnRjICpjcnRjID0gY29ubmVjdG9yLT5zdGF0ZS0+Y3J0YzsKKwlpbnQgcmV0OworCisJaWYgKCFj cnRjKQorCQlyZXR1cm47CisKKwlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsK KwlpZiAoIXN0YXRlKQorCQlyZXR1cm47CisKKwlzdGF0ZS0+YWNxdWlyZV9jdHggPSBkZXYtPm1v ZGVfY29uZmlnLmFjcXVpcmVfY3R4OworCisJY29ubl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Nv bm5lY3Rvcl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yKTsKKwlyZXQgPSBQVFJfRVJSX09SX1pFUk8o Y29ubl9zdGF0ZSk7CisJaWYgKCFyZXQpCisJCXJldCA9IGRybV9hdG9taWNfc2V0X2NydGNfZm9y X2Nvbm5lY3Rvcihjb25uX3N0YXRlLCBOVUxMKTsKKworCWlmICghcmV0KQorCQlyZXQgPSBkcm1f YXRvbWljX2FkZF9hZmZlY3RlZF9jb25uZWN0b3JzKHN0YXRlLCBjcnRjKTsKKworCWlmICghcmV0 ICYmICFkcm1fYXRvbWljX2Nvbm5lY3RvcnNfZm9yX2NydGMoc3RhdGUsIGNydGMpKSB7CisJCXN0 cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9CisJCQlkcm1fYXRvbWljX2dldF9leGlz dGluZ19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKworCQljcnRjX3N0YXRlLT5hY3RpdmUgPSBm YWxzZTsKKwkJcmV0ID0gZHJtX2F0b21pY19zZXRfbW9kZV9mb3JfY3J0YyhjcnRjX3N0YXRlLCBO VUxMKTsKKwl9CisKKwlpZiAoIXJldCkKKwkJcmV0ID0gZHJtX2F0b21pY19jb21taXQoc3RhdGUp OworCisJaWYgKHJldCkKKwkJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKKworCUk5MTVf U1RBVEVfV0FSTl9PTihyZXQpOworfQorCiBzdGF0aWMgdm9pZCBpbnRlbF9kcF9kZXN0cm95X21z dF9jb25uZWN0b3Ioc3RydWN0IGRybV9kcF9tc3RfdG9wb2xvZ3lfbWdyICptZ3IsCiAJCQkJCSAg IHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CkBAIC00NTYsNyArNDk4LDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfZHBfZGVzdHJveV9tc3RfY29ubmVjdG9yKHN0cnVjdCBkcm1fZHBf bXN0X3RvcG9sb2d5X21nciAqbWdyLAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjb25uZWN0 b3ItPmRldjsKIAogCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7Ci0JZHJtX2F0b21pY19oZWxw ZXJfY29ubmVjdG9yX2RwbXMoY29ubmVjdG9yLCBEUk1fTU9ERV9EUE1TX09GRik7CisJaW50ZWxf ZHBfdW5iaW5kX21zdF9jb25uZWN0b3IoZGV2LCBjb25uZWN0b3IpOwogCWRybV9tb2Rlc2V0X3Vu bG9ja19hbGwoZGV2KTsKIAogCWludGVsX2Nvbm5lY3Rvci0+dW5yZWdpc3RlcihpbnRlbF9jb25u ZWN0b3IpOwotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==