From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 03/13] drm/i915: Update atomic state when removing mst connector. Date: Wed, 5 Aug 2015 12:37:01 +0200 Message-ID: <1438771031-23227-4-git-send-email-maarten.lankhorst@linux.intel.com> References: <1438771031-23227-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 CDF1D6E5A1 for ; Wed, 5 Aug 2015 03:37:17 -0700 (PDT) In-Reply-To: <1438771031-23227-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 RnVsbHkgcmVtb3ZlIHRoZSBNU1QgY29ubmVjdG9yIGZyb20gdGhlIGF0b21pYyBzdGF0ZSwgYW5k IHJlbW92ZSB0aGUKZWFybHkgcmV0dXJucyBpbiBjaGVja18qX3N0YXRlIGZvciBNU1QgY29ubmVj dG9ycy4KCldpdGggYXRvbWljIHRoZSBzdGF0ZSBjYW4gYmUgbWFkZSBjb25zaXN0ZW50IGFsbCB0 aGUgdGltZS4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gUmVtb3ZlIHRoZSBNU1QgY2hlY2sgaW4gaW50 ZWxfY29ubmVjdG9yX2NoZWNrX3N0YXRlIHRvby4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFu a2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBB bmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGNvbnNlbHZhbjJAZ21haWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDExIC0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMgIHwgNDUgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKystCiAyIGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyksIDEyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3NzQ3NTIw YmY5ZjYuLmRmZTQ0MDdiMDM5MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtNjM3MCwxMCArNjM3MCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2Nvbm5lY3Rvcl9jaGVja19z dGF0ZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAJCQkgICAgICBjb25uZWN0 b3ItPmJhc2UuYmFzZS5pZCwKIAkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lKTsKIAotCQkv KiB0aGVyZSBpcyBubyByZWFsIGh3IHN0YXRlIGZvciBNU1QgY29ubmVjdG9ycyAqLwotCQlpZiAo Y29ubmVjdG9yLT5tc3RfcG9ydCkKLQkJCXJldHVybjsKLQogCQlJOTE1X1NUQVRFX1dBUk4oY29u bmVjdG9yLT5iYXNlLmRwbXMgPT0gRFJNX01PREVfRFBNU19PRkYsCiAJCSAgICAgIndyb25nIGNv bm5lY3RvciBkcG1zIHN0YXRlXG4iKTsKIAkJSTkxNV9TVEFURV9XQVJOKGNvbm5lY3Rvci0+YmFz ZS5lbmNvZGVyICE9ICZlbmNvZGVyLT5iYXNlLApAQCAtMTI3NTEsMTMgKzEyNzQ3LDYgQEAgY2hl Y2tfZW5jb2Rlcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCQllbmNvZGVyLT5i YXNlLmNydGMsCiAJCQkgICAgICJjb25uZWN0b3IncyBjcnRjIGRvZXNuJ3QgbWF0Y2ggZW5jb2Rl ciBjcnRjXG4iKTsKIAkJfQotCQkvKgotCQkgKiBmb3IgTVNUIGNvbm5lY3RvcnMgaWYgd2UgdW5w bHVnIHRoZSBjb25uZWN0b3IgaXMgZ29uZQotCQkgKiBhd2F5IGJ1dCB0aGUgZW5jb2RlciBpcyBz dGlsbCBjb25uZWN0ZWQgdG8gYSBjcnRjCi0JCSAqIHVudGlsIGEgbW9kZXNldCBoYXBwZW5zIGlu IHJlc3BvbnNlIHRvIHRoZSBob3RwbHVnLgotCQkgKi8KLQkJaWYgKCFlbmFibGVkICYmIGVuY29k ZXItPmJhc2UuZW5jb2Rlcl90eXBlID09IERSTV9NT0RFX0VOQ09ERVJfRFBNU1QpCi0JCQljb250 aW51ZTsKIAogCQlJOTE1X1NUQVRFX1dBUk4oISFlbmNvZGVyLT5iYXNlLmNydGMgIT0gZW5hYmxl ZCwKIAkJICAgICAiZW5jb2RlcidzIGVuYWJsZWQgc3RhdGUgbWlzbWF0Y2ggIgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcF9tc3QuYwppbmRleCBlM2E1ODY0MTYwZmEuLjM2YmQ5Mzk0Zjc4OSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKQEAgLTQ1OSw2ICs0NTksNDkgQEAgc3RhdGlj IHN0cnVjdCBkcm1fY29ubmVjdG9yICppbnRlbF9kcF9hZGRfbXN0X2Nvbm5lY3RvcihzdHJ1Y3Qg ZHJtX2RwX21zdF90b3BvbG8KIAlyZXR1cm4gY29ubmVjdG9yOwogfQogCitzdGF0aWMgdm9pZAor aW50ZWxfZHBfdW5iaW5kX21zdF9jb25uZWN0b3Ioc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJ CSAgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCit7CisJc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKnN0YXRlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0 YXRlOworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNvbm5lY3Rvci0+c3RhdGUtPmNydGM7CisJ aW50IHJldDsKKworCWlmICghY3J0YykKKwkJcmV0dXJuOworCisJc3RhdGUgPSBkcm1fYXRvbWlj X3N0YXRlX2FsbG9jKGRldik7CisJaWYgKCFzdGF0ZSkKKwkJcmV0dXJuOworCisJc3RhdGUtPmFj cXVpcmVfY3R4ID0gZGV2LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eDsKKworCWNvbm5fc3RhdGUg PSBkcm1fYXRvbWljX2dldF9jb25uZWN0b3Jfc3RhdGUoc3RhdGUsIGNvbm5lY3Rvcik7CisJcmV0 ID0gUFRSX0VSUl9PUl9aRVJPKGNvbm5fc3RhdGUpOworCWlmICghcmV0KQorCQlyZXQgPSBkcm1f YXRvbWljX3NldF9jcnRjX2Zvcl9jb25uZWN0b3IoY29ubl9zdGF0ZSwgTlVMTCk7CisKKwlpZiAo IXJldCkKKwkJcmV0ID0gZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfY29ubmVjdG9ycyhzdGF0ZSwg Y3J0Yyk7CisKKwlpZiAoIXJldCAmJiAhZHJtX2F0b21pY19jb25uZWN0b3JzX2Zvcl9jcnRjKHN0 YXRlLCBjcnRjKSkgeworCQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQorCQkJ ZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CisKKwkJY3J0 Y19zdGF0ZS0+YWN0aXZlID0gZmFsc2U7CisJCXJldCA9IGRybV9hdG9taWNfc2V0X21vZGVfZm9y X2NydGMoY3J0Y19zdGF0ZSwgTlVMTCk7CisJfQorCisJaWYgKCFyZXQpCisJCXJldCA9IGRybV9h dG9taWNfY29tbWl0KHN0YXRlKTsKKworCWlmIChyZXQpCisJCWRybV9hdG9taWNfc3RhdGVfZnJl ZShzdGF0ZSk7CisKKwlJOTE1X1NUQVRFX1dBUk5fT04ocmV0KTsKK30KKwogc3RhdGljIHZvaWQg aW50ZWxfZHBfZGVzdHJveV9tc3RfY29ubmVjdG9yKHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5 X21nciAqbWdyLAogCQkJCQkgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewpA QCAtNDY2LDcgKzUwOSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX2Rlc3Ryb3lfbXN0X2Nvbm5l Y3RvcihzdHJ1Y3QgZHJtX2RwX21zdF90b3BvbG9neV9tZ3IgKm1nciwKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gY29ubmVjdG9yLT5kZXY7CiAJLyogbmVlZCB0byBudWtlIHRoZSBjb25uZWN0 b3IgKi8KIAlkcm1fbW9kZXNldF9sb2NrX2FsbChkZXYpOwotCWludGVsX2Nvbm5lY3Rvcl9kcG1z KGNvbm5lY3RvciwgRFJNX01PREVfRFBNU19PRkYpOworCWludGVsX2RwX3VuYmluZF9tc3RfY29u bmVjdG9yKGRldiwgY29ubmVjdG9yKTsKIAlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CiAK IAlpbnRlbF9jb25uZWN0b3ItPnVucmVnaXN0ZXIoaW50ZWxfY29ubmVjdG9yKTsKLS0gCjIuMS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=