From: Maarten Lankhorst Subject: [PATCH 03/24] drm/i915: Introduce and use intel_atomic_crtc_state_for_each_plane_state. Date: Fri, 4 Oct 2019 13:34:53 +0200 Message-ID: <20191004113514.17064-4-maarten.lankhorst@linux.intel.com> References: <20191004113514.17064-1-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id B03866EB33 for ; Fri, 4 Oct 2019 11:35:20 +0000 (UTC) In-Reply-To: <20191004113514.17064-1-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 SW5zdGVhZCBvZiBsb29raW5nIGF0IGRybV9wbGFuZV9zdGF0ZSwgbG9vayBhdCBpbnRlbF9wbGFu ZV9zdGF0ZSBkaXJlY3RseS4KClRoaXMgd2lsbCBhbGxvdyB1cyB0byBtYWtlIHRoZSB3YXRlcm1h cmtzIGJpZ2pvaW5lciBhd2FyZSwgd2hlbiB3ZSBtYWtlIGl0CndvcmsgZm9yIGJpZ2pvaW5lciBz bGF2ZSBwaXBlcyBhcyB3ZWxsLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1h YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuaCB8ICA4ICsrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYyAgICAgICAgICAgICAgfCA2MCArKysrKysrKy0tLS0tLS0tLS0tLQogMiBmaWxl cyBjaGFuZ2VkLCAzMyBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5oCmluZGV4IDRkZWQ2NGZjYmM2Yy4u YmMyY2Y0YmVjMGU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX2Rpc3BsYXkuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rp c3BsYXkuaApAQCAtNDQwLDYgKzQ0MCwxNCBAQCBlbnVtIHBoeV9maWEgewogCSAgICAgKF9faSkt LSkgXAogCQlmb3JfZWFjaF9pZihjcnRjKQogCisjZGVmaW5lIGludGVsX2F0b21pY19jcnRjX3N0 YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlKCBcCisJCSAgcGxhbmUsIHBsYW5lX3N0YXRlLCBcCisJ CSAgY3J0Y19zdGF0ZSkgXAorCWZvcl9lYWNoX2ludGVsX3BsYW5lX21hc2soKChjcnRjX3N0YXRl KS0+YmFzZS5zdGF0ZS0+ZGV2KSwgKHBsYW5lKSwgXAorCQkJCSgoY3J0Y19zdGF0ZSktPmJhc2Uu cGxhbmVfbWFzaykpIFwKKwkJZm9yX2VhY2hfaWYgKChwbGFuZV9zdGF0ZSA9IFwKKwkJCSAgICAg IHRvX2ludGVsX3BsYW5lX3N0YXRlKF9fZHJtX2F0b21pY19nZXRfY3VycmVudF9wbGFuZV9zdGF0 ZSgoY3J0Y19zdGF0ZSktPmJhc2Uuc3RhdGUsICZwbGFuZS0+YmFzZSkpKSkKKwogdm9pZCBpbnRl bF9saW5rX2NvbXB1dGVfbV9uKHUxNiBicHAsIGludCBubGFuZXMsCiAJCQkgICAgaW50IHBpeGVs X2Nsb2NrLCBpbnQgbGlua19jbG9jaywKIAkJCSAgICBzdHJ1Y3QgaW50ZWxfbGlua19tX24gKm1f biwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGJmY2YwM2FiNTI0NS4uNmFlYWFkNTg3YTIw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTMwODksOCArMzA4OSw4IEBAIHN0YXRpYyBp bnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSkKIAlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gc3RhdGUtPmRldjsKIAljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0JY29uc3Qgc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CisJc3RydWN0IGludGVsX3BsYW5lICpw bGFuZTsKKwljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOwogCWNv bnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpc3RhdGUgPSBOVUxMOwogCWNvbnN0IHN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Byc3RhdGUgPSBOVUxMOwogCWNvbnN0IHN0cnVjdCBp bnRlbF9wbGFuZV9zdGF0ZSAqY3Vyc3RhdGUgPSBOVUxMOwpAQCAtMzA5OSwxNSArMzA5OSwxMyBA QCBzdGF0aWMgaW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCiAKIAlwaXBlX3dtID0gJmNydGNfc3RhdGUtPndtLmlsay5vcHRpbWFsOwog Ci0JZHJtX2F0b21pY19jcnRjX3N0YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlKHBsYW5lLCBwbGFu ZV9zdGF0ZSwgJmNydGNfc3RhdGUtPmJhc2UpIHsKLQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICpwcyA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKTsKLQotCQlpZiAo cGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKLQkJCXByaXN0YXRlID0gcHM7 Ci0JCWVsc2UgaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkpCi0JCQlz cHJzdGF0ZSA9IHBzOwotCQllbHNlIGlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9D VVJTT1IpCi0JCQljdXJzdGF0ZSA9IHBzOworCWludGVsX2F0b21pY19jcnRjX3N0YXRlX2Zvcl9l YWNoX3BsYW5lX3N0YXRlKHBsYW5lLCBwbGFuZV9zdGF0ZSwgY3J0Y19zdGF0ZSkgeworCQlpZiAo cGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKQorCQkJcHJpc3RhdGUg PSBwbGFuZV9zdGF0ZTsKKwkJZWxzZSBpZiAocGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVf VFlQRV9PVkVSTEFZKQorCQkJc3Byc3RhdGUgPSBwbGFuZV9zdGF0ZTsKKwkJZWxzZSBpZiAocGxh bmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IpCisJCQljdXJzdGF0ZSA9IHBs YW5lX3N0YXRlOwogCX0KIAogCXBpcGVfd20tPnBpcGVfZW5hYmxlZCA9IGNydGNfc3RhdGUtPmJh c2UuYWN0aXZlOwpAQCAtNDEyNCw4ICs0MTIyLDggQEAgaW50IHNrbF9jaGVja19waXBlX21heF9w aXhlbF9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogewogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfY3J0Yy0+YmFzZS5kZXYpOwog CXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGNydGNfc3RhdGUtPmJhc2Uuc3RhdGU7 Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0JY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0 ZSAqZHJtX3BsYW5lX3N0YXRlOworCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxh bmVfc3RhdGU7CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKIAlpbnQgY3J0Y19jbG9jaywg ZG90Y2xrOwogCXUzMiBwaXBlX21heF9waXhlbF9yYXRlOwogCXVpbnRfZml4ZWRfMTZfMTZfdCBw aXBlX2Rvd25zY2FsZTsKQEAgLTQxMzQsMTIgKzQxMzIsMTAgQEAgaW50IHNrbF9jaGVja19waXBl X21heF9waXhlbF9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCWlmICghY3J0 Y19zdGF0ZS0+YmFzZS5lbmFibGUpCiAJCXJldHVybiAwOwogCi0JZHJtX2F0b21pY19jcnRjX3N0 YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlKHBsYW5lLCBkcm1fcGxhbmVfc3RhdGUsICZjcnRjX3N0 YXRlLT5iYXNlKSB7CisJaW50ZWxfYXRvbWljX2NydGNfc3RhdGVfZm9yX2VhY2hfcGxhbmVfc3Rh dGUocGxhbmUsIHBsYW5lX3N0YXRlLCBjcnRjX3N0YXRlKSB7CiAJCXVpbnRfZml4ZWRfMTZfMTZf dCBwbGFuZV9kb3duc2NhbGU7CiAJCXVpbnRfZml4ZWRfMTZfMTZfdCBmcF85X2Rpdl84ID0gZGl2 X2ZpeGVkMTYoOSwgOCk7CiAJCWludCBicHA7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqcGxhbmVfc3RhdGUgPQotCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUoZHJtX3BsYW5lX3N0 YXRlKTsKIAogCQlpZiAoIWludGVsX3dtX3BsYW5lX3Zpc2libGUoY3J0Y19zdGF0ZSwgcGxhbmVf c3RhdGUpKQogCQkJY29udGludWU7CkBAIC00MjI3LDE4ICs0MjIzLDE2IEBAIHNrbF9nZXRfdG90 YWxfcmVsYXRpdmVfZGF0YV9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAogCQkJCSB1NjQgKnV2X3BsYW5lX2RhdGFfcmF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqc3RhdGUgPSBjcnRjX3N0YXRlLT5iYXNlLnN0YXRlOwotCXN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lOwotCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKmRybV9wbGFuZV9zdGF0ZTsK KwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lOworCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqcGxhbmVfc3RhdGU7CiAJdTY0IHRvdGFsX2RhdGFfcmF0ZSA9IDA7CiAKIAlpZiAoV0FS Tl9PTighc3RhdGUpKQogCQlyZXR1cm4gMDsKIAogCS8qIENhbGN1bGF0ZSBhbmQgY2FjaGUgZGF0 YSByYXRlIGZvciBlYWNoIHBsYW5lICovCi0JZHJtX2F0b21pY19jcnRjX3N0YXRlX2Zvcl9lYWNo X3BsYW5lX3N0YXRlKHBsYW5lLCBkcm1fcGxhbmVfc3RhdGUsICZjcnRjX3N0YXRlLT5iYXNlKSB7 Ci0JCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQgPSB0b19pbnRlbF9wbGFuZShwbGFuZSktPmlkOwot CQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlID0KLQkJCXRvX2lu dGVsX3BsYW5lX3N0YXRlKGRybV9wbGFuZV9zdGF0ZSk7CisJaW50ZWxfYXRvbWljX2NydGNfc3Rh dGVfZm9yX2VhY2hfcGxhbmVfc3RhdGUocGxhbmUsIHBsYW5lX3N0YXRlLCBjcnRjX3N0YXRlKSB7 CisJCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQgPSBwbGFuZS0+aWQ7CiAJCXU2NCByYXRlOwogCiAJ CS8qIHBhY2tlZC95ICovCkBAIC00MjU5LDE4ICs0MjUzLDE2IEBAIHN0YXRpYyB1NjQKIGljbF9n ZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlLAogCQkJCSB1NjQgKnBsYW5lX2RhdGFfcmF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZTsKLQljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpkcm1fcGxhbmVfc3RhdGU7 CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKKwljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKnBsYW5lX3N0YXRlOwogCXU2NCB0b3RhbF9kYXRhX3JhdGUgPSAwOwogCiAJaWYgKFdB Uk5fT04oIWNydGNfc3RhdGUtPmJhc2Uuc3RhdGUpKQogCQlyZXR1cm4gMDsKIAogCS8qIENhbGN1 bGF0ZSBhbmQgY2FjaGUgZGF0YSByYXRlIGZvciBlYWNoIHBsYW5lICovCi0JZHJtX2F0b21pY19j cnRjX3N0YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlKHBsYW5lLCBkcm1fcGxhbmVfc3RhdGUsICZj cnRjX3N0YXRlLT5iYXNlKSB7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxh bmVfc3RhdGUgPQotCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUoZHJtX3BsYW5lX3N0YXRlKTsKLQkJ ZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+aWQ7CisJaW50 ZWxfYXRvbWljX2NydGNfc3RhdGVfZm9yX2VhY2hfcGxhbmVfc3RhdGUocGxhbmUsIHBsYW5lX3N0 YXRlLCBjcnRjX3N0YXRlKSB7CisJCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQgPSBwbGFuZS0+aWQ7 CiAJCXU2NCByYXRlOwogCiAJCWlmICghcGxhbmVfc3RhdGUtPnBsYW5hcl9saW5rZWRfcGxhbmUp IHsKQEAgLTQyODIsNyArNDI3NCw3IEBAIGljbF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRl KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCiAJCQkvKgogCQkJICogVGhl IHNsYXZlIHBsYW5lIG1pZ2h0IG5vdCBpdGVyYXRlIGluCi0JCQkgKiBkcm1fYXRvbWljX2NydGNf c3RhdGVfZm9yX2VhY2hfcGxhbmVfc3RhdGUoKSwKKwkJCSAqIGludGVsX2F0b21pY19jcnRjX3N0 YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlKCksCiAJCQkgKiBhbmQgbmVlZHMgdGhlIG1hc3RlciBw bGFuZSBzdGF0ZSB3aGljaCBtYXkgYmUKIAkJCSAqIE5VTEwgaWYgd2UgdHJ5IGdldF9uZXdfcGxh bmVfc3RhdGUoKSwgc28gd2UKIAkJCSAqIGFsd2F5cyBjYWxjdWxhdGUgZnJvbSB0aGUgbWFzdGVy LgpAQCAtNTA2NSw4ICs1MDU3LDggQEAgc3RhdGljIGludCBza2xfYnVpbGRfcGlwZV93bShzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGNfc3RhdGUtPmJhc2UuY3J0Yy0+ZGV2KTsKIAlz dHJ1Y3Qgc2tsX3BpcGVfd20gKnBpcGVfd20gPSAmY3J0Y19zdGF0ZS0+d20uc2tsLm9wdGltYWw7 Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0JY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0 ZSAqZHJtX3BsYW5lX3N0YXRlOworCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmU7CisJY29uc3Qg c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKIAlpbnQgcmV0OwogCiAJLyoK QEAgLTUwNzUsMTAgKzUwNjcsOCBAQCBzdGF0aWMgaW50IHNrbF9idWlsZF9waXBlX3dtKHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCSAqLwogCW1lbXNldChwaXBlX3dtLT5w bGFuZXMsIDAsIHNpemVvZihwaXBlX3dtLT5wbGFuZXMpKTsKIAotCWRybV9hdG9taWNfY3J0Y19z dGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0ZShwbGFuZSwgZHJtX3BsYW5lX3N0YXRlLAotCQkJCQkJ ICAgJmNydGNfc3RhdGUtPmJhc2UpIHsKLQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpwbGFuZV9zdGF0ZSA9Ci0JCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShkcm1fcGxhbmVfc3RhdGUp OworCWludGVsX2F0b21pY19jcnRjX3N0YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlKHBsYW5lLCBw bGFuZV9zdGF0ZSwKKwkJCQkJCSAgICAgY3J0Y19zdGF0ZSkgewogCiAJCWlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpID49IDExKQogCQkJcmV0ID0gaWNsX2J1aWxkX3BsYW5lX3dtKGNydGNfc3RhdGUs IHBsYW5lX3N0YXRlKTsKLS0gCjIuMjMuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4