From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2.1 2.7/12] drm/i915: Update atomic state when removing mst connector, v2. Date: Mon, 3 Aug 2015 10:10:33 +0200 Message-ID: <55BF21F9.30904@linux.intel.com> References: <1438000541-3219-1-git-send-email-maarten.lankhorst@linux.intel.com> <1438000541-3219-3-git-send-email-maarten.lankhorst@linux.intel.com> <1438085600.2727.0.camel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 8EDF36E3A9 for ; Mon, 3 Aug 2015 01:10:35 -0700 (PDT) In-Reply-To: <1438085600.2727.0.camel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ander Conselvan De Oliveira , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnVsbHkgcmVtb3ZlIHRoZSBNU1QgY29ubmVjdG9yIGZyb20gdGhlIGF0b21pYyBzdGF0ZSwgYW5k IHJlbW92ZSB0aGUKZWFybHkgcmV0dXJucyBpbiBjaGVja18qX3N0YXRlIGZvciBNU1QgY29ubmVj dG9ycy4KCldpdGggYXRvbWljIHRoZSBzdGF0ZSBjYW4gYmUgbWFkZSBjb25zaXN0ZW50IGFsbCB0 aGUgdGltZS4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gUmVtb3ZlIHRoZSBNU1QgY2hlY2sgaW4gaW50 ZWxfY29ubmVjdG9yX2NoZWNrX3N0YXRlIHRvby4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFu a2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBB bmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGNvbnNlbHZhbjJAZ21haWwuY29tPgotLS0KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3NzQ3NTIwYmY5ZjYuLmRmZTQ0MDdi MDM5MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNjM3MCwxMCArNjM3 MCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2Nvbm5lY3Rvcl9jaGVja19zdGF0ZShzdHJ1Y3QgaW50 ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAJCQkgICAgICBjb25uZWN0b3ItPmJhc2UuYmFzZS5p ZCwKIAkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lKTsKIAotCQkvKiB0aGVyZSBpcyBubyBy ZWFsIGh3IHN0YXRlIGZvciBNU1QgY29ubmVjdG9ycyAqLwotCQlpZiAoY29ubmVjdG9yLT5tc3Rf cG9ydCkKLQkJCXJldHVybjsKLQogCQlJOTE1X1NUQVRFX1dBUk4oY29ubmVjdG9yLT5iYXNlLmRw bXMgPT0gRFJNX01PREVfRFBNU19PRkYsCiAJCSAgICAgIndyb25nIGNvbm5lY3RvciBkcG1zIHN0 YXRlXG4iKTsKIAkJSTkxNV9TVEFURV9XQVJOKGNvbm5lY3Rvci0+YmFzZS5lbmNvZGVyICE9ICZl bmNvZGVyLT5iYXNlLApAQCAtMTI3NTEsMTMgKzEyNzQ3LDYgQEAgY2hlY2tfZW5jb2Rlcl9zdGF0 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCQllbmNvZGVyLT5iYXNlLmNydGMsCiAJCQkg ICAgICJjb25uZWN0b3IncyBjcnRjIGRvZXNuJ3QgbWF0Y2ggZW5jb2RlciBjcnRjXG4iKTsKIAkJ fQotCQkvKgotCQkgKiBmb3IgTVNUIGNvbm5lY3RvcnMgaWYgd2UgdW5wbHVnIHRoZSBjb25uZWN0 b3IgaXMgZ29uZQotCQkgKiBhd2F5IGJ1dCB0aGUgZW5jb2RlciBpcyBzdGlsbCBjb25uZWN0ZWQg dG8gYSBjcnRjCi0JCSAqIHVudGlsIGEgbW9kZXNldCBoYXBwZW5zIGluIHJlc3BvbnNlIHRvIHRo ZSBob3RwbHVnLgotCQkgKi8KLQkJaWYgKCFlbmFibGVkICYmIGVuY29kZXItPmJhc2UuZW5jb2Rl cl90eXBlID09IERSTV9NT0RFX0VOQ09ERVJfRFBNU1QpCi0JCQljb250aW51ZTsKIAogCQlJOTE1 X1NUQVRFX1dBUk4oISFlbmNvZGVyLT5iYXNlLmNydGMgIT0gZW5hYmxlZCwKIAkJICAgICAiZW5j b2RlcidzIGVuYWJsZWQgc3RhdGUgbWlzbWF0Y2ggIgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9t c3QuYwppbmRleCA1ODVmMGE0NWIzZjEuLjM1ZjJlYjU5ODE4YSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHBfbXN0LmMKQEAgLTQ0OCw2ICs0NDgsNDkgQEAgc3RhdGljIHN0cnVjdCBkcm1fY29u bmVjdG9yICppbnRlbF9kcF9hZGRfbXN0X2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2RwX21zdF90b3Bv bG8KIAlyZXR1cm4gY29ubmVjdG9yOwogfQogCitzdGF0aWMgdm9pZAoraW50ZWxfZHBfdW5iaW5k X21zdF9jb25uZWN0b3Ioc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCSAgICAgIHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IpCit7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlOworCXN0cnVjdCBk cm1fY3J0YyAqY3J0YyA9IGNvbm5lY3Rvci0+c3RhdGUtPmNydGM7CisJaW50IHJldDsKKworCWlm ICghY3J0YykKKwkJcmV0dXJuOworCisJc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRlX2FsbG9jKGRl dik7CisJaWYgKCFzdGF0ZSkKKwkJcmV0dXJuOworCisJc3RhdGUtPmFjcXVpcmVfY3R4ID0gZGV2 LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eDsKKworCWNvbm5fc3RhdGUgPSBkcm1fYXRvbWljX2dl dF9jb25uZWN0b3Jfc3RhdGUoc3RhdGUsIGNvbm5lY3Rvcik7CisJcmV0ID0gUFRSX0VSUl9PUl9a RVJPKGNvbm5fc3RhdGUpOworCWlmICghcmV0KQorCQlyZXQgPSBkcm1fYXRvbWljX3NldF9jcnRj X2Zvcl9jb25uZWN0b3IoY29ubl9zdGF0ZSwgTlVMTCk7CisKKwlpZiAoIXJldCkKKwkJcmV0ID0g ZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfY29ubmVjdG9ycyhzdGF0ZSwgY3J0Yyk7CisKKwlpZiAo IXJldCAmJiAhZHJtX2F0b21pY19jb25uZWN0b3JzX2Zvcl9jcnRjKHN0YXRlLCBjcnRjKSkgewor CQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQorCQkJZHJtX2F0b21pY19nZXRf ZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CisKKwkJY3J0Y19zdGF0ZS0+YWN0aXZl ID0gZmFsc2U7CisJCXJldCA9IGRybV9hdG9taWNfc2V0X21vZGVfZm9yX2NydGMoY3J0Y19zdGF0 ZSwgTlVMTCk7CisJfQorCisJaWYgKCFyZXQpCisJCXJldCA9IGRybV9hdG9taWNfY29tbWl0KHN0 YXRlKTsKKworCWlmIChyZXQpCisJCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7CisKKwlJ OTE1X1NUQVRFX1dBUk5fT04ocmV0KTsKK30KKwogc3RhdGljIHZvaWQgaW50ZWxfZHBfZGVzdHJv eV9tc3RfY29ubmVjdG9yKHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLAogCQkJ CQkgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewpAQCAtNDU1LDcgKzQ5OCw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX2Rlc3Ryb3lfbXN0X2Nvbm5lY3RvcihzdHJ1Y3QgZHJt X2RwX21zdF90b3BvbG9neV9tZ3IgKm1nciwKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY29u bmVjdG9yLT5kZXY7CiAJLyogbmVlZCB0byBudWtlIHRoZSBjb25uZWN0b3IgKi8KIAlkcm1fbW9k ZXNldF9sb2NrX2FsbChkZXYpOwotCWludGVsX2Nvbm5lY3Rvcl9kcG1zKGNvbm5lY3RvciwgRFJN X01PREVfRFBNU19PRkYpOworCWludGVsX2RwX3VuYmluZF9tc3RfY29ubmVjdG9yKGRldiwgY29u bmVjdG9yKTsKIAlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CiAKIAlpbnRlbF9jb25uZWN0 b3ItPnVucmVnaXN0ZXIoaW50ZWxfY29ubmVjdG9yKTsKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==