From: Maarten Lankhorst Subject: [PATCH 08/12] drm/i915: Perform manual conversions for plane uapi/hw split, v2. Date: Thu, 31 Oct 2019 12:26:06 +0100 Message-ID: <20191031112610.27608-8-maarten.lankhorst@linux.intel.com> References: <20191031112610.27608-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 055BC6EE37 for ; Thu, 31 Oct 2019 11:26:17 +0000 (UTC) In-Reply-To: <20191031112610.27608-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 Z2V0X2NydGNfZnJvbV9zdGF0ZXMoKSBpcyBjYWxsZWQgYmVmb3JlIHBsYW5lX3N0YXRlIGlzIGNv cGllZCB0byB1YXBpLApzbyB1c2UgdGhlIHVhcGkgc3RhdGUgdGhlcmUuCgppbnRlbF9sZWdhY3lf Y3Vyc29yX3VwZGF0ZSgpIGNvdWxkIHByb2JhYmx5IGdldCBhd2F5IHdpdGggbG9va2luZyBhdAp0 aGUgaHcgc3RhdGUsIGJ1dCBmb3IgY2xhcml0eSBhbHdheXMgbG9vayBhdCB0aGUgdWFwaSBzdGF0 ZS4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gQ29udmVydCBlbnRpcmV0eSBvZiBpbnRlbF9sZWdhY3lf Y3Vyc29yX3VwZGF0ZSAoVmlsbGUpLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3Qg PG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogLi4uL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5jIHwgIDggKystLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgIHwgNDUgKysrKysrKysrKy0tLS0tLS0t LQogMiBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFu ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYwpp bmRleCAzOTNmYjk3YTNkY2EuLjQxNmNmYTQzOWYzMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5jCkBAIC0yMjUsMTEgKzIyNSwxMSBA QCBzdGF0aWMgc3RydWN0IGludGVsX2NydGMgKgogZ2V0X2NydGNfZnJvbV9zdGF0ZXMoY29uc3Qg c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUsCiAJCSAgICAgY29uc3Qg c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpuZXdfcGxhbmVfc3RhdGUpCiB7Ci0JaWYgKG5ld19w bGFuZV9zdGF0ZS0+YmFzZS5jcnRjKQotCQlyZXR1cm4gdG9faW50ZWxfY3J0YyhuZXdfcGxhbmVf c3RhdGUtPmJhc2UuY3J0Yyk7CisJaWYgKG5ld19wbGFuZV9zdGF0ZS0+dWFwaS5jcnRjKQorCQly ZXR1cm4gdG9faW50ZWxfY3J0YyhuZXdfcGxhbmVfc3RhdGUtPnVhcGkuY3J0Yyk7CiAKLQlpZiAo b2xkX3BsYW5lX3N0YXRlLT5iYXNlLmNydGMpCi0JCXJldHVybiB0b19pbnRlbF9jcnRjKG9sZF9w bGFuZV9zdGF0ZS0+YmFzZS5jcnRjKTsKKwlpZiAob2xkX3BsYW5lX3N0YXRlLT51YXBpLmNydGMp CisJCXJldHVybiB0b19pbnRlbF9jcnRjKG9sZF9wbGFuZV9zdGF0ZS0+dWFwaS5jcnRjKTsKIAog CXJldHVybiBOVUxMOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rp c3BsYXkuYwppbmRleCAzNzNjYmJiYjU3YTQuLmYyNDRjNmEwMTBiYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE1MzUyLDEyICsxNTM1Miwx MiBAQCBpbnRlbF9sZWdhY3lfY3Vyc29yX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpfcGxhbmUs CiAJICogdGFrZSB0aGUgc2xvd3BhdGguIE9ubHkgY2hhbmdpbmcgZmIgb3IgcG9zaXRpb24gc2hv dWxkIGJlCiAJICogaW4gdGhlIGZhc3RwYXRoLgogCSAqLwotCWlmIChvbGRfcGxhbmVfc3RhdGUt PmJhc2UuY3J0YyAhPSAmY3J0Yy0+YmFzZSB8fAotCSAgICBvbGRfcGxhbmVfc3RhdGUtPmJhc2Uu c3JjX3cgIT0gc3JjX3cgfHwKLQkgICAgb2xkX3BsYW5lX3N0YXRlLT5iYXNlLnNyY19oICE9IHNy Y19oIHx8Ci0JICAgIG9sZF9wbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3cgIT0gY3J0Y193IHx8Ci0J ICAgIG9sZF9wbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX2ggIT0gY3J0Y19oIHx8Ci0JICAgICFvbGRf cGxhbmVfc3RhdGUtPmJhc2UuZmIgIT0gIWZiKQorCWlmIChvbGRfcGxhbmVfc3RhdGUtPnVhcGku Y3J0YyAhPSAmY3J0Yy0+YmFzZSB8fAorCSAgICBvbGRfcGxhbmVfc3RhdGUtPnVhcGkuc3JjX3cg IT0gc3JjX3cgfHwKKwkgICAgb2xkX3BsYW5lX3N0YXRlLT51YXBpLnNyY19oICE9IHNyY19oIHx8 CisJICAgIG9sZF9wbGFuZV9zdGF0ZS0+dWFwaS5jcnRjX3cgIT0gY3J0Y193IHx8CisJICAgIG9s ZF9wbGFuZV9zdGF0ZS0+dWFwaS5jcnRjX2ggIT0gY3J0Y19oIHx8CisJICAgICFvbGRfcGxhbmVf c3RhdGUtPnVhcGkuZmIgIT0gIWZiKQogCQlnb3RvIHNsb3c7CiAKIAluZXdfcGxhbmVfc3RhdGUg PSB0b19pbnRlbF9wbGFuZV9zdGF0ZShpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUoJnBsYW5l LT5iYXNlKSk7CkBAIC0xNTM3MCwxNiArMTUzNzAsMTYgQEAgaW50ZWxfbGVnYWN5X2N1cnNvcl91 cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5lLAogCQlnb3RvIG91dF9mcmVlOwogCX0KIAot CWRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZSgmbmV3X3BsYW5lX3N0YXRlLT5iYXNlLCBmYik7 CisJZHJtX2F0b21pY19zZXRfZmJfZm9yX3BsYW5lKCZuZXdfcGxhbmVfc3RhdGUtPnVhcGksIGZi KTsKIAotCW5ld19wbGFuZV9zdGF0ZS0+YmFzZS5zcmNfeCA9IHNyY194OwotCW5ld19wbGFuZV9z dGF0ZS0+YmFzZS5zcmNfeSA9IHNyY195OwotCW5ld19wbGFuZV9zdGF0ZS0+YmFzZS5zcmNfdyA9 IHNyY193OwotCW5ld19wbGFuZV9zdGF0ZS0+YmFzZS5zcmNfaCA9IHNyY19oOwotCW5ld19wbGFu ZV9zdGF0ZS0+YmFzZS5jcnRjX3ggPSBjcnRjX3g7Ci0JbmV3X3BsYW5lX3N0YXRlLT5iYXNlLmNy dGNfeSA9IGNydGNfeTsKLQluZXdfcGxhbmVfc3RhdGUtPmJhc2UuY3J0Y193ID0gY3J0Y193Owot CW5ld19wbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX2ggPSBjcnRjX2g7CisJbmV3X3BsYW5lX3N0YXRl LT51YXBpLnNyY194ID0gc3JjX3g7CisJbmV3X3BsYW5lX3N0YXRlLT51YXBpLnNyY195ID0gc3Jj X3k7CisJbmV3X3BsYW5lX3N0YXRlLT51YXBpLnNyY193ID0gc3JjX3c7CisJbmV3X3BsYW5lX3N0 YXRlLT51YXBpLnNyY19oID0gc3JjX2g7CisJbmV3X3BsYW5lX3N0YXRlLT51YXBpLmNydGNfeCA9 IGNydGNfeDsKKwluZXdfcGxhbmVfc3RhdGUtPnVhcGkuY3J0Y195ID0gY3J0Y195OworCW5ld19w bGFuZV9zdGF0ZS0+dWFwaS5jcnRjX3cgPSBjcnRjX3c7CisJbmV3X3BsYW5lX3N0YXRlLT51YXBp LmNydGNfaCA9IGNydGNfaDsKIAogCXJldCA9IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRo X3N0YXRlKGNydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLAogCQkJCQkJICBvbGRfcGxhbmVfc3Rh dGUsIG5ld19wbGFuZV9zdGF0ZSk7CkBAIC0xNTM5MCwxMyArMTUzOTAsMTQgQEAgaW50ZWxfbGVn YWN5X2N1cnNvcl91cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5lLAogCWlmIChyZXQpCiAJ CWdvdG8gb3V0X2ZyZWU7CiAKLQlpbnRlbF9mcm9udGJ1ZmZlcl9mbHVzaCh0b19pbnRlbF9mcm9u dGJ1ZmZlcihuZXdfcGxhbmVfc3RhdGUtPmJhc2UuZmIpLCBPUklHSU5fRkxJUCk7Ci0JaW50ZWxf ZnJvbnRidWZmZXJfdHJhY2sodG9faW50ZWxfZnJvbnRidWZmZXIob2xkX3BsYW5lX3N0YXRlLT5i YXNlLmZiKSwKLQkJCQl0b19pbnRlbF9mcm9udGJ1ZmZlcihuZXdfcGxhbmVfc3RhdGUtPmJhc2Uu ZmIpLAorCWludGVsX2Zyb250YnVmZmVyX2ZsdXNoKHRvX2ludGVsX2Zyb250YnVmZmVyKG5ld19w bGFuZV9zdGF0ZS0+aHcuZmIpLAorCQkJCU9SSUdJTl9GTElQKTsKKwlpbnRlbF9mcm9udGJ1ZmZl cl90cmFjayh0b19pbnRlbF9mcm9udGJ1ZmZlcihvbGRfcGxhbmVfc3RhdGUtPmh3LmZiKSwKKwkJ CQl0b19pbnRlbF9mcm9udGJ1ZmZlcihuZXdfcGxhbmVfc3RhdGUtPmh3LmZiKSwKIAkJCQlwbGFu ZS0+ZnJvbnRidWZmZXJfYml0KTsKIAogCS8qIFN3YXAgcGxhbmUgc3RhdGUgKi8KLQlwbGFuZS0+ YmFzZS5zdGF0ZSA9ICZuZXdfcGxhbmVfc3RhdGUtPmJhc2U7CisJcGxhbmUtPmJhc2Uuc3RhdGUg PSAmbmV3X3BsYW5lX3N0YXRlLT51YXBpOwogCiAJLyoKIAkgKiBXZSBjYW5ub3Qgc3dhcCBjcnRj X3N0YXRlIGFzIGl0IG1heSBiZSBpbiB1c2UgYnkgYW4gYXRvbWljIGNvbW1pdCBvcgpAQCAtMTU0 MTAsNyArMTU0MTEsNyBAQCBpbnRlbF9sZWdhY3lfY3Vyc29yX3VwZGF0ZShzdHJ1Y3QgZHJtX3Bs YW5lICpfcGxhbmUsCiAJICovCiAJY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyA9IG5ld19jcnRj X3N0YXRlLT5hY3RpdmVfcGxhbmVzOwogCi0JaWYgKG5ld19wbGFuZV9zdGF0ZS0+YmFzZS52aXNp YmxlKQorCWlmIChuZXdfcGxhbmVfc3RhdGUtPnVhcGkudmlzaWJsZSkKIAkJaW50ZWxfdXBkYXRl X3BsYW5lKHBsYW5lLCBjcnRjX3N0YXRlLCBuZXdfcGxhbmVfc3RhdGUpOwogCWVsc2UKIAkJaW50 ZWxfZGlzYWJsZV9wbGFuZShwbGFuZSwgY3J0Y19zdGF0ZSk7CkBAIC0xNTQyMSw5ICsxNTQyMiw5 IEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKl9wbGFuZSwK IAlpZiAobmV3X2NydGNfc3RhdGUpCiAJCWludGVsX2NydGNfZGVzdHJveV9zdGF0ZSgmY3J0Yy0+ YmFzZSwgJm5ld19jcnRjX3N0YXRlLT51YXBpKTsKIAlpZiAocmV0KQotCQlpbnRlbF9wbGFuZV9k ZXN0cm95X3N0YXRlKCZwbGFuZS0+YmFzZSwgJm5ld19wbGFuZV9zdGF0ZS0+YmFzZSk7CisJCWlu dGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUoJnBsYW5lLT5iYXNlLCAmbmV3X3BsYW5lX3N0YXRlLT51 YXBpKTsKIAllbHNlCi0JCWludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUoJnBsYW5lLT5iYXNlLCAm b2xkX3BsYW5lX3N0YXRlLT5iYXNlKTsKKwkJaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSgmcGxh bmUtPmJhc2UsICZvbGRfcGxhbmVfc3RhdGUtPnVhcGkpOwogCXJldHVybiByZXQ7CiAKIHNsb3c6 Ci0tIAoyLjI0LjAucmMxCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZng=