From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3.1 2/3] drm/i915: Update atomic state when removing mst connector, v3. Date: Thu, 6 Aug 2015 13:47:36 +0200 Message-ID: <1438861657-14109-2-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 A793D6EB71 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 RnVsbHkgcmVtb3ZlIHRoZSBNU1QgY29ubmVjdG9yIGZyb20gdGhlIGF0b21pYyBzdGF0ZSwgYW5k IHJlbW92ZSB0aGUKZWFybHkgcmV0dXJucyBpbiBjaGVja18qX3N0YXRlIGZvciBNU1QgY29ubmVj dG9ycy4KCldpdGggYXRvbWljIHRoZSBzdGF0ZSBjYW4gYmUgbWFkZSBjb25zaXN0ZW50IGFsbCB0 aGUgdGltZS4KClRoYW5rcyB0byBTaXZha3VtYXIgVGh1bGFzaW1hbmkgZm9yIHRoZSBpZGVhIG9m IHVzaW5nCmRybV9hdG9taWNfaGVscGVyX3NldF9jb25maWcuCgpDaGFuZ2VzIHNpbmNlIHYxOgot IFJlbW92ZSB0aGUgTVNUIGNoZWNrIGluIGludGVsX2Nvbm5lY3Rvcl9jaGVja19zdGF0ZSB0b28u CkNoYW5nZXMgc2luY2UgdjI6Ci0gVXNlIGRybV9hdG9taWNfaGVscGVyX3NldF9jb25maWcuCgpT aWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXgu aW50ZWwuY29tPgpDYzogU2l2YWt1bWFyIFRodWxhc2ltYW5pIDxzaXZha3VtYXIudGh1bGFzaW1h bmlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8 IDExIC0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYyAgfCAx MyArKysrKysrKysrKystCiAyIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDEyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA1ZTQwYjdl NzAxM2EuLjc3YjRkYTdlNjk4YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtNjM3MCwxMCArNjM3MCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2Nvbm5lY3Rvcl9jaGVja19z dGF0ZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAJCQkgICAgICBjb25uZWN0 b3ItPmJhc2UuYmFzZS5pZCwKIAkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lKTsKIAotCQkv KiB0aGVyZSBpcyBubyByZWFsIGh3IHN0YXRlIGZvciBNU1QgY29ubmVjdG9ycyAqLwotCQlpZiAo Y29ubmVjdG9yLT5tc3RfcG9ydCkKLQkJCXJldHVybjsKLQogCQlJOTE1X1NUQVRFX1dBUk4oY29u bmVjdG9yLT5iYXNlLmRwbXMgPT0gRFJNX01PREVfRFBNU19PRkYsCiAJCSAgICAgIndyb25nIGNv bm5lY3RvciBkcG1zIHN0YXRlXG4iKTsKIAkJSTkxNV9TVEFURV9XQVJOKGNvbm5lY3Rvci0+YmFz ZS5lbmNvZGVyICE9ICZlbmNvZGVyLT5iYXNlLApAQCAtMTI3NDksMTMgKzEyNzQ1LDYgQEAgY2hl Y2tfZW5jb2Rlcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCQllbmNvZGVyLT5i YXNlLmNydGMsCiAJCQkgICAgICJjb25uZWN0b3IncyBjcnRjIGRvZXNuJ3QgbWF0Y2ggZW5jb2Rl ciBjcnRjXG4iKTsKIAkJfQotCQkvKgotCQkgKiBmb3IgTVNUIGNvbm5lY3RvcnMgaWYgd2UgdW5w bHVnIHRoZSBjb25uZWN0b3IgaXMgZ29uZQotCQkgKiBhd2F5IGJ1dCB0aGUgZW5jb2RlciBpcyBz dGlsbCBjb25uZWN0ZWQgdG8gYSBjcnRjCi0JCSAqIHVudGlsIGEgbW9kZXNldCBoYXBwZW5zIGlu IHJlc3BvbnNlIHRvIHRoZSBob3RwbHVnLgotCQkgKi8KLQkJaWYgKCFlbmFibGVkICYmIGVuY29k ZXItPmJhc2UuZW5jb2Rlcl90eXBlID09IERSTV9NT0RFX0VOQ09ERVJfRFBNU1QpCi0JCQljb250 aW51ZTsKIAogCQlJOTE1X1NUQVRFX1dBUk4oISFlbmNvZGVyLT5iYXNlLmNydGMgIT0gZW5hYmxl ZCwKIAkJICAgICAiZW5jb2RlcidzIGVuYWJsZWQgc3RhdGUgbWlzbWF0Y2ggIgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcF9tc3QuYwppbmRleCBmZjAxNTY5MTU4ZWEuLjkxYWQxNzExMGMyZiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKQEAgLTQ2Nyw5ICs0NjcsMjAgQEAgc3RhdGlj IHZvaWQgaW50ZWxfZHBfZGVzdHJveV9tc3RfY29ubmVjdG9yKHN0cnVjdCBkcm1fZHBfbXN0X3Rv cG9sb2d5X21nciAqbWdyLAogewogCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5l Y3RvciA9IHRvX2ludGVsX2Nvbm5lY3Rvcihjb25uZWN0b3IpOwogCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBjb25uZWN0b3ItPmRldjsKKwogCS8qIG5lZWQgdG8gbnVrZSB0aGUgY29ubmVjdG9y ICovCiAJZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKLQlpbnRlbF9jb25uZWN0b3JfZHBtcyhj b25uZWN0b3IsIERSTV9NT0RFX0RQTVNfT0ZGKTsKKwlpZiAoY29ubmVjdG9yLT5zdGF0ZS0+Y3J0 YykgeworCQlzdHJ1Y3QgZHJtX21vZGVfc2V0IHNldDsKKwkJaW50IHJldDsKKworCQltZW1zZXQo JnNldCwgMCwgc2l6ZW9mKHNldCkpOworCQlzZXQuY3J0YyA9IGNvbm5lY3Rvci0+c3RhdGUtPmNy dGMsCisKKwkJcmV0ID0gZHJtX2F0b21pY19oZWxwZXJfc2V0X2NvbmZpZygmc2V0KTsKKworCQlX QVJOKHJldCwgIkRpc2FibGluZyBtc3QgY3J0YyBmYWlsZWQgd2l0aCAlaVxuIiwgcmV0KTsKKwl9 CiAJZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwogCiAJaW50ZWxfY29ubmVjdG9yLT51bnJl Z2lzdGVyKGludGVsX2Nvbm5lY3Rvcik7Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK