From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 1/3] drm/atomic: Always call steal_encoder. Date: Thu, 18 Feb 2016 09:54:41 +0100 Message-ID: <1455785683-5477-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1455785683-5477-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: <1455785683-5477-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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlcmUncyBubyBuZWVkIHRvIGhhdmUgYSBzZXBhcmF0ZSBmdW5jdGlvbiB0byBnZXQgdGhlIGNy dGMKd2hpY2ggaXMgc3RvbGVuLCB0aGlzIGNhbiBhbHJlYWR5IGJlIGZvdW5kIHdoZW4gYWN0dWFs bHkKc3RlYWxpbmcgdGhlIGVuY29kZXIuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3Jz dCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljX2hlbHBlci5jIHwgODYgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDU4IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIvZHJp dmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKaW5kZXggNGRhNGYyYTQ5MDc4Li5mYzFj MDZiMWQ4YmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCkBAIC0xMDYsMjUgKzEw Niw2IEBAIGNoZWNrX3BlbmRpbmdfZW5jb2Rlcl9hc3NpZ25tZW50KHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSwKIAlyZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIHN0cnVjdCBkcm1fY3J0 YyAqCi1nZXRfY3VycmVudF9jcnRjX2Zvcl9lbmNvZGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs Ci0JCQkgICAgIHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKLXsKLQlzdHJ1Y3QgZHJtX21v ZGVfY29uZmlnICpjb25maWcgPSAmZGV2LT5tb2RlX2NvbmZpZzsKLQlzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yOwotCi0JV0FSTl9PTighZHJtX21vZGVzZXRfaXNfbG9ja2VkKCZjb25m aWctPmNvbm5lY3Rpb25fbXV0ZXgpKTsKLQotCWRybV9mb3JfZWFjaF9jb25uZWN0b3IoY29ubmVj dG9yLCBkZXYpIHsKLQkJaWYgKGNvbm5lY3Rvci0+c3RhdGUtPmJlc3RfZW5jb2RlciAhPSBlbmNv ZGVyKQotCQkJY29udGludWU7Ci0KLQkJcmV0dXJuIGNvbm5lY3Rvci0+c3RhdGUtPmNydGM7Ci0J fQotCi0JcmV0dXJuIE5VTEw7Ci19Ci0KIHN0YXRpYyB2b2lkCiBzZXRfYmVzdF9lbmNvZGVyKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0 YXRlICpjb25uX3N0YXRlLApAQCAtMTY4LDggKzE0OSw3IEBAIHNldF9iZXN0X2VuY29kZXIoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCiBzdGF0aWMgaW50CiBzdGVhbF9lbmNvZGVy KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKLQkgICAgICBzdHJ1Y3QgZHJtX2VuY29k ZXIgKmVuY29kZXIsCi0JICAgICAgc3RydWN0IGRybV9jcnRjICplbmNvZGVyX2NydGMpCisJICAg ICAgc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogewogCXN0cnVjdCBkcm1fbW9kZV9jb25m aWcgKmNvbmZpZyA9ICZzdGF0ZS0+ZGV2LT5tb2RlX2NvbmZpZzsKIAlzdHJ1Y3QgZHJtX2NydGNf c3RhdGUgKmNydGNfc3RhdGU7CkBAIC0xODIsNTUgKzE2Miw0OSBAQCBzdGVhbF9lbmNvZGVyKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkgKi8KIAlXQVJOX09OKCFkcm1fbW9kZXNl dF9pc19sb2NrZWQoJmNvbmZpZy0+Y29ubmVjdGlvbl9tdXRleCkpOwogCi0JRFJNX0RFQlVHX0FU T01JQygiW0VOQ09ERVI6JWQ6JXNdIGluIHVzZSBvbiBbQ1JUQzolZDolc10sIHN0ZWFsaW5nIGl0 XG4iLAotCQkJIGVuY29kZXItPmJhc2UuaWQsIGVuY29kZXItPm5hbWUsCi0JCQkgZW5jb2Rlcl9j cnRjLT5iYXNlLmlkLCBlbmNvZGVyX2NydGMtPm5hbWUpOwotCi0JY3J0Y19zdGF0ZSA9IGRybV9h dG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGVuY29kZXJfY3J0Yyk7Ci0JaWYgKElTX0VSUihj cnRjX3N0YXRlKSkKLQkJcmV0dXJuIFBUUl9FUlIoY3J0Y19zdGF0ZSk7Ci0KLQljcnRjX3N0YXRl LT5jb25uZWN0b3JzX2NoYW5nZWQgPSB0cnVlOwotCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShjb25u ZWN0b3IsICZjb25maWctPmNvbm5lY3Rvcl9saXN0LCBoZWFkKSB7CisJCXN0cnVjdCBkcm1fY3J0 YyAqZW5jb2Rlcl9jcnRjOworCiAJCWlmIChjb25uZWN0b3ItPnN0YXRlLT5iZXN0X2VuY29kZXIg IT0gZW5jb2RlcikKIAkJCWNvbnRpbnVlOwogCi0JCURSTV9ERUJVR19BVE9NSUMoIlN0ZWFsaW5n IGVuY29kZXIgZnJvbSBbQ09OTkVDVE9SOiVkOiVzXVxuIiwKLQkJCQkgY29ubmVjdG9yLT5iYXNl LmlkLAotCQkJCSBjb25uZWN0b3ItPm5hbWUpOwotCiAJCWNvbm5lY3Rvcl9zdGF0ZSA9IGRybV9h dG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwKIAkJCQkJCQkJIGNvbm5lY3Rvcik7CiAJ CWlmIChJU19FUlIoY29ubmVjdG9yX3N0YXRlKSkKIAkJCXJldHVybiBQVFJfRVJSKGNvbm5lY3Rv cl9zdGF0ZSk7CiAKLQkJaWYgKGNvbm5lY3Rvcl9zdGF0ZS0+YmVzdF9lbmNvZGVyICE9IGVuY29k ZXIpCisJCWlmIChjb25uZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2RlciAhPSBlbmNvZGVyIHx8CisJ CSAgICBXQVJOX09OKCFjb25uZWN0b3Jfc3RhdGUtPmNydGMpKQogCQkJY29udGludWU7CiAKKwkJ ZW5jb2Rlcl9jcnRjID0gY29ubmVjdG9yX3N0YXRlLT5jcnRjOworCisJCURSTV9ERUJVR19BVE9N SUMoIltFTkNPREVSOiVkOiVzXSBpbiB1c2Ugb24gW0NSVEM6JWQ6JXNdLCBzdGVhbGluZyBpdFxu IiwKKwkJCQkgZW5jb2Rlci0+YmFzZS5pZCwgZW5jb2Rlci0+bmFtZSwKKwkJCQkgZW5jb2Rlcl9j cnRjLT5iYXNlLmlkLCBlbmNvZGVyX2NydGMtPm5hbWUpOworCiAJCXNldF9iZXN0X2VuY29kZXIo c3RhdGUsIGNvbm5lY3Rvcl9zdGF0ZSwgTlVMTCk7CisKKwkJY3J0Y19zdGF0ZSA9IGRybV9hdG9t aWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsIGVuY29kZXJfY3J0Yyk7CisJCWNydGNf c3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CisKKwkJcmV0dXJuIDA7CiAJfQogCiAJ cmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQKLXVwZGF0ZV9jb25uZWN0b3Jfcm91dGluZyhzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsIGludCBjb25uX2lkeCkKK3VwZGF0ZV9jb25uZWN0 b3Jfcm91dGluZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkgc3RydWN0IGRy bV9jb25uZWN0b3IgKmNvbm5lY3RvciwKKwkJCSBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq Y29ubmVjdG9yX3N0YXRlLAorCQkJIGludCBjb25uX2lkeCkKIHsKIAljb25zdCBzdHJ1Y3QgZHJt X2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MgKmZ1bmNzOwogCXN0cnVjdCBkcm1fZW5jb2RlciAqbmV3 X2VuY29kZXI7Ci0Jc3RydWN0IGRybV9jcnRjICplbmNvZGVyX2NydGM7Ci0Jc3RydWN0IGRybV9j b25uZWN0b3IgKmNvbm5lY3RvcjsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVj dG9yX3N0YXRlOwogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlpbnQgaWR4 LCByZXQ7CiAKLQljb25uZWN0b3IgPSBzdGF0ZS0+Y29ubmVjdG9yc1tjb25uX2lkeF07Ci0JY29u bmVjdG9yX3N0YXRlID0gc3RhdGUtPmNvbm5lY3Rvcl9zdGF0ZXNbY29ubl9pZHhdOwotCi0JaWYg KCFjb25uZWN0b3IpCi0JCXJldHVybiAwOwotCiAJRFJNX0RFQlVHX0FUT01JQygiVXBkYXRpbmcg cm91dGluZyBmb3IgW0NPTk5FQ1RPUjolZDolc11cbiIsCiAJCQkgY29ubmVjdG9yLT5iYXNlLmlk LAogCQkJIGNvbm5lY3Rvci0+bmFtZSk7CkBAIC0zMDUsMTcgKzI3OSwxMiBAQCB1cGRhdGVfY29u bmVjdG9yX3JvdXRpbmcoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLCBpbnQgY29ubl9p ZHgpCiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCWVuY29kZXJfY3J0YyA9IGdldF9jdXJyZW50 X2NydGNfZm9yX2VuY29kZXIoc3RhdGUtPmRldiwKLQkJCQkJCSAgICBuZXdfZW5jb2Rlcik7Ci0K LQlpZiAoZW5jb2Rlcl9jcnRjKSB7Ci0JCXJldCA9IHN0ZWFsX2VuY29kZXIoc3RhdGUsIG5ld19l bmNvZGVyLCBlbmNvZGVyX2NydGMpOwotCQlpZiAocmV0KSB7Ci0JCQlEUk1fREVCVUdfQVRPTUlD KCJFbmNvZGVyIHN0ZWFsaW5nIGZhaWxlZCBmb3IgW0NPTk5FQ1RPUjolZDolc11cbiIsCi0JCQkJ CSBjb25uZWN0b3ItPmJhc2UuaWQsCi0JCQkJCSBjb25uZWN0b3ItPm5hbWUpOwotCQkJcmV0dXJu IHJldDsKLQkJfQorCXJldCA9IHN0ZWFsX2VuY29kZXIoc3RhdGUsIG5ld19lbmNvZGVyKTsKKwlp ZiAocmV0KSB7CisJCURSTV9ERUJVR19BVE9NSUMoIkVuY29kZXIgc3RlYWxpbmcgZmFpbGVkIGZv ciBbQ09OTkVDVE9SOiVkOiVzXVxuIiwKKwkJCQkgY29ubmVjdG9yLT5iYXNlLmlkLAorCQkJCSBj b25uZWN0b3ItPm5hbWUpOworCQlyZXR1cm4gcmV0OwogCX0KIAogCWlmIChXQVJOX09OKCFjb25u ZWN0b3Jfc3RhdGUtPmNydGMpKQpAQCAtNDk0LDcgKzQ2Myw4IEBAIGRybV9hdG9taWNfaGVscGVy X2NoZWNrX21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJICogZHJpdmVycyBtdXN0 IHNldCBjcnRjLT5tb2RlX2NoYW5nZWQgdGhlbXNlbHZlcyB3aGVuIGNvbm5lY3RvcgogCQkgKiBw cm9wZXJ0aWVzIG5lZWQgdG8gYmUgdXBkYXRlZC4KIAkJICovCi0JCXJldCA9IHVwZGF0ZV9jb25u ZWN0b3Jfcm91dGluZyhzdGF0ZSwgaSk7CisJCXJldCA9IHVwZGF0ZV9jb25uZWN0b3Jfcm91dGlu ZyhzdGF0ZSwgY29ubmVjdG9yLAorCQkJCQkgICAgICAgY29ubmVjdG9yX3N0YXRlLCBpKTsKIAkJ aWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAJfQotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=