From: ville.syrjala@linux.intel.com Subject: [PATCH v2 06/15] drm/i915: Move cursor position and base handling into the platform specific functions Date: Mon, 27 Mar 2017 21:55:37 +0300 Message-ID: <20170327185546.2977-7-ville.syrjala@linux.intel.com> References: <20170327185546.2977-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id B12956E32B for ; Mon, 27 Mar 2017 18:56:06 +0000 (UTC) In-Reply-To: <20170327185546.2977-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClN1 cHBvc2VkbHkgb24gc29tZSBwbGF0Zm9ybXMgd2UgY2FuIGdldCBleHRyYSBhdG9taWNpdHkgZ3Vh cmFudGVlcyBmb3IKQ1VSUE9TIGlmIHdlIHdyaXRlIGl0IGJldHdlZW4gdGhlIENVUkNOVFIgYW5k IENVUkJBU0UuIExldCdzIG1vdmUgdGhlCkNVUlBPUyBoYW5kbGluZyBpbnRvIHRoZSBwbGF0Zm9y bSBzcGVjaWZpYyBob29rcyB0byBtYWtlIHRoZSBwb3NzaWJsZQp3aXRob3V0IGhhdmluZyB0byBw YXNzIHRoZSBjYWxjdWxhdGVkIENVUlBPUyBhcm91bmQuIEFuZCB3aGlsZSBhdCBpdCwKZG8gdGhl IHNhbWUgZm9yIHRoZSBDVVJCQVNFIHRvIGF2b2lkIHBhc3NpbmcgdGhhdCBlaXRoZXIuCgp2Mjog VXNlIEk5MTVfV1JJVEVfRlcoKSBhbmQgZ3JhYiB1bmNvcmUubG9jawoKU2lnbmVkLW9mZi1ieTog VmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQt Ynk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPiAjdjEKLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA5NiArKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCA0NyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYWM1Njg3 NTZhODM1Li5iYzBlNzFmZGE5MGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTkxOTQsMTEgKzkxOTQsMTMgQEAgc3RhdGljIHUzMiBpODQ1X2N1cnNvcl9jdGwoY29uc3Qg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCUNVUlNPUl9TVFJJREUoc3Ry aWRlKTsKIH0KIAotc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfY3Vyc29yKHN0cnVjdCBpbnRlbF9w bGFuZSAqcGxhbmUsIHUzMiBiYXNlLAorc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfY3Vyc29yKHN0 cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkgICAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KHBsYW5lLT5iYXNlLmRldik7Ci0JdWludDMyX3QgY250bCA9IDAsIHNpemUg PSAwOworCXUzMiBjbnRsID0gMCwgYmFzZSA9IDAsIHBvcyA9IDAsIHNpemUgPSAwOworCXVuc2ln bmVkIGxvbmcgaXJxZmxhZ3M7CiAKIAlpZiAocGxhbmVfc3RhdGUgJiYgcGxhbmVfc3RhdGUtPmJh c2UudmlzaWJsZSkgewogCQl1bnNpZ25lZCBpbnQgd2lkdGggPSBwbGFuZV9zdGF0ZS0+YmFzZS5j cnRjX3c7CkBAIC05MjA2LDggKzkyMDgsMTMgQEAgc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfY3Vy c29yKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsIHUzMiBiYXNlLAogCiAJCWNudGwgPSBwbGFu ZV9zdGF0ZS0+Y3RsOwogCQlzaXplID0gKGhlaWdodCA8PCAxMikgfCB3aWR0aDsKKworCQliYXNl ID0gaW50ZWxfY3Vyc29yX2Jhc2UocGxhbmVfc3RhdGUpOworCQlwb3MgPSBpbnRlbF9jdXJzb3Jf cG9zaXRpb24ocGxhbmVfc3RhdGUpOwogCX0KIAorCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJp di0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKKwogCWlmIChwbGFuZS0+Y3Vyc29yLmNudGwgIT0g MCAmJgogCSAgICAocGxhbmUtPmN1cnNvci5iYXNlICE9IGJhc2UgfHwKIAkgICAgIHBsYW5lLT5j dXJzb3Iuc2l6ZSAhPSBzaXplIHx8CkBAIC05MjMwLDExICs5MjM3LDIyIEBAIHN0YXRpYyB2b2lk IGk4NDVfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLCB1MzIgYmFzZSwK IAkJcGxhbmUtPmN1cnNvci5zaXplID0gc2l6ZTsKIAl9CiAKKwlpZiAoY250bCkKKwkJSTkxNV9X UklURV9GVyhDVVJQT1MoUElQRV9BKSwgcG9zKTsKKwogCWlmIChwbGFuZS0+Y3Vyc29yLmNudGwg IT0gY250bCkgewogCQlJOTE1X1dSSVRFX0ZXKENVUkNOVFIoUElQRV9BKSwgY250bCk7CiAJCVBP U1RJTkdfUkVBRF9GVyhDVVJDTlRSKFBJUEVfQSkpOwogCQlwbGFuZS0+Y3Vyc29yLmNudGwgPSBj bnRsOwogCX0KKworCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9j aywgaXJxZmxhZ3MpOworfQorCitzdGF0aWMgdm9pZCBpODQ1X2Rpc2FibGVfY3Vyc29yKHN0cnVj dCBpbnRlbF9wbGFuZSAqcGxhbmUsCisJCQkJc3RydWN0IGludGVsX2NydGMgKmNydGMpCit7CisJ aTg0NV91cGRhdGVfY3Vyc29yKHBsYW5lLCBOVUxMLCBOVUxMKTsKIH0KIAogc3RhdGljIHUzMiBp OXh4X2N1cnNvcl9jdGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUs CkBAIC05MjczLDU0ICs5MjkxLDQ2IEBAIHN0YXRpYyB1MzIgaTl4eF9jdXJzb3JfY3RsKGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXJldHVybiBjbnRsOwogfQog Ci0KLXN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBs YW5lLCB1MzIgYmFzZSwKK3N0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgaW50 ZWxfcGxhbmUgKnBsYW5lLAorCQkJICAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlLAogCQkJICAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShwbGFuZS0+YmFzZS5kZXYpOwogCWVudW0gcGlwZSBwaXBlID0gcGxhbmUtPnBpcGU7Ci0J dWludDMyX3QgY250bCA9IDA7CisJdTMyIGNudGwgPSAwLCBiYXNlID0gMCwgcG9zID0gMDsKKwl1 bnNpZ25lZCBsb25nIGlycWZsYWdzOwogCi0JaWYgKHBsYW5lX3N0YXRlICYmIHBsYW5lX3N0YXRl LT5iYXNlLnZpc2libGUpCisJaWYgKHBsYW5lX3N0YXRlICYmIHBsYW5lX3N0YXRlLT5iYXNlLnZp c2libGUpIHsKIAkJY250bCA9IHBsYW5lX3N0YXRlLT5jdGw7CiAKKwkJYmFzZSA9IGludGVsX2N1 cnNvcl9iYXNlKHBsYW5lX3N0YXRlKTsKKwkJcG9zID0gaW50ZWxfY3Vyc29yX3Bvc2l0aW9uKHBs YW5lX3N0YXRlKTsKKwl9CisKKwlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPnVuY29yZS5s b2NrLCBpcnFmbGFncyk7CisKIAlpZiAocGxhbmUtPmN1cnNvci5jbnRsICE9IGNudGwpIHsKIAkJ STkxNV9XUklURV9GVyhDVVJDTlRSKHBpcGUpLCBjbnRsKTsKIAkJUE9TVElOR19SRUFEX0ZXKENV UkNOVFIocGlwZSkpOwogCQlwbGFuZS0+Y3Vyc29yLmNudGwgPSBjbnRsOwogCX0KIAorCWlmIChj bnRsKQorCQlJOTE1X1dSSVRFX0ZXKENVUlBPUyhwaXBlKSwgcG9zKTsKKwogCS8qIGFuZCBjb21t aXQgY2hhbmdlcyBvbiBuZXh0IHZibGFuayAqLwogCUk5MTVfV1JJVEVfRlcoQ1VSQkFTRShwaXBl KSwgYmFzZSk7CiAJUE9TVElOR19SRUFEX0ZXKENVUkJBU0UocGlwZSkpOwogCisJc3Bpbl91bmxv Y2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CisKIAlwbGFu ZS0+Y3Vyc29yLmJhc2UgPSBiYXNlOwogfQogCi0vKiBJZiBuby1wYXJ0IG9mIHRoZSBjdXJzb3Ig aXMgdmlzaWJsZSBvbiB0aGUgZnJhbWVidWZmZXIsIHRoZW4gdGhlIEdQVSBtYXkgaGFuZy4uLiAq Lwotc3RhdGljIHZvaWQgaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKHN0cnVjdCBpbnRlbF9wbGFu ZSAqcGxhbmUsCi0JCQkJICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5l X3N0YXRlKQorc3RhdGljIHZvaWQgaTl4eF9kaXNhYmxlX2N1cnNvcihzdHJ1Y3QgaW50ZWxfcGxh bmUgKnBsYW5lLAorCQkJCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUtPmJhc2UuZGV2KTsKLQllbnVt IHBpcGUgcGlwZSA9IHBsYW5lLT5waXBlOwotCXUzMiBwb3MgPSAwLCBiYXNlID0gMDsKLQl1bnNp Z25lZCBsb25nIGlycWZsYWdzOwotCi0JaWYgKHBsYW5lX3N0YXRlKSB7Ci0JCWJhc2UgPSBpbnRl bF9jdXJzb3JfYmFzZShwbGFuZV9zdGF0ZSk7Ci0JCXBvcyA9IGludGVsX2N1cnNvcl9wb3NpdGlv bihwbGFuZV9zdGF0ZSk7Ci0JfQotCi0Jc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2LT51bmNv cmUubG9jaywgaXJxZmxhZ3MpOwotCi0JSTkxNV9XUklURV9GVyhDVVJQT1MocGlwZSksIHBvcyk7 Ci0KLQlpZiAoSVNfSTg0NUcoZGV2X3ByaXYpIHx8IElTX0k4NjVHKGRldl9wcml2KSkKLQkJaTg0 NV91cGRhdGVfY3Vyc29yKHBsYW5lLCBiYXNlLCBwbGFuZV9zdGF0ZSk7Ci0JZWxzZQotCQlpOXh4 X3VwZGF0ZV9jdXJzb3IocGxhbmUsIGJhc2UsIHBsYW5lX3N0YXRlKTsKLQotCXNwaW5fdW5sb2Nr X2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOworCWk5eHhfdXBk YXRlX2N1cnNvcihwbGFuZSwgTlVMTCwgTlVMTCk7CiB9CiAKIHN0YXRpYyBib29sIGN1cnNvcl9z aXplX29rKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKQEAgLTEzNzQ5LDIzICsx Mzc1OSw5IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBs YW5lLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZAotaW50ZWxfZGlzYWJsZV9jdXJzb3Jf cGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKLQkJCSAgIHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKQotewotCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihwbGFuZSwgTlVMTCk7Ci19Ci0K LXN0YXRpYyB2b2lkCi1pbnRlbF91cGRhdGVfY3Vyc29yX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFu ZSAqcGxhbmUsCi0JCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAotCQkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQotewotCWludGVs X2NydGNfdXBkYXRlX2N1cnNvcihwbGFuZSwgc3RhdGUpOwotfQotCiBzdGF0aWMgc3RydWN0IGlu dGVsX3BsYW5lICoKLWludGVsX2N1cnNvcl9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSkKK2ludGVsX2N1cnNvcl9wbGFuZV9jcmVh dGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICBlbnVtIHBpcGUgcGlw ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmN1cnNvciA9IE5VTEw7CiAJc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICpzdGF0ZSA9IE5VTEw7CkBAIC0xMzc5Miw4ICsxMzc4OCwxNCBAQCBpbnRl bF9jdXJzb3JfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg ZW51bSBwaXBlIHBpcGUpCiAJY3Vyc29yLT5pZCA9IFBMQU5FX0NVUlNPUjsKIAljdXJzb3ItPmZy b250YnVmZmVyX2JpdCA9IElOVEVMX0ZST05UQlVGRkVSX0NVUlNPUihwaXBlKTsKIAljdXJzb3It PmNoZWNrX3BsYW5lID0gaW50ZWxfY2hlY2tfY3Vyc29yX3BsYW5lOwotCWN1cnNvci0+dXBkYXRl X3BsYW5lID0gaW50ZWxfdXBkYXRlX2N1cnNvcl9wbGFuZTsKLQljdXJzb3ItPmRpc2FibGVfcGxh bmUgPSBpbnRlbF9kaXNhYmxlX2N1cnNvcl9wbGFuZTsKKworCWlmIChJU19JODQ1RyhkZXZfcHJp dikgfHwgSVNfSTg2NUcoZGV2X3ByaXYpKSB7CisJCWN1cnNvci0+dXBkYXRlX3BsYW5lID0gaTg0 NV91cGRhdGVfY3Vyc29yOworCQljdXJzb3ItPmRpc2FibGVfcGxhbmUgPSBpODQ1X2Rpc2FibGVf Y3Vyc29yOworCX0gZWxzZSB7CisJCWN1cnNvci0+dXBkYXRlX3BsYW5lID0gaTl4eF91cGRhdGVf Y3Vyc29yOworCQljdXJzb3ItPmRpc2FibGVfcGxhbmUgPSBpOXh4X2Rpc2FibGVfY3Vyc29yOwor CX0KIAogCWN1cnNvci0+Y3Vyc29yLmJhc2UgPSB+MDsKIAljdXJzb3ItPmN1cnNvci5jbnRsID0g fjA7Ci0tIAoyLjEwLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=