From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 3/6] drm/atomic: Always call steal_encoder. Date: Wed, 24 Feb 2016 09:37:30 +0100 Message-ID: <1456303053-28806-4-git-send-email-maarten.lankhorst@linux.intel.com> References: <1456303053-28806-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: <1456303053-28806-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: intel-gfx@lists.freedesktop.org VGhlcmUncyBubyBuZWVkIHRvIGhhdmUgYSBzZXBhcmF0ZSBmdW5jdGlvbiB0byBnZXQgdGhlIGNy dGMKd2hpY2ggaXMgc3RvbGVuLCB0aGlzIGNhbiBhbHJlYWR5IGJlIGZvdW5kIHdoZW4gYWN0dWFs bHkKc3RlYWxpbmcgdGhlIGVuY29kZXIuCgpkcm1fZm9yX2VhY2hfY29ubmVjdG9yIGFscmVhZHkg Y2hlY2tzIGZvciBjb25uZWN0aW9uX211dGV4LCBzbwp1c2UgdGhhdCBtYWNybyBub3cuCgpTaWdu ZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIHwgNzcgKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIyIGlu c2VydGlvbnMoKyksIDU1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVy LmMKaW5kZXggM2QxZjk3YTgzMmZjLi5lODlhNWRhMjc0NjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRv bWljX2hlbHBlci5jCkBAIC0xMDYsMjUgKzEwNiw2IEBAIGNoZWNrX3BlbmRpbmdfZW5jb2Rlcl9h c3NpZ25tZW50KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAlyZXR1cm4gdHJ1ZTsK IH0KIAotc3RhdGljIHN0cnVjdCBkcm1fY3J0YyAqCi1nZXRfY3VycmVudF9jcnRjX2Zvcl9lbmNv ZGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkgICAgIHN0cnVjdCBkcm1fZW5jb2RlciAq ZW5jb2RlcikKLXsKLQlzdHJ1Y3QgZHJtX21vZGVfY29uZmlnICpjb25maWcgPSAmZGV2LT5tb2Rl X2NvbmZpZzsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwotCi0JV0FSTl9PTigh ZHJtX21vZGVzZXRfaXNfbG9ja2VkKCZjb25maWctPmNvbm5lY3Rpb25fbXV0ZXgpKTsKLQotCWRy bV9mb3JfZWFjaF9jb25uZWN0b3IoY29ubmVjdG9yLCBkZXYpIHsKLQkJaWYgKGNvbm5lY3Rvci0+ c3RhdGUtPmJlc3RfZW5jb2RlciAhPSBlbmNvZGVyKQotCQkJY29udGludWU7Ci0KLQkJcmV0dXJu IGNvbm5lY3Rvci0+c3RhdGUtPmNydGM7Ci0JfQotCi0JcmV0dXJuIE5VTEw7Ci19Ci0KIHN0YXRp YyB2b2lkCiBzZXRfYmVzdF9lbmNvZGVyKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwK IAkJIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlLApAQCAtMTY4LDQ3ICsx NDksMzkgQEAgc2V0X2Jlc3RfZW5jb2RlcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUs CiAKIHN0YXRpYyBpbnQKIHN0ZWFsX2VuY29kZXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlLAotCSAgICAgIHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKLQkgICAgICBzdHJ1Y3Qg ZHJtX2NydGMgKmVuY29kZXJfY3J0YykKKwkgICAgICBzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29k ZXIpCiB7Ci0Jc3RydWN0IGRybV9tb2RlX2NvbmZpZyAqY29uZmlnID0gJnN0YXRlLT5kZXYtPm1v ZGVfY29uZmlnOwogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpj b25uZWN0b3Jfc3RhdGU7CiAKLQkvKgotCSAqIFdlIGNhbiBvbmx5IHN0ZWFsIGFuIGVuY29kZXIg Y29taW5nIGZyb20gYSBjb25uZWN0b3IsIHdoaWNoIG1lYW5zIHdlCi0JICogbXVzdCBhbHJlYWR5 IGhvbGQgdGhlIGNvbm5lY3Rpb25fbXV0ZXguCi0JICovCi0JV0FSTl9PTighZHJtX21vZGVzZXRf aXNfbG9ja2VkKCZjb25maWctPmNvbm5lY3Rpb25fbXV0ZXgpKTsKLQotCURSTV9ERUJVR19BVE9N SUMoIltFTkNPREVSOiVkOiVzXSBpbiB1c2Ugb24gW0NSVEM6JWQ6JXNdLCBzdGVhbGluZyBpdFxu IiwKLQkJCSBlbmNvZGVyLT5iYXNlLmlkLCBlbmNvZGVyLT5uYW1lLAotCQkJIGVuY29kZXJfY3J0 Yy0+YmFzZS5pZCwgZW5jb2Rlcl9jcnRjLT5uYW1lKTsKKwlkcm1fZm9yX2VhY2hfY29ubmVjdG9y KGNvbm5lY3Rvciwgc3RhdGUtPmRldikgeworCQlzdHJ1Y3QgZHJtX2NydGMgKmVuY29kZXJfY3J0 YzsKIAotCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBlbmNv ZGVyX2NydGMpOwotCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpCi0JCXJldHVybiBQVFJfRVJSKGNy dGNfc3RhdGUpOwotCi0JY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkID0gdHJ1ZTsKLQot CWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLCAmY29uZmlnLT5jb25uZWN0b3JfbGlzdCwg aGVhZCkgewogCQlpZiAoY29ubmVjdG9yLT5zdGF0ZS0+YmVzdF9lbmNvZGVyICE9IGVuY29kZXIp CiAJCQljb250aW51ZTsKIAotCQlEUk1fREVCVUdfQVRPTUlDKCJTdGVhbGluZyBlbmNvZGVyIGZy b20gW0NPTk5FQ1RPUjolZDolc11cbiIsCi0JCQkJIGNvbm5lY3Rvci0+YmFzZS5pZCwKLQkJCQkg Y29ubmVjdG9yLT5uYW1lKTsKLQogCQljb25uZWN0b3Jfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9j b25uZWN0b3Jfc3RhdGUoc3RhdGUsCiAJCQkJCQkJCSBjb25uZWN0b3IpOwogCQlpZiAoSVNfRVJS KGNvbm5lY3Rvcl9zdGF0ZSkpCiAJCQlyZXR1cm4gUFRSX0VSUihjb25uZWN0b3Jfc3RhdGUpOwog Ci0JCWlmIChjb25uZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2RlciAhPSBlbmNvZGVyKQorCQlpZiAo Y29ubmVjdG9yX3N0YXRlLT5iZXN0X2VuY29kZXIgIT0gZW5jb2RlciB8fAorCQkgICAgV0FSTl9P TighY29ubmVjdG9yX3N0YXRlLT5jcnRjKSkKIAkJCWNvbnRpbnVlOwogCisJCWVuY29kZXJfY3J0 YyA9IGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YzsKKworCQlEUk1fREVCVUdfQVRPTUlDKCJbRU5DT0RF UjolZDolc10gaW4gdXNlIG9uIFtDUlRDOiVkOiVzXSwgc3RlYWxpbmcgaXRcbiIsCisJCQkJIGVu Y29kZXItPmJhc2UuaWQsIGVuY29kZXItPm5hbWUsCisJCQkJIGVuY29kZXJfY3J0Yy0+YmFzZS5p ZCwgZW5jb2Rlcl9jcnRjLT5uYW1lKTsKKwogCQlzZXRfYmVzdF9lbmNvZGVyKHN0YXRlLCBjb25u ZWN0b3Jfc3RhdGUsIE5VTEwpOworCisJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlz dGluZ19jcnRjX3N0YXRlKHN0YXRlLCBlbmNvZGVyX2NydGMpOworCQljcnRjX3N0YXRlLT5jb25u ZWN0b3JzX2NoYW5nZWQgPSB0cnVlOworCisJCXJldHVybiAwOwogCX0KIAogCXJldHVybiAwOwpA QCAtMjIxLDcgKzE5NCw2IEBAIHVwZGF0ZV9jb25uZWN0b3Jfcm91dGluZyhzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUsCiB7CiAJY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3JfaGVscGVy X2Z1bmNzICpmdW5jczsKIAlzdHJ1Y3QgZHJtX2VuY29kZXIgKm5ld19lbmNvZGVyOwotCXN0cnVj dCBkcm1fY3J0YyAqZW5jb2Rlcl9jcnRjOwogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZTsKIAlpbnQgaWR4LCByZXQ7CiAKQEAgLTI5OSwxNyArMjcxLDEyIEBAIHVwZGF0ZV9jb25u ZWN0b3Jfcm91dGluZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCXJldHVybiAt RUlOVkFMOwogCX0KIAotCWVuY29kZXJfY3J0YyA9IGdldF9jdXJyZW50X2NydGNfZm9yX2VuY29k ZXIoc3RhdGUtPmRldiwKLQkJCQkJCSAgICBuZXdfZW5jb2Rlcik7Ci0KLQlpZiAoZW5jb2Rlcl9j cnRjKSB7Ci0JCXJldCA9IHN0ZWFsX2VuY29kZXIoc3RhdGUsIG5ld19lbmNvZGVyLCBlbmNvZGVy X2NydGMpOwotCQlpZiAocmV0KSB7Ci0JCQlEUk1fREVCVUdfQVRPTUlDKCJFbmNvZGVyIHN0ZWFs aW5nIGZhaWxlZCBmb3IgW0NPTk5FQ1RPUjolZDolc11cbiIsCi0JCQkJCSBjb25uZWN0b3ItPmJh c2UuaWQsCi0JCQkJCSBjb25uZWN0b3ItPm5hbWUpOwotCQkJcmV0dXJuIHJldDsKLQkJfQorCXJl dCA9IHN0ZWFsX2VuY29kZXIoc3RhdGUsIG5ld19lbmNvZGVyKTsKKwlpZiAocmV0KSB7CisJCURS TV9ERUJVR19BVE9NSUMoIkVuY29kZXIgc3RlYWxpbmcgZmFpbGVkIGZvciBbQ09OTkVDVE9SOiVk OiVzXVxuIiwKKwkJCQkgY29ubmVjdG9yLT5iYXNlLmlkLAorCQkJCSBjb25uZWN0b3ItPm5hbWUp OworCQlyZXR1cm4gcmV0OwogCX0KIAogCWlmIChXQVJOX09OKCFjb25uZWN0b3Jfc3RhdGUtPmNy dGMpKQotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo=