From: Maarten Lankhorst Subject: [PATCH 12/24] drm/i915: Split plane hw and uapi state Date: Fri, 4 Oct 2019 13:35:02 +0200 Message-ID: <20191004113514.17064-13-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 BB0E46EB37 for ; Fri, 4 Oct 2019 11:35:22 +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 U3BsaXR0aW5nIHBsYW5lIHN0YXRlIGlzIGVhc2llciB0aGFuIHNwbGl0dGluZyBjcnRjX3N0YXRl LApiZWZvcmUgcGxhbmUgY2hlY2sgd2UgY29weSB0aGUgZHJtIHByb3BlcnRpZXMgdG8gaHcgc28g d2UgY2FuCmRvIHRoZSBzYW1lIGluIGJpZ2pvaW5lciBsYXRlciBvbi4KCldlIGNvcHkgdGhlIHN0 YXRlIGFmdGVyIHdlIGRpZCBhbGwgdGhlIG1vZGVzZXQgaGFuZGxpbmcsIGJ1dCBmb3J0dW5hdGVs eQppOTE1IHNlZW1zIHRvIGJlIHNwbGl0IGNvcnJlY3RseSBhbmQgbm90aGluZyBkdXJpbmcgbW9k ZXNldCBsb29rcwphdCBwbGFuZV9zdGF0ZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hv cnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogLi4uL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5jIHwgMzcgKysrKysrKysrKysrKysrKysr LQogLi4uL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5oIHwgIDIgKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgIHwgIDEgKwogLi4u L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5oICAgIHwgMjIgKysrKysrKysr LS0KIDQgZmlsZXMgY2hhbmdlZCwgNTcgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFu ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYwpp bmRleCAwMTkzNzg5NmQ2OWMuLmNjMTU0Y2ZhMzM4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5jCkBAIC05Myw2ICs5Myw5IEBAIGlu dGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAlpbnRl bF9zdGF0ZS0+dm1hID0gTlVMTDsKIAlpbnRlbF9zdGF0ZS0+ZmxhZ3MgPSAwOwogCisJLyogd2ls bCBiZSBzZXQgaW4gaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrX3dpdGhfc3RhdGUoKSAqLworCW1l bXNldCgmaW50ZWxfc3RhdGUtPmh3LCAwLCBzaXplb2YoaW50ZWxfc3RhdGUtPmh3KSk7CisKIAly ZXR1cm4gJmludGVsX3N0YXRlLT51YXBpOwogfQogCkBAIC0xMTIsNiArMTE1LDggQEAgaW50ZWxf cGxhbmVfZGVzdHJveV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlXQVJOX09OKHBs YW5lX3N0YXRlLT52bWEpOwogCiAJX19kcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9kZXN0cm95X3N0 YXRlKCZwbGFuZV9zdGF0ZS0+dWFwaSk7CisJaWYgKHBsYW5lX3N0YXRlLT5ody5mYikKKwkJZHJt X2ZyYW1lYnVmZmVyX3B1dChwbGFuZV9zdGF0ZS0+aHcuZmIpOwogCWtmcmVlKHBsYW5lX3N0YXRl KTsKIH0KIApAQCAtMTM4LDE1ICsxNDMsMzQgQEAgdW5zaWduZWQgaW50IGludGVsX3BsYW5lX2Rh dGFfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlyZXR1 cm4gY3BwICogY3J0Y19zdGF0ZS0+cGl4ZWxfcmF0ZTsKIH0KIAordm9pZCBpbnRlbF9wbGFuZV9j b3B5X3VhcGlfdG9faHdfc3RhdGUoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0 ZSwKKwkJCQkgICAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpmcm9tX3BsYW5l X3N0YXRlKQoreworCXBsYW5lX3N0YXRlLT5ody5jcnRjID0gZnJvbV9wbGFuZV9zdGF0ZS0+dWFw aS5jcnRjOworCXBsYW5lX3N0YXRlLT5ody5mYiA9IGZyb21fcGxhbmVfc3RhdGUtPnVhcGkuZmI7 CisJaWYgKHBsYW5lX3N0YXRlLT5ody5mYikKKwkJZHJtX2ZyYW1lYnVmZmVyX2dldChwbGFuZV9z dGF0ZS0+aHcuZmIpOworCisJcGxhbmVfc3RhdGUtPmh3LmFscGhhID0gZnJvbV9wbGFuZV9zdGF0 ZS0+dWFwaS5hbHBoYTsKKwlwbGFuZV9zdGF0ZS0+aHcucGl4ZWxfYmxlbmRfbW9kZSA9CisJCWZy b21fcGxhbmVfc3RhdGUtPnVhcGkucGl4ZWxfYmxlbmRfbW9kZTsKKwlwbGFuZV9zdGF0ZS0+aHcu cm90YXRpb24gPSBmcm9tX3BsYW5lX3N0YXRlLT51YXBpLnJvdGF0aW9uOworCXBsYW5lX3N0YXRl LT5ody5jb2xvcl9lbmNvZGluZyA9IGZyb21fcGxhbmVfc3RhdGUtPnVhcGkuY29sb3JfZW5jb2Rp bmc7CisJcGxhbmVfc3RhdGUtPmh3LmNvbG9yX3JhbmdlID0gZnJvbV9wbGFuZV9zdGF0ZS0+dWFw aS5jb2xvcl9yYW5nZTsKK30KKwogaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0 YXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKIAkJCQkJ c3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlLAogCQkJCQljb25zdCBzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSwKIAkJCQkJc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICpuZXdfcGxhbmVfc3RhdGUpCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICpw bGFuZSA9IHRvX2ludGVsX3BsYW5lKG5ld19wbGFuZV9zdGF0ZS0+dWFwaS5wbGFuZSk7Ci0JY29u c3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBuZXdfcGxhbmVfc3RhdGUtPmh3LmZiOwor CWNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwogCWludCByZXQ7CiAKKwlpbnRlbF9w bGFuZV9jb3B5X3VhcGlfdG9faHdfc3RhdGUobmV3X3BsYW5lX3N0YXRlLCBuZXdfcGxhbmVfc3Rh dGUpOworCWZiID0gbmV3X3BsYW5lX3N0YXRlLT5ody5mYjsKKwogCW5ld19jcnRjX3N0YXRlLT5h Y3RpdmVfcGxhbmVzICY9IH5CSVQocGxhbmUtPmlkKTsKIAluZXdfY3J0Y19zdGF0ZS0+bnYxMl9w bGFuZXMgJj0gfkJJVChwbGFuZS0+aWQpOwogCW5ld19jcnRjX3N0YXRlLT5jOF9wbGFuZXMgJj0g fkJJVChwbGFuZS0+aWQpOwpAQCAtMzczLDYgKzM5Nyw3IEBAIGludGVsX2F0b21pY19nZXRfcGxh bmVfc3RhdGVfYWZ0ZXJfY2hlY2soc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiB7 CiAJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9CiAJCWludGVsX2F0b21p Y19nZXRfbmV3X3BsYW5lX3N0YXRlKHN0YXRlLCBwbGFuZSk7CisJY29uc3Qgc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGU7CiAKIAlpZiAocGxhbmVfc3RhdGUpCiAJCXJl dHVybiBwbGFuZV9zdGF0ZTsKQEAgLTM4MSw2ICs0MDYsMTYgQEAgaW50ZWxfYXRvbWljX2dldF9w bGFuZV9zdGF0ZV9hZnRlcl9jaGVjayhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwK IAlpZiAoSVNfRVJSKHBsYW5lX3N0YXRlKSkKIAkJcmV0dXJuIHBsYW5lX3N0YXRlOwogCisJb2xk X3BsYW5lX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9vbGRfcGxhbmVfc3RhdGUoc3RhdGUsIHBs YW5lKTsKKworCS8qCisJICogY29weSBIVyBwYXJhbWV0ZXJzIHNpbmNlIHRoZXkncmUgemVybydk IG9uIGR1cGxpY2F0aW9uLCB0byBwcmV2ZW50CisJICogYWNjaWRlbnRhbGx5IHVzaW5nIHN0YWxl IHN0YXRlLgorCSAqLworCXBsYW5lX3N0YXRlLT5odyA9IG9sZF9wbGFuZV9zdGF0ZS0+aHc7CisJ aWYgKHBsYW5lX3N0YXRlLT5ody5mYikKKwkJZHJtX2ZyYW1lYnVmZmVyX2dldChwbGFuZV9zdGF0 ZS0+aHcuZmIpOworCiAJbmV3X2NydGNfc3RhdGUtPnVwZGF0ZV9wbGFuZXMgfD0gQklUKHBsYW5l LT5pZCk7CiAJcmV0dXJuIHBsYW5lX3N0YXRlOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmgKaW5kZXggY2I3ZWY0ZjllYWZkLi5mZDRi OTYwMTM0NTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf YXRvbWljX3BsYW5lLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9h dG9taWNfcGxhbmUuaApAQCAtMjAsNiArMjAsOCBAQCBleHRlcm4gY29uc3Qgc3RydWN0IGRybV9w bGFuZV9oZWxwZXJfZnVuY3MgaW50ZWxfcGxhbmVfaGVscGVyX2Z1bmNzOwogCiB1bnNpZ25lZCBp bnQgaW50ZWxfcGxhbmVfZGF0YV9yYXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlLAogCQkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVf c3RhdGUpOwordm9pZCBpbnRlbF9wbGFuZV9jb3B5X3VhcGlfdG9faHdfc3RhdGUoc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwKKwkJCQkgICAgICAgY29uc3Qgc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpmcm9tX3BsYW5lX3N0YXRlKTsKIHZvaWQgaW50ZWxfdXBkYXRlX3Bs YW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCQljb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3Bs YXkuYwppbmRleCAwZWU1NDI4NDBjNzAuLmZmZGU0YjhiOGJlOSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTMyNjcsNiArMzI2Nyw3IEBAIGlu dGVsX2ZpbmRfaW5pdGlhbF9wbGFuZV9vYmooc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMs CiAKIAlwbGFuZV9zdGF0ZS0+ZmIgPSBmYjsKIAlwbGFuZV9zdGF0ZS0+Y3J0YyA9ICZpbnRlbF9j cnRjLT5iYXNlOworCWludGVsX3BsYW5lX2NvcHlfdWFwaV90b19od19zdGF0ZShpbnRlbF9zdGF0 ZSwgaW50ZWxfc3RhdGUpOwogCiAJYXRvbWljX29yKHRvX2ludGVsX3BsYW5lKHByaW1hcnkpLT5m cm9udGJ1ZmZlcl9iaXQsCiAJCSAgJnRvX2ludGVsX2Zyb250YnVmZmVyKGZiKS0+Yml0cyk7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlw ZXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV90eXBlcy5o CmluZGV4IGM2YzQ5YWE4YzE3Mi4uNjc2NDQ4MThlZmQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaApAQCAtNTE1LDEwICs1MTUs MjQgQEAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSB7CiB9OwogCiBzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgewotCXVuaW9uIHsKLQkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSB1YXBpOwotCQlz dHJ1Y3QgZHJtX3BsYW5lX3N0YXRlIGh3OwotCX07CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSB1 YXBpOworCisJLyoKKwkgKiBhY3R1YWwgaGFyZHdhcmUgc3RhdGUsIHRoZSBzdGF0ZSB3ZSBwcm9n cmFtIHRvIHRoZSBoYXJkd2FyZS4KKwkgKiBUaGUgZm9sbG93aW5nIG1lbWJlcnMgYXJlIHVzZWQg dG8gdmVyaWZ5IHRoZSBoYXJkd2FyZSBzdGF0ZToKKwkgKiBEdXJpbmcgaW5pdGlhbCBodyByZWFk b3V0LCB0aGV5IG5lZWQgdG8gYmUgY29waWVkIGZyb20gdWFwaS4KKwkgKi8KKwlzdHJ1Y3Qgewor CQlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CisJCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwor CisJCXUxNiBhbHBoYTsKKwkJdWludDE2X3QgcGl4ZWxfYmxlbmRfbW9kZTsKKwkJdW5zaWduZWQg aW50IHJvdGF0aW9uOworCQllbnVtIGRybV9jb2xvcl9lbmNvZGluZyBjb2xvcl9lbmNvZGluZzsK KwkJZW51bSBkcm1fY29sb3JfcmFuZ2UgY29sb3JfcmFuZ2U7CisJfSBodzsKKwogCXN0cnVjdCBp OTE1X2dndHRfdmlldyB2aWV3OwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwogCXVuc2lnbmVkIGxv bmcgZmxhZ3M7Ci0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeA==