From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 3/7] drm/atomic: Always call steal_encoder, v2. Date: Thu, 3 Mar 2016 10:17:38 +0100 Message-ID: <1456996662-8704-4-git-send-email-maarten.lankhorst@linux.intel.com> References: <1456996662-8704-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: <1456996662-8704-1-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlcmUncyBubyBuZWVkIHRvIGhhdmUgYSBzZXBhcmF0ZSBmdW5jdGlvbiB0byBnZXQgdGhlIGNy dGMKd2hpY2ggaXMgc3RvbGVuLCB0aGlzIGNhbiBhbHJlYWR5IGJlIGZvdW5kIHdoZW4gYWN0dWFs bHkKc3RlYWxpbmcgdGhlIGVuY29kZXIuCgpkcm1fZm9yX2VhY2hfY29ubmVjdG9yIGFscmVhZHkg Y2hlY2tzIGZvciBjb25uZWN0aW9uX211dGV4LCBzbwp1c2UgdGhhdCBtYWNybyBub3cuCgpDaGFu Z2VzIHNpbmNlIHYxOgotIERvIG5vdCBjaGVjayBmb3IgTlVMTCBjcnRjIGluIGNvbm5lY3Rvcl9z dGF0ZSwKICB0aGlzIG1heSBoYXBwZW4gd2hlbiBhIGNydGMgaXMgZGlzYWJsZWQgYW5kIGl0cyBl bmNvZGVyIHN0b2xlbi4KLSBCZWNhdXNlIG9mIHRoaXMsIHVzZSBjb25uZWN0b3ItPnN0YXRlLT5j cnRjIGluc3RlYWQgb2YgY29ubl9zdGF0ZS0+Y3J0Yy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4g TGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgfCA3NCArKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgNTQgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVy LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwppbmRleCAzZDFmOTdhODMy ZmMuLjcyY2E4NWIzMjI2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNf aGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKQEAgLTEw NiwyNSArMTA2LDYgQEAgY2hlY2tfcGVuZGluZ19lbmNvZGVyX2Fzc2lnbm1lbnQoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCXJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgc3RydWN0 IGRybV9jcnRjICoKLWdldF9jdXJyZW50X2NydGNfZm9yX2VuY29kZXIoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKLQkJCSAgICAgc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQotewotCXN0cnVj dCBkcm1fbW9kZV9jb25maWcgKmNvbmZpZyA9ICZkZXYtPm1vZGVfY29uZmlnOwotCXN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3I7Ci0KLQlXQVJOX09OKCFkcm1fbW9kZXNldF9pc19sb2Nr ZWQoJmNvbmZpZy0+Y29ubmVjdGlvbl9tdXRleCkpOwotCi0JZHJtX2Zvcl9lYWNoX2Nvbm5lY3Rv cihjb25uZWN0b3IsIGRldikgewotCQlpZiAoY29ubmVjdG9yLT5zdGF0ZS0+YmVzdF9lbmNvZGVy ICE9IGVuY29kZXIpCi0JCQljb250aW51ZTsKLQotCQlyZXR1cm4gY29ubmVjdG9yLT5zdGF0ZS0+ Y3J0YzsKLQl9Ci0KLQlyZXR1cm4gTlVMTDsKLX0KLQogc3RhdGljIHZvaWQKIHNldF9iZXN0X2Vu Y29kZXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkgc3RydWN0IGRybV9jb25u ZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUsCkBAIC0xNjgsMzggKzE0OSwxOCBAQCBzZXRfYmVzdF9l bmNvZGVyKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAogc3RhdGljIGludAogc3Rl YWxfZW5jb2RlcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCi0JICAgICAgc3RydWN0 IGRybV9lbmNvZGVyICplbmNvZGVyLAotCSAgICAgIHN0cnVjdCBkcm1fY3J0YyAqZW5jb2Rlcl9j cnRjKQorCSAgICAgIHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKIHsKLQlzdHJ1Y3QgZHJt X21vZGVfY29uZmlnICpjb25maWcgPSAmc3RhdGUtPmRldi0+bW9kZV9jb25maWc7CiAJc3RydWN0 IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25u ZWN0b3I7CiAJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZTsKIAot CS8qCi0JICogV2UgY2FuIG9ubHkgc3RlYWwgYW4gZW5jb2RlciBjb21pbmcgZnJvbSBhIGNvbm5l Y3Rvciwgd2hpY2ggbWVhbnMgd2UKLQkgKiBtdXN0IGFscmVhZHkgaG9sZCB0aGUgY29ubmVjdGlv bl9tdXRleC4KLQkgKi8KLQlXQVJOX09OKCFkcm1fbW9kZXNldF9pc19sb2NrZWQoJmNvbmZpZy0+ Y29ubmVjdGlvbl9tdXRleCkpOwotCi0JRFJNX0RFQlVHX0FUT01JQygiW0VOQ09ERVI6JWQ6JXNd IGluIHVzZSBvbiBbQ1JUQzolZDolc10sIHN0ZWFsaW5nIGl0XG4iLAotCQkJIGVuY29kZXItPmJh c2UuaWQsIGVuY29kZXItPm5hbWUsCi0JCQkgZW5jb2Rlcl9jcnRjLT5iYXNlLmlkLCBlbmNvZGVy X2NydGMtPm5hbWUpOworCWRybV9mb3JfZWFjaF9jb25uZWN0b3IoY29ubmVjdG9yLCBzdGF0ZS0+ ZGV2KSB7CisJCXN0cnVjdCBkcm1fY3J0YyAqZW5jb2Rlcl9jcnRjOwogCi0JY3J0Y19zdGF0ZSA9 IGRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGVuY29kZXJfY3J0Yyk7Ci0JaWYgKElT X0VSUihjcnRjX3N0YXRlKSkKLQkJcmV0dXJuIFBUUl9FUlIoY3J0Y19zdGF0ZSk7Ci0KLQljcnRj X3N0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQgPSB0cnVlOwotCi0JbGlzdF9mb3JfZWFjaF9lbnRy eShjb25uZWN0b3IsICZjb25maWctPmNvbm5lY3Rvcl9saXN0LCBoZWFkKSB7CiAJCWlmIChjb25u ZWN0b3ItPnN0YXRlLT5iZXN0X2VuY29kZXIgIT0gZW5jb2RlcikKIAkJCWNvbnRpbnVlOwogCi0J CURSTV9ERUJVR19BVE9NSUMoIlN0ZWFsaW5nIGVuY29kZXIgZnJvbSBbQ09OTkVDVE9SOiVkOiVz XVxuIiwKLQkJCQkgY29ubmVjdG9yLT5iYXNlLmlkLAotCQkJCSBjb25uZWN0b3ItPm5hbWUpOwot CiAJCWNvbm5lY3Rvcl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0 ZSwKIAkJCQkJCQkJIGNvbm5lY3Rvcik7CiAJCWlmIChJU19FUlIoY29ubmVjdG9yX3N0YXRlKSkK QEAgLTIwOCw3ICsxNjksMTggQEAgc3RlYWxfZW5jb2RlcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUsCiAJCWlmIChjb25uZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2RlciAhPSBlbmNvZGVy KQogCQkJY29udGludWU7CiAKKwkJZW5jb2Rlcl9jcnRjID0gY29ubmVjdG9yLT5zdGF0ZS0+Y3J0 YzsKKworCQlEUk1fREVCVUdfQVRPTUlDKCJbRU5DT0RFUjolZDolc10gaW4gdXNlIG9uIFtDUlRD OiVkOiVzXSwgc3RlYWxpbmcgaXRcbiIsCisJCQkJIGVuY29kZXItPmJhc2UuaWQsIGVuY29kZXIt Pm5hbWUsCisJCQkJIGVuY29kZXJfY3J0Yy0+YmFzZS5pZCwgZW5jb2Rlcl9jcnRjLT5uYW1lKTsK KwogCQlzZXRfYmVzdF9lbmNvZGVyKHN0YXRlLCBjb25uZWN0b3Jfc3RhdGUsIE5VTEwpOworCisJ CWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBl bmNvZGVyX2NydGMpOworCQljcnRjX3N0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQgPSB0cnVlOwor CisJCXJldHVybiAwOwogCX0KIAogCXJldHVybiAwOwpAQCAtMjIxLDcgKzE5Myw2IEBAIHVwZGF0 ZV9jb25uZWN0b3Jfcm91dGluZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiB7CiAJ Y29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzICpmdW5jczsKIAlzdHJ1Y3Qg ZHJtX2VuY29kZXIgKm5ld19lbmNvZGVyOwotCXN0cnVjdCBkcm1fY3J0YyAqZW5jb2Rlcl9jcnRj OwogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlpbnQgaWR4LCByZXQ7CiAK QEAgLTI5OSwxNyArMjcwLDEyIEBAIHVwZGF0ZV9jb25uZWN0b3Jfcm91dGluZyhzdHJ1Y3QgZHJt X2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCWVuY29kZXJf Y3J0YyA9IGdldF9jdXJyZW50X2NydGNfZm9yX2VuY29kZXIoc3RhdGUtPmRldiwKLQkJCQkJCSAg ICBuZXdfZW5jb2Rlcik7Ci0KLQlpZiAoZW5jb2Rlcl9jcnRjKSB7Ci0JCXJldCA9IHN0ZWFsX2Vu Y29kZXIoc3RhdGUsIG5ld19lbmNvZGVyLCBlbmNvZGVyX2NydGMpOwotCQlpZiAocmV0KSB7Ci0J CQlEUk1fREVCVUdfQVRPTUlDKCJFbmNvZGVyIHN0ZWFsaW5nIGZhaWxlZCBmb3IgW0NPTk5FQ1RP UjolZDolc11cbiIsCi0JCQkJCSBjb25uZWN0b3ItPmJhc2UuaWQsCi0JCQkJCSBjb25uZWN0b3It Pm5hbWUpOwotCQkJcmV0dXJuIHJldDsKLQkJfQorCXJldCA9IHN0ZWFsX2VuY29kZXIoc3RhdGUs IG5ld19lbmNvZGVyKTsKKwlpZiAocmV0KSB7CisJCURSTV9ERUJVR19BVE9NSUMoIkVuY29kZXIg c3RlYWxpbmcgZmFpbGVkIGZvciBbQ09OTkVDVE9SOiVkOiVzXVxuIiwKKwkJCQkgY29ubmVjdG9y LT5iYXNlLmlkLAorCQkJCSBjb25uZWN0b3ItPm5hbWUpOworCQlyZXR1cm4gcmV0OwogCX0KIAog CWlmIChXQVJOX09OKCFjb25uZWN0b3Jfc3RhdGUtPmNydGMpKQotLSAKMi4xLjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=