From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH v2 4/7] drm/i915: Clean up cursor defines Date: Wed, 31 Jan 2018 16:37:09 +0200 Message-ID: <20180131143709.875-1-ville.syrjala@linux.intel.com> References: <20180130203807.13721-4-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFD8C6E21F for ; Wed, 31 Jan 2018 14:37:15 +0000 (UTC) In-Reply-To: <20180130203807.13721-4-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSBNQ1VSU09SXyBpbnN0ZWFkIG9mIENVUlNPUl8gYXMgdGhlIHByZWZpeCBmb3IgdGhlIG5vbi04 NDUvODY1CmN1cnNvciBkZWZpbmVzIGNvbnNpc3RlbnRseSwgYW5kIG1vdmUgdGhlIHBpcGUgQ1ND IGVuYWJsZSBiaXQgbmV4dAp0byB0aGUgb3RoZXIgbm9uLTg0NS84NjUgY3Vyc29yIGRlZmluZXMu Cgp2MjogVGFrZSBjYXJlIG9mIGd2dCB1c2VzIGFzIHdlbGwKClNpZ25lZC1vZmYtYnk6IFZpbGxl IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvZ3Z0L2ZiX2RlY29kZXIuYyB8IDEyICsrKysrKy0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9yZWcuaCAgICAgICB8IDIyICsrKysrKysrKysrLS0tLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgfCAxNiArKysrKysrKy0tLS0t LS0tCiAzIGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9mYl9kZWNvZGVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZmJfZGVjb2Rlci5jCmluZGV4IDZiNTBmZTc4ZGMxYi4uNzNj MGMyMDk2YTYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZmJfZGVjb2Rl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9mYl9kZWNvZGVyLmMKQEAgLTMwMywx NiArMzAzLDE2IEBAIHN0YXRpYyBpbnQgY3Vyc29yX21vZGVfdG9fZHJtKGludCBtb2RlKQogCWlu dCBjdXJzb3JfcGl4ZWxfZm9ybWF0c19pbmRleCA9IDQ7CiAKIAlzd2l0Y2ggKG1vZGUpIHsKLQlj YXNlIENVUlNPUl9NT0RFXzEyOF9BUkdCX0FYOgorCWNhc2UgTUNVUlNPUl9NT0RFXzEyOF9BUkdC X0FYOgogCQljdXJzb3JfcGl4ZWxfZm9ybWF0c19pbmRleCA9IDA7CiAJCWJyZWFrOwotCWNhc2Ug Q1VSU09SX01PREVfMjU2X0FSR0JfQVg6CisJY2FzZSBNQ1VSU09SX01PREVfMjU2X0FSR0JfQVg6 CiAJCWN1cnNvcl9waXhlbF9mb3JtYXRzX2luZGV4ID0gMTsKIAkJYnJlYWs7Ci0JY2FzZSBDVVJT T1JfTU9ERV82NF9BUkdCX0FYOgorCWNhc2UgTUNVUlNPUl9NT0RFXzY0X0FSR0JfQVg6CiAJCWN1 cnNvcl9waXhlbF9mb3JtYXRzX2luZGV4ID0gMjsKIAkJYnJlYWs7Ci0JY2FzZSBDVVJTT1JfTU9E RV82NF8zMkJfQVg6CisJY2FzZSBNQ1VSU09SX01PREVfNjRfMzJCX0FYOgogCQljdXJzb3JfcGl4 ZWxfZm9ybWF0c19pbmRleCA9IDM7CiAJCWJyZWFrOwogCkBAIC0zNDUsOCArMzQ1LDggQEAgaW50 IGludGVsX3ZncHVfZGVjb2RlX2N1cnNvcl9wbGFuZShzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwK IAkJcmV0dXJuIC1FTk9ERVY7CiAKIAl2YWwgPSB2Z3B1X3ZyZWdfdCh2Z3B1LCBDVVJDTlRSKHBp cGUpKTsKLQltb2RlID0gdmFsICYgQ1VSU09SX01PREU7Ci0JcGxhbmUtPmVuYWJsZWQgPSAobW9k ZSAhPSBDVVJTT1JfTU9ERV9ESVNBQkxFKTsKKwltb2RlID0gdmFsICYgTUNVUlNPUl9NT0RFOwor CXBsYW5lLT5lbmFibGVkID0gKG1vZGUgIT0gTUNVUlNPUl9NT0RFX0RJU0FCTEUpOwogCWlmICgh cGxhbmUtPmVuYWJsZWQpCiAJCXJldHVybiAtRU5PREVWOwogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcu aAppbmRleCBlYmI0MWYyNzkxMzQuLmRiY2I0ZGU5MmE2MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl Zy5oCkBAIC01ODkxLDcgKzU4OTEsNiBAQCBlbnVtIHsKICNkZWZpbmUgICBDVVJTT1JfR0FNTUFf RU5BQkxFCTB4NDAwMDAwMDAKICNkZWZpbmUgICBDVVJTT1JfU1RSSURFX1NISUZUCTI4CiAjZGVm aW5lICAgQ1VSU09SX1NUUklERSh4KQkoKGZmcyh4KS05KSA8PCBDVVJTT1JfU1RSSURFX1NISUZU KSAvKiAyNTYsNTEyLDFrLDJrICovCi0jZGVmaW5lICAgQ1VSU09SX1BJUEVfQ1NDX0VOQUJMRSAo MTw8MjQpCiAjZGVmaW5lICAgQ1VSU09SX0ZPUk1BVF9TSElGVAkyNAogI2RlZmluZSAgIENVUlNP Ul9GT1JNQVRfTUFTSwkoMHgwNyA8PCBDVVJTT1JfRk9STUFUX1NISUZUKQogI2RlZmluZSAgIENV UlNPUl9GT1JNQVRfMkMJKDB4MDAgPDwgQ1VSU09SX0ZPUk1BVF9TSElGVCkKQEAgLTU5MDAsMjAg KzU4OTksMjEgQEAgZW51bSB7CiAjZGVmaW5lICAgQ1VSU09SX0ZPUk1BVF9BUkdCCSgweDA0IDw8 IENVUlNPUl9GT1JNQVRfU0hJRlQpCiAjZGVmaW5lICAgQ1VSU09SX0ZPUk1BVF9YUkdCCSgweDA1 IDw8IENVUlNPUl9GT1JNQVRfU0hJRlQpCiAvKiBOZXcgc3R5bGUgQ1VSKkNOVFIgZmxhZ3MgKi8K LSNkZWZpbmUgICBDVVJTT1JfTU9ERQkJMHgyNwotI2RlZmluZSAgIENVUlNPUl9NT0RFX0RJU0FC TEUgICAweDAwCi0jZGVmaW5lICAgQ1VSU09SX01PREVfMTI4XzMyQl9BWCAweDAyCi0jZGVmaW5l ICAgQ1VSU09SX01PREVfMjU2XzMyQl9BWCAweDAzCi0jZGVmaW5lICAgQ1VSU09SX01PREVfNjRf MzJCX0FYIDB4MDcKLSNkZWZpbmUgICBDVVJTT1JfTU9ERV8xMjhfQVJHQl9BWCAoKDEgPDwgNSkg fCBDVVJTT1JfTU9ERV8xMjhfMzJCX0FYKQotI2RlZmluZSAgIENVUlNPUl9NT0RFXzI1Nl9BUkdC X0FYICgoMSA8PCA1KSB8IENVUlNPUl9NT0RFXzI1Nl8zMkJfQVgpCi0jZGVmaW5lICAgQ1VSU09S X01PREVfNjRfQVJHQl9BWCAoKDEgPDwgNSkgfCBDVVJTT1JfTU9ERV82NF8zMkJfQVgpCisjZGVm aW5lICAgTUNVUlNPUl9NT0RFCQkweDI3CisjZGVmaW5lICAgTUNVUlNPUl9NT0RFX0RJU0FCTEUg ICAweDAwCisjZGVmaW5lICAgTUNVUlNPUl9NT0RFXzEyOF8zMkJfQVggMHgwMgorI2RlZmluZSAg IE1DVVJTT1JfTU9ERV8yNTZfMzJCX0FYIDB4MDMKKyNkZWZpbmUgICBNQ1VSU09SX01PREVfNjRf MzJCX0FYIDB4MDcKKyNkZWZpbmUgICBNQ1VSU09SX01PREVfMTI4X0FSR0JfQVggKCgxIDw8IDUp IHwgTUNVUlNPUl9NT0RFXzEyOF8zMkJfQVgpCisjZGVmaW5lICAgTUNVUlNPUl9NT0RFXzI1Nl9B UkdCX0FYICgoMSA8PCA1KSB8IE1DVVJTT1JfTU9ERV8yNTZfMzJCX0FYKQorI2RlZmluZSAgIE1D VVJTT1JfTU9ERV82NF9BUkdCX0FYICgoMSA8PCA1KSB8IE1DVVJTT1JfTU9ERV82NF8zMkJfQVgp CiAjZGVmaW5lICAgTUNVUlNPUl9QSVBFX1NFTEVDVF9NQVNLCSgweDMgPDwgMjgpCiAjZGVmaW5l ICAgTUNVUlNPUl9QSVBFX1NFTEVDVF9TSElGVAkyOAogI2RlZmluZSAgIE1DVVJTT1JfUElQRV9T RUxFQ1QocGlwZSkJKChwaXBlKSA8PCAyOCkKICNkZWZpbmUgICBNQ1VSU09SX0dBTU1BX0VOQUJM RSAgKDEgPDwgMjYpCi0jZGVmaW5lICAgQ1VSU09SX1JPVEFURV8xODAJKDE8PDE1KQotI2RlZmlu ZSAgIENVUlNPUl9UUklDS0xFX0ZFRURfRElTQUJMRQkoMSA8PCAxNCkKKyNkZWZpbmUgICBNQ1VS U09SX1BJUEVfQ1NDX0VOQUJMRSAoMTw8MjQpCisjZGVmaW5lICAgTUNVUlNPUl9ST1RBVEVfMTgw CSgxPDwxNSkKKyNkZWZpbmUgICBNQ1VSU09SX1RSSUNLTEVfRkVFRF9ESVNBQkxFCSgxIDw8IDE0 KQogI2RlZmluZSBfQ1VSQUJBU0UJCTB4NzAwODQKICNkZWZpbmUgX0NVUkFQT1MJCTB4NzAwODgK ICNkZWZpbmUgICBDVVJTT1JfUE9TX01BU0sgICAgICAgMHgwMDdGRgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IGZlYWU2YmQ1MWE0NC4uMGNmMDJmMjI2ZmQ0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC05NTQ5LDIwICs5NTQ5LDIwIEBAIHN0YXRp YyB1MzIgaTl4eF9jdXJzb3JfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlLAogCWNudGwgPSBNQ1VSU09SX0dBTU1BX0VOQUJMRTsKIAogCWlmIChIQVNfRERJKGRl dl9wcml2KSkKLQkJY250bCB8PSBDVVJTT1JfUElQRV9DU0NfRU5BQkxFOworCQljbnRsIHw9IE1D VVJTT1JfUElQRV9DU0NfRU5BQkxFOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA1ICYm ICFJU19HNFgoZGV2X3ByaXYpKQogCQljbnRsIHw9IE1DVVJTT1JfUElQRV9TRUxFQ1QoY3J0Yy0+ cGlwZSk7CiAKIAlzd2l0Y2ggKHBsYW5lX3N0YXRlLT5iYXNlLmNydGNfdykgewogCWNhc2UgNjQ6 Ci0JCWNudGwgfD0gQ1VSU09SX01PREVfNjRfQVJHQl9BWDsKKwkJY250bCB8PSBNQ1VSU09SX01P REVfNjRfQVJHQl9BWDsKIAkJYnJlYWs7CiAJY2FzZSAxMjg6Ci0JCWNudGwgfD0gQ1VSU09SX01P REVfMTI4X0FSR0JfQVg7CisJCWNudGwgfD0gTUNVUlNPUl9NT0RFXzEyOF9BUkdCX0FYOwogCQli cmVhazsKIAljYXNlIDI1NjoKLQkJY250bCB8PSBDVVJTT1JfTU9ERV8yNTZfQVJHQl9BWDsKKwkJ Y250bCB8PSBNQ1VSU09SX01PREVfMjU2X0FSR0JfQVg7CiAJCWJyZWFrOwogCWRlZmF1bHQ6CiAJ CU1JU1NJTkdfQ0FTRShwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3cpOwpAQCAtOTU3MCw3ICs5NTcw LDcgQEAgc3RhdGljIHUzMiBpOXh4X2N1cnNvcl9jdGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUsCiAJfQogCiAJaWYgKHBsYW5lX3N0YXRlLT5iYXNlLnJvdGF0aW9u ICYgRFJNX01PREVfUk9UQVRFXzE4MCkKLQkJY250bCB8PSBDVVJTT1JfUk9UQVRFXzE4MDsKKwkJ Y250bCB8PSBNQ1VSU09SX1JPVEFURV8xODA7CiAKIAlyZXR1cm4gY250bDsKIH0KQEAgLTk3NTEs NyArOTc1MSw3IEBAIHN0YXRpYyBib29sIGk5eHhfY3Vyc29yX2dldF9od19zdGF0ZShzdHJ1Y3Qg aW50ZWxfcGxhbmUgKnBsYW5lLAogCiAJdmFsID0gSTkxNV9SRUFEKENVUkNOVFIocGxhbmUtPnBp cGUpKTsKIAotCXJldCA9IHZhbCAmIENVUlNPUl9NT0RFOworCXJldCA9IHZhbCAmIE1DVVJTT1Jf TU9ERTsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUgfHwgSVNfRzRYKGRldl9wcml2 KSkKIAkJKnBpcGUgPSBwbGFuZS0+cGlwZTsKQEAgLTE0NzY4LDggKzE0NzY4LDggQEAgdm9pZCBp ODMwX2Rpc2FibGVfcGlwZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0g cGlwZSBwaXBlKQogCVdBUk5fT04oSTkxNV9SRUFEKERTUENOVFIoUExBTkVfQSkpICYgRElTUExB WV9QTEFORV9FTkFCTEUpOwogCVdBUk5fT04oSTkxNV9SRUFEKERTUENOVFIoUExBTkVfQikpICYg RElTUExBWV9QTEFORV9FTkFCTEUpOwogCVdBUk5fT04oSTkxNV9SRUFEKERTUENOVFIoUExBTkVf QykpICYgRElTUExBWV9QTEFORV9FTkFCTEUpOwotCVdBUk5fT04oSTkxNV9SRUFEKENVUkNOVFIo UElQRV9BKSkgJiBDVVJTT1JfTU9ERSk7Ci0JV0FSTl9PTihJOTE1X1JFQUQoQ1VSQ05UUihQSVBF X0IpKSAmIENVUlNPUl9NT0RFKTsKKwlXQVJOX09OKEk5MTVfUkVBRChDVVJDTlRSKFBJUEVfQSkp ICYgTUNVUlNPUl9NT0RFKTsKKwlXQVJOX09OKEk5MTVfUkVBRChDVVJDTlRSKFBJUEVfQikpICYg TUNVUlNPUl9NT0RFKTsKIAogCUk5MTVfV1JJVEUoUElQRUNPTkYocGlwZSksIDApOwogCVBPU1RJ TkdfUkVBRChQSVBFQ09ORihwaXBlKSk7Ci0tIAoyLjEzLjYKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=