From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 1/6] drm/atomic: add connectors_changed to separate it from mode_changed, v2 Date: Tue, 21 Jul 2015 13:28:57 +0200 Message-ID: <1437478142-416-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1437478142-416-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: In-Reply-To: <1437478142-416-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 Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBjYW4gYmUgYSBzZXBhcmF0ZSBjYXNlIGZyb20gbW9kZV9jaGFuZ2VkLCB3aGVuIGNvbm5l Y3RvcnMgc3RheSB0aGUKc2FtZSBidXQgb25seSB0aGUgbW9kZSBpcyBkaWZmZXJlbnQuIERyaXZl cnMgbWF5IGNob29zZSB0byBpbXBsZW1lbnQgc3BlY2lmaWMKb3B0aW1pemF0aW9ucyB0byBwcmV2 ZW50IGEgZnVsbCBtb2Rlc2V0IGZvciB0aGlzIGNhc2UuCgpDaGFuZ2VzIHNpbmNlIHYxOgotIFVw ZGF0ZSBrZXJuZWxkb2NzIHNsaWdodGx5LgoKQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0 QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIu YyAgfCAzOSArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAyICstCiBpbmNsdWRlL2RybS9kcm1fYXRvbWlj LmggICAgICAgICAgICAgfCAgMyArKy0KIGluY2x1ZGUvZHJtL2RybV9jcnRjLmggICAgICAgICAg ICAgICB8ICA4ICsrKysrLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDE0 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hl bHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKaW5kZXggMGVhOGM1 ZDQ3NmVmLi5hYzY2MDEwNzE0MTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRv bWljX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCkBA IC0xMjQsNyArMTI0LDcgQEAgc3RlYWxfZW5jb2RlcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUsCiAJaWYgKElTX0VSUihjcnRjX3N0YXRlKSkKIAkJcmV0dXJuIFBUUl9FUlIoY3J0Y19z dGF0ZSk7CiAKLQljcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQgPSB0cnVlOworCWNydGNfc3RhdGUt PmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5l Y3RvciwgJmNvbmZpZy0+Y29ubmVjdG9yX2xpc3QsIGhlYWQpIHsKIAkJaWYgKGNvbm5lY3Rvci0+ c3RhdGUtPmJlc3RfZW5jb2RlciAhPSBlbmNvZGVyKQpAQCAtMTc0LDE0ICsxNzQsMTQgQEAgdXBk YXRlX2Nvbm5lY3Rvcl9yb3V0aW5nKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwgaW50 IGNvbm5faWR4KQogCQkJaWR4ID0gZHJtX2NydGNfaW5kZXgoY29ubmVjdG9yLT5zdGF0ZS0+Y3J0 Yyk7CiAKIAkJCWNydGNfc3RhdGUgPSBzdGF0ZS0+Y3J0Y19zdGF0ZXNbaWR4XTsKLQkJCWNydGNf c3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7CisJCQljcnRjX3N0YXRlLT5jb25uZWN0b3JzX2No YW5nZWQgPSB0cnVlOwogCQl9CiAKIAkJaWYgKGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YykgewogCQkJ aWR4ID0gZHJtX2NydGNfaW5kZXgoY29ubmVjdG9yX3N0YXRlLT5jcnRjKTsKIAogCQkJY3J0Y19z dGF0ZSA9IHN0YXRlLT5jcnRjX3N0YXRlc1tpZHhdOwotCQkJY3J0Y19zdGF0ZS0+bW9kZV9jaGFu Z2VkID0gdHJ1ZTsKKwkJCWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAJ CX0KIAl9CiAKQEAgLTIzMyw3ICsyMzMsNyBAQCB1cGRhdGVfY29ubmVjdG9yX3JvdXRpbmcoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLCBpbnQgY29ubl9pZHgpCiAJaWR4ID0gZHJtX2Ny dGNfaW5kZXgoY29ubmVjdG9yX3N0YXRlLT5jcnRjKTsKIAogCWNydGNfc3RhdGUgPSBzdGF0ZS0+ Y3J0Y19zdGF0ZXNbaWR4XTsKLQljcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQgPSB0cnVlOworCWNy dGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAKIAlEUk1fREVCVUdfQVRPTUlD KCJbQ09OTkVDVE9SOiVkOiVzXSB1c2luZyBbRU5DT0RFUjolZDolc10gb24gW0NSVEM6JWRdXG4i LAogCQkJIGNvbm5lY3Rvci0+YmFzZS5pZCwKQEAgLTI1Niw3ICsyNTYsOCBAQCBtb2RlX2ZpeHVw KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlib29sIHJldDsKIAogCWZvcl9lYWNo X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKLQkJaWYgKCFjcnRj X3N0YXRlLT5tb2RlX2NoYW5nZWQpCisJCWlmICghY3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkICYm CisJCSAgICAhY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkKQogCQkJY29udGludWU7CiAK IAkJZHJtX21vZGVfY29weSgmY3J0Y19zdGF0ZS0+YWRqdXN0ZWRfbW9kZSwgJmNydGNfc3RhdGUt Pm1vZGUpOwpAQCAtMzEyLDcgKzMxMyw4IEBAIG1vZGVfZml4dXAoc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKnN0YXRlKQogCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNf c3RhdGUsIGkpIHsKIAkJY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyAqZnVuY3M7 CiAKLQkJaWYgKCFjcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQpCisJCWlmICghY3J0Y19zdGF0ZS0+ bW9kZV9jaGFuZ2VkICYmCisJCSAgICAhY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkKQog CQkJY29udGludWU7CiAKIAkJZnVuY3MgPSBjcnRjLT5oZWxwZXJfcHJpdmF0ZTsKQEAgLTMzOCw5 ICszNDAsMTQgQEAgbW9kZV9maXh1cChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAg KgogICogQ2hlY2sgdGhlIHN0YXRlIG9iamVjdCB0byBzZWUgaWYgdGhlIHJlcXVlc3RlZCBzdGF0 ZSBpcyBwaHlzaWNhbGx5IHBvc3NpYmxlLgogICogVGhpcyBkb2VzIGFsbCB0aGUgY3J0YyBhbmQg Y29ubmVjdG9yIHJlbGF0ZWQgY29tcHV0YXRpb25zIGZvciBhbiBhdG9taWMKLSAqIHVwZGF0ZS4g SXQgY29tcHV0ZXMgYW5kIHVwZGF0ZXMgY3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkLCBhZGRzIGFu eSBhZGRpdGlvbmFsCi0gKiBjb25uZWN0b3JzIG5lZWRlZCBmb3IgZnVsbCBtb2Rlc2V0cyBhbmQg Y2FsbHMgZG93biBpbnRvIC0+bW9kZV9maXh1cAotICogZnVuY3Rpb25zIG9mIHRoZSBkcml2ZXIg YmFja2VuZC4KKyAqIHVwZGF0ZSBhbmQgYWRkcyBhbnkgYWRkaXRpb25hbCBjb25uZWN0b3JzIG5l ZWRlZCBmb3IgZnVsbCBtb2Rlc2V0cyBhbmQgY2FsbHMKKyAqIGRvd24gaW50byAtPm1vZGVfZml4 dXAgZnVuY3Rpb25zIG9mIHRoZSBkcml2ZXIgYmFja2VuZC4KKyAqCisgKiBjcnRjX3N0YXRlLT5t b2RlX2NoYW5nZWQgaXMgc2V0IHdoZW4gdGhlIGlucHV0IG1vZGUgaXMgY2hhbmdlZC4KKyAqIGNy dGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCBpcyBzZXQgd2hlbiBhIGNvbm5lY3RvciBpcyBh ZGRlZCBvcgorICogcmVtb3ZlZCBmcm9tIHRoZSBjcnRjLgorICogY3J0Y19zdGF0ZS0+YWN0aXZl X2NoYW5nZWQgaXMgc2V0IHdoZW4gY3J0Y19zdGF0ZS0+YWN0aXZlIGNoYW5nZXMsCisgKiB3aGlj aCBpcyB1c2VkIGZvciBkcG1zLgogICoKICAqIElNUE9SVEFOVDoKICAqCkBAIC0zNzMsNyArMzgw LDE3IEBAIGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkJaWYgKGNydGMtPnN0YXRlLT5lbmFibGUgIT0gY3J0Y19zdGF0ZS0+ZW5hYmxlKSB7 CiAJCQlEUk1fREVCVUdfQVRPTUlDKCJbQ1JUQzolZF0gZW5hYmxlIGNoYW5nZWRcbiIsCiAJCQkJ CSBjcnRjLT5iYXNlLmlkKTsKKworCQkJLyoKKwkJCSAqIEZvciBjbGFyaXR5IHRoaXMgYXNzaWdu bWVudCBpcyBkb25lIGhlcmUsIGJ1dAorCQkJICogZW5hYmxlID09IDAgaXMgb25seSB0cnVlIHdo ZW4gdGhlcmUgYXJlIG5vCisJCQkgKiBjb25uZWN0b3JzIGFuZCBhIE5VTEwgbW9kZS4KKwkJCSAq CisJCQkgKiBUaGUgb3RoZXIgd2F5IGFyb3VuZCBpcyB0cnVlIGFzIHdlbGwuIGVuYWJsZSAhPSAw CisJCQkgKiBpZmYgY29ubmVjdG9ycyBhcmUgYXR0YWNoZWQgYW5kIGEgbW9kZSBpcyBzZXQuCisJ CQkgKi8KIAkJCWNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7CisJCQljcnRjX3N0YXRl LT5jb25uZWN0b3JzX2NoYW5nZWQgPSB0cnVlOwogCQl9CiAJfQogCkBAIC00NDgsNiArNDY1LDkg QEAgRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9jaGVja19tb2Rlc2V0KTsKICAqIFRo aXMgZG9lcyBhbGwgdGhlIHBsYW5lIHVwZGF0ZSByZWxhdGVkIGNoZWNrcyB1c2luZyBieSBjYWxs aW5nIGludG8gdGhlCiAgKiAtPmF0b21pY19jaGVjayBob29rcyBwcm92aWRlZCBieSB0aGUgZHJp dmVyLgogICoKKyAqIEl0IGFsc28gc2V0cyBjcnRjX3N0YXRlLT5wbGFuZXNfY2hhbmdlZCB0byBp bmRpY2F0ZSB0aGF0IGEgY3J0YyBoYXMKKyAqIHVwZGF0ZWQgcGxhbmVzLgorICoKICAqIFJFVFVS TlMKICAqIFplcm8gZm9yIHN1Y2Nlc3Mgb3IgLWVycm5vCiAgKi8KQEAgLTIwODEsNiArMjEwMSw3 IEBAIHZvaWQgX19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAJc3RhdGUtPm1vZGVfY2hhbmdlZCA9IGZhbHNlOwogCXN0YXRlLT5h Y3RpdmVfY2hhbmdlZCA9IGZhbHNlOwogCXN0YXRlLT5wbGFuZXNfY2hhbmdlZCA9IGZhbHNlOwor CXN0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQgPSBmYWxzZTsKIAlzdGF0ZS0+ZXZlbnQgPSBOVUxM OwogfQogRVhQT1JUX1NZTUJPTChfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZHVwbGljYXRlX3N0 YXRlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA2ODY3MjY3MTE1Y2Uu LjY3MWNhMjgyMGY4MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNDEz LDcgKzQxMyw3IEBAIHN0YXRpYyBjb25zdCBpbnRlbF9saW1pdF90IGludGVsX2xpbWl0c19ieHQg PSB7CiBzdGF0aWMgYm9vbAogbmVlZHNfbW9kZXNldChzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0 YXRlKQogewotCXJldHVybiBzdGF0ZS0+bW9kZV9jaGFuZ2VkIHx8IHN0YXRlLT5hY3RpdmVfY2hh bmdlZDsKKwlyZXR1cm4gZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoc3RhdGUpOwogfQog CiAvKioKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9hdG9taWMuaCBiL2luY2x1ZGUvZHJt L2RybV9hdG9taWMuaAppbmRleCA4YTNhOTEzMzIwZWIuLmU2N2FlYWMyYWVlMCAxMDA2NDQKLS0t IGEvaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9hdG9taWMu aApAQCAtMTY2LDcgKzE2Niw4IEBAIGludCBfX211c3RfY2hlY2sgZHJtX2F0b21pY19hc3luY19j b21taXQoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKIHN0YXRpYyBpbmxpbmUgYm9v bAogZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVzZXQoc3RydWN0IGRybV9jcnRjX3N0YXRlICpz dGF0ZSkKIHsKLQlyZXR1cm4gc3RhdGUtPm1vZGVfY2hhbmdlZCB8fCBzdGF0ZS0+YWN0aXZlX2No YW5nZWQ7CisJcmV0dXJuIHN0YXRlLT5tb2RlX2NoYW5nZWQgfHwgc3RhdGUtPmFjdGl2ZV9jaGFu Z2VkIHx8CisJICAgICAgIHN0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQ7CiB9CiAKIApkaWZmIC0t Z2l0IGEvaW5jbHVkZS9kcm0vZHJtX2NydGMuaCBiL2luY2x1ZGUvZHJtL2RybV9jcnRjLmgKaW5k ZXggODE1OWEwNjI3YjZiLi4zNjI4YmQ4OWFiZjYgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2Ry bV9jcnRjLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaApAQCAtMjU1LDEyICsyNTUsMTMg QEAgc3RydWN0IGRybV9hdG9taWNfc3RhdGU7CiAgKiBAY3J0YzogYmFja3BvaW50ZXIgdG8gdGhl IENSVEMKICAqIEBlbmFibGU6IHdoZXRoZXIgdGhlIENSVEMgc2hvdWxkIGJlIGVuYWJsZWQsIGdh dGVzIGFsbCBvdGhlciBzdGF0ZQogICogQGFjdGl2ZTogd2hldGhlciB0aGUgQ1JUQyBpcyBhY3Rp dmVseSBkaXNwbGF5aW5nICh1c2VkIGZvciBEUE1TKQotICogQG1vZGVfY2hhbmdlZDogZm9yIHVz ZSBieSBoZWxwZXJzIGFuZCBkcml2ZXJzIHdoZW4gY29tcHV0aW5nIHN0YXRlIHVwZGF0ZXMKLSAq IEBhY3RpdmVfY2hhbmdlZDogZm9yIHVzZSBieSBoZWxwZXJzIGFuZCBkcml2ZXJzIHdoZW4gY29t cHV0aW5nIHN0YXRlIHVwZGF0ZXMKKyAqIEBwbGFuZXNfY2hhbmdlZDogcGxhbmVzIG9uIHRoaXMg Y3J0YyBhcmUgdXBkYXRlZAorICogQG1vZGVfY2hhbmdlZDogY3J0Y19zdGF0ZS0+bW9kZSBvciBj cnRjX3N0YXRlLT5lbmFibGUgaGFzIGJlZW4gY2hhbmdlZAorICogQGFjdGl2ZV9jaGFuZ2VkOiBj cnRjX3N0YXRlLT5hY3RpdmUgaGFzIGJlZW4gdG9nZ2xlZC4KKyAqIEBjb25uZWN0b3JzX2NoYW5n ZWQ6IGNvbm5lY3RvcnMgdG8gdGhpcyBjcnRjIGhhdmUgYmVlbiB1cGRhdGVkCiAgKiBAcGxhbmVf bWFzazogYml0bWFzayBvZiAoMSA8PCBkcm1fcGxhbmVfaW5kZXgocGxhbmUpKSBvZiBhdHRhY2hl ZCBwbGFuZXMKICAqIEBsYXN0X3ZibGFua19jb3VudDogZm9yIGhlbHBlcnMgYW5kIGRyaXZlcnMg dG8gY2FwdHVyZSB0aGUgdmJsYW5rIG9mIHRoZQogICogCXVwZGF0ZSB0byBlbnN1cmUgZnJhbWVi dWZmZXIgY2xlYW51cCBpc24ndCBkb25lIHRvbyBlYXJseQotICogQHBsYW5lc19jaGFuZ2VkOiBm b3IgdXNlIGJ5IGhlbHBlcnMgYW5kIGRyaXZlcnMgd2hlbiBjb21wdXRpbmcgc3RhdGUgdXBkYXRl cwogICogQGFkanVzdGVkX21vZGU6IGZvciB1c2UgYnkgaGVscGVycyBhbmQgZHJpdmVycyB0byBj b21wdXRlIGFkanVzdGVkIG1vZGUgdGltaW5ncwogICogQG1vZGU6IGN1cnJlbnQgbW9kZSB0aW1p bmdzCiAgKiBAZXZlbnQ6IG9wdGlvbmFsIHBvaW50ZXIgdG8gYSBEUk0gZXZlbnQgdG8gc2lnbmFs IHVwb24gY29tcGxldGlvbiBvZiB0aGUKQEAgLTI4Myw2ICsyODQsNyBAQCBzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgewogCWJvb2wgcGxhbmVzX2NoYW5nZWQgOiAxOwogCWJvb2wgbW9kZV9jaGFuZ2Vk IDogMTsKIAlib29sIGFjdGl2ZV9jaGFuZ2VkIDogMTsKKwlib29sIGNvbm5lY3RvcnNfY2hhbmdl ZCA6IDE7CiAKIAkvKiBhdHRhY2hlZCBwbGFuZXMgYml0bWFzazoKIAkgKiBXQVJOSU5HOiB0cmFu c2l0aW9uYWwgaGVscGVycyBkbyBub3QgbWFpbnRhaW4gcGxhbmVfbWFzayBzbwotLSAKMi4xLjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==