From: Maarten Lankhorst Subject: [CI 08/12] drm/i915: Perform manual conversions for plane uapi/hw split, v2. Date: Wed, 30 Oct 2019 15:26:53 +0100 Message-ID: <20191030142657.22405-8-maarten.lankhorst@linux.intel.com> References: <20191030142657.22405-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DC6A6EA27 for ; Wed, 30 Oct 2019 14:27:06 +0000 (UTC) In-Reply-To: <20191030142657.22405-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 PG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiAuLi4vZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCAgOCArKy0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyAgfCA0NSArKysrKysrKysrLS0tLS0tLS0tCiAy IGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5jCmluZGV4 IDM5M2ZiOTdhM2RjYS4uNDE2Y2ZhNDM5ZjMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2F0b21pY19wbGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljX3BsYW5lLmMKQEAgLTIyNSwxMSArMjI1LDExIEBAIHN0 YXRpYyBzdHJ1Y3QgaW50ZWxfY3J0YyAqCiBnZXRfY3J0Y19mcm9tX3N0YXRlcyhjb25zdCBzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSwKIAkJICAgICBjb25zdCBzdHJ1 Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZSkKIHsKLQlpZiAobmV3X3BsYW5l X3N0YXRlLT5iYXNlLmNydGMpCi0JCXJldHVybiB0b19pbnRlbF9jcnRjKG5ld19wbGFuZV9zdGF0 ZS0+YmFzZS5jcnRjKTsKKwlpZiAobmV3X3BsYW5lX3N0YXRlLT51YXBpLmNydGMpCisJCXJldHVy biB0b19pbnRlbF9jcnRjKG5ld19wbGFuZV9zdGF0ZS0+dWFwaS5jcnRjKTsKIAotCWlmIChvbGRf cGxhbmVfc3RhdGUtPmJhc2UuY3J0YykKLQkJcmV0dXJuIHRvX2ludGVsX2NydGMob2xkX3BsYW5l X3N0YXRlLT5iYXNlLmNydGMpOworCWlmIChvbGRfcGxhbmVfc3RhdGUtPnVhcGkuY3J0YykKKwkJ cmV0dXJuIHRvX2ludGVsX2NydGMob2xkX3BsYW5lX3N0YXRlLT51YXBpLmNydGMpOwogCiAJcmV0 dXJuIE5VTEw7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxh eS5jCmluZGV4IGUzMGY0NjdlZWM2Ny4uYjBiMmM0NmU0YzBhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTUzNTcsMTIgKzE1MzU3LDEyIEBA IGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKl9wbGFuZSwKIAkg KiB0YWtlIHRoZSBzbG93cGF0aC4gT25seSBjaGFuZ2luZyBmYiBvciBwb3NpdGlvbiBzaG91bGQg YmUKIAkgKiBpbiB0aGUgZmFzdHBhdGguCiAJICovCi0JaWYgKG9sZF9wbGFuZV9zdGF0ZS0+YmFz ZS5jcnRjICE9ICZjcnRjLT5iYXNlIHx8Ci0JICAgIG9sZF9wbGFuZV9zdGF0ZS0+YmFzZS5zcmNf dyAhPSBzcmNfdyB8fAotCSAgICBvbGRfcGxhbmVfc3RhdGUtPmJhc2Uuc3JjX2ggIT0gc3JjX2gg fHwKLQkgICAgb2xkX3BsYW5lX3N0YXRlLT5iYXNlLmNydGNfdyAhPSBjcnRjX3cgfHwKLQkgICAg b2xkX3BsYW5lX3N0YXRlLT5iYXNlLmNydGNfaCAhPSBjcnRjX2ggfHwKLQkgICAgIW9sZF9wbGFu ZV9zdGF0ZS0+YmFzZS5mYiAhPSAhZmIpCisJaWYgKG9sZF9wbGFuZV9zdGF0ZS0+dWFwaS5jcnRj ICE9ICZjcnRjLT5iYXNlIHx8CisJICAgIG9sZF9wbGFuZV9zdGF0ZS0+dWFwaS5zcmNfdyAhPSBz cmNfdyB8fAorCSAgICBvbGRfcGxhbmVfc3RhdGUtPnVhcGkuc3JjX2ggIT0gc3JjX2ggfHwKKwkg ICAgb2xkX3BsYW5lX3N0YXRlLT51YXBpLmNydGNfdyAhPSBjcnRjX3cgfHwKKwkgICAgb2xkX3Bs YW5lX3N0YXRlLT51YXBpLmNydGNfaCAhPSBjcnRjX2ggfHwKKwkgICAgIW9sZF9wbGFuZV9zdGF0 ZS0+dWFwaS5mYiAhPSAhZmIpCiAJCWdvdG8gc2xvdzsKIAogCW5ld19wbGFuZV9zdGF0ZSA9IHRv X2ludGVsX3BsYW5lX3N0YXRlKGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSgmcGxhbmUtPmJh c2UpKTsKQEAgLTE1Mzc1LDE2ICsxNTM3NSwxNiBAQCBpbnRlbF9sZWdhY3lfY3Vyc29yX3VwZGF0 ZShzdHJ1Y3QgZHJtX3BsYW5lICpfcGxhbmUsCiAJCWdvdG8gb3V0X2ZyZWU7CiAJfQogCi0JZHJt X2F0b21pY19zZXRfZmJfZm9yX3BsYW5lKCZuZXdfcGxhbmVfc3RhdGUtPmJhc2UsIGZiKTsKKwlk cm1fYXRvbWljX3NldF9mYl9mb3JfcGxhbmUoJm5ld19wbGFuZV9zdGF0ZS0+dWFwaSwgZmIpOwog Ci0JbmV3X3BsYW5lX3N0YXRlLT5iYXNlLnNyY194ID0gc3JjX3g7Ci0JbmV3X3BsYW5lX3N0YXRl LT5iYXNlLnNyY195ID0gc3JjX3k7Ci0JbmV3X3BsYW5lX3N0YXRlLT5iYXNlLnNyY193ID0gc3Jj X3c7Ci0JbmV3X3BsYW5lX3N0YXRlLT5iYXNlLnNyY19oID0gc3JjX2g7Ci0JbmV3X3BsYW5lX3N0 YXRlLT5iYXNlLmNydGNfeCA9IGNydGNfeDsKLQluZXdfcGxhbmVfc3RhdGUtPmJhc2UuY3J0Y195 ID0gY3J0Y195OwotCW5ld19wbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3cgPSBjcnRjX3c7Ci0JbmV3 X3BsYW5lX3N0YXRlLT5iYXNlLmNydGNfaCA9IGNydGNfaDsKKwluZXdfcGxhbmVfc3RhdGUtPnVh cGkuc3JjX3ggPSBzcmNfeDsKKwluZXdfcGxhbmVfc3RhdGUtPnVhcGkuc3JjX3kgPSBzcmNfeTsK KwluZXdfcGxhbmVfc3RhdGUtPnVhcGkuc3JjX3cgPSBzcmNfdzsKKwluZXdfcGxhbmVfc3RhdGUt PnVhcGkuc3JjX2ggPSBzcmNfaDsKKwluZXdfcGxhbmVfc3RhdGUtPnVhcGkuY3J0Y194ID0gY3J0 Y194OworCW5ld19wbGFuZV9zdGF0ZS0+dWFwaS5jcnRjX3kgPSBjcnRjX3k7CisJbmV3X3BsYW5l X3N0YXRlLT51YXBpLmNydGNfdyA9IGNydGNfdzsKKwluZXdfcGxhbmVfc3RhdGUtPnVhcGkuY3J0 Y19oID0gY3J0Y19oOwogCiAJcmV0ID0gaW50ZWxfcGxhbmVfYXRvbWljX2NoZWNrX3dpdGhfc3Rh dGUoY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUsCiAJCQkJCQkgIG9sZF9wbGFuZV9zdGF0ZSwg bmV3X3BsYW5lX3N0YXRlKTsKQEAgLTE1Mzk1LDEzICsxNTM5NSwxNCBAQCBpbnRlbF9sZWdhY3lf Y3Vyc29yX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpfcGxhbmUsCiAJaWYgKHJldCkKIAkJZ290 byBvdXRfZnJlZTsKIAotCWludGVsX2Zyb250YnVmZmVyX2ZsdXNoKHRvX2ludGVsX2Zyb250YnVm ZmVyKG5ld19wbGFuZV9zdGF0ZS0+YmFzZS5mYiksIE9SSUdJTl9GTElQKTsKLQlpbnRlbF9mcm9u dGJ1ZmZlcl90cmFjayh0b19pbnRlbF9mcm9udGJ1ZmZlcihvbGRfcGxhbmVfc3RhdGUtPmJhc2Uu ZmIpLAotCQkJCXRvX2ludGVsX2Zyb250YnVmZmVyKG5ld19wbGFuZV9zdGF0ZS0+YmFzZS5mYiks CisJaW50ZWxfZnJvbnRidWZmZXJfZmx1c2godG9faW50ZWxfZnJvbnRidWZmZXIobmV3X3BsYW5l X3N0YXRlLT5ody5mYiksCisJCQkJT1JJR0lOX0ZMSVApOworCWludGVsX2Zyb250YnVmZmVyX3Ry YWNrKHRvX2ludGVsX2Zyb250YnVmZmVyKG9sZF9wbGFuZV9zdGF0ZS0+aHcuZmIpLAorCQkJCXRv X2ludGVsX2Zyb250YnVmZmVyKG5ld19wbGFuZV9zdGF0ZS0+aHcuZmIpLAogCQkJCXBsYW5lLT5m cm9udGJ1ZmZlcl9iaXQpOwogCiAJLyogU3dhcCBwbGFuZSBzdGF0ZSAqLwotCXBsYW5lLT5iYXNl LnN0YXRlID0gJm5ld19wbGFuZV9zdGF0ZS0+YmFzZTsKKwlwbGFuZS0+YmFzZS5zdGF0ZSA9ICZu ZXdfcGxhbmVfc3RhdGUtPnVhcGk7CiAKIAkvKgogCSAqIFdlIGNhbm5vdCBzd2FwIGNydGNfc3Rh dGUgYXMgaXQgbWF5IGJlIGluIHVzZSBieSBhbiBhdG9taWMgY29tbWl0IG9yCkBAIC0xNTQxNSw3 ICsxNTQxNiw3IEBAIGludGVsX2xlZ2FjeV9jdXJzb3JfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUg Kl9wbGFuZSwKIAkgKi8KIAljcnRjX3N0YXRlLT5hY3RpdmVfcGxhbmVzID0gbmV3X2NydGNfc3Rh dGUtPmFjdGl2ZV9wbGFuZXM7CiAKLQlpZiAobmV3X3BsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUp CisJaWYgKG5ld19wbGFuZV9zdGF0ZS0+dWFwaS52aXNpYmxlKQogCQlpbnRlbF91cGRhdGVfcGxh bmUocGxhbmUsIGNydGNfc3RhdGUsIG5ld19wbGFuZV9zdGF0ZSk7CiAJZWxzZQogCQlpbnRlbF9k aXNhYmxlX3BsYW5lKHBsYW5lLCBjcnRjX3N0YXRlKTsKQEAgLTE1NDI2LDkgKzE1NDI3LDkgQEAg aW50ZWxfbGVnYWN5X2N1cnNvcl91cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqX3BsYW5lLAogCWlm IChuZXdfY3J0Y19zdGF0ZSkKIAkJaW50ZWxfY3J0Y19kZXN0cm95X3N0YXRlKCZjcnRjLT5iYXNl LCAmbmV3X2NydGNfc3RhdGUtPnVhcGkpOwogCWlmIChyZXQpCi0JCWludGVsX3BsYW5lX2Rlc3Ry b3lfc3RhdGUoJnBsYW5lLT5iYXNlLCAmbmV3X3BsYW5lX3N0YXRlLT5iYXNlKTsKKwkJaW50ZWxf cGxhbmVfZGVzdHJveV9zdGF0ZSgmcGxhbmUtPmJhc2UsICZuZXdfcGxhbmVfc3RhdGUtPnVhcGkp OwogCWVsc2UKLQkJaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSgmcGxhbmUtPmJhc2UsICZvbGRf cGxhbmVfc3RhdGUtPmJhc2UpOworCQlpbnRlbF9wbGFuZV9kZXN0cm95X3N0YXRlKCZwbGFuZS0+ YmFzZSwgJm9sZF9wbGFuZV9zdGF0ZS0+dWFwaSk7CiAJcmV0dXJuIHJldDsKIAogc2xvdzoKLS0g CjIuMjMuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4