From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 4/7] drm/i915: Clean up cursor defines Date: Tue, 30 Jan 2018 22:38:04 +0200 Message-ID: <20180130203807.13721-4-ville.syrjala@linux.intel.com> References: <20180130203807.13721-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3EBD46EB23 for ; Tue, 30 Jan 2018 20:38:19 +0000 (UTC) In-Reply-To: <20180130203807.13721-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSBNQ1VSU09SXyBpbnN0ZWFkIG9mIENVUlNPUl8gYXMgdGhlIHByZWZpeCBmb3IgdGhlIG5vbi04 NDUvODY1CmN1cnNvciBkZWZpbmVzIGNvbnNpc3RlbnRseSwgYW5kIG1vdmUgdGhlIHBpcGUgQ1ND IGVuYWJsZSBiaXQgbmV4dAp0byB0aGUgb3RoZXIgbm9uLTg0NS84NjUgY3Vyc29yIGRlZmluZXMu CgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgICB8IDIyICsr KysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyB8IDE2ICsrKysrKysrLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygr KSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggZWJiNDFmMjc5 MTM0Li5kYmNiNGRlOTJhNjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNTg5MSw3ICs1 ODkxLDYgQEAgZW51bSB7CiAjZGVmaW5lICAgQ1VSU09SX0dBTU1BX0VOQUJMRQkweDQwMDAwMDAw CiAjZGVmaW5lICAgQ1VSU09SX1NUUklERV9TSElGVAkyOAogI2RlZmluZSAgIENVUlNPUl9TVFJJ REUoeCkJKChmZnMoeCktOSkgPDwgQ1VSU09SX1NUUklERV9TSElGVCkgLyogMjU2LDUxMiwxaywy ayAqLwotI2RlZmluZSAgIENVUlNPUl9QSVBFX0NTQ19FTkFCTEUgKDE8PDI0KQogI2RlZmluZSAg IENVUlNPUl9GT1JNQVRfU0hJRlQJMjQKICNkZWZpbmUgICBDVVJTT1JfRk9STUFUX01BU0sJKDB4 MDcgPDwgQ1VSU09SX0ZPUk1BVF9TSElGVCkKICNkZWZpbmUgICBDVVJTT1JfRk9STUFUXzJDCSgw eDAwIDw8IENVUlNPUl9GT1JNQVRfU0hJRlQpCkBAIC01OTAwLDIwICs1ODk5LDIxIEBAIGVudW0g ewogI2RlZmluZSAgIENVUlNPUl9GT1JNQVRfQVJHQgkoMHgwNCA8PCBDVVJTT1JfRk9STUFUX1NI SUZUKQogI2RlZmluZSAgIENVUlNPUl9GT1JNQVRfWFJHQgkoMHgwNSA8PCBDVVJTT1JfRk9STUFU X1NISUZUKQogLyogTmV3IHN0eWxlIENVUipDTlRSIGZsYWdzICovCi0jZGVmaW5lICAgQ1VSU09S X01PREUJCTB4MjcKLSNkZWZpbmUgICBDVVJTT1JfTU9ERV9ESVNBQkxFICAgMHgwMAotI2RlZmlu ZSAgIENVUlNPUl9NT0RFXzEyOF8zMkJfQVggMHgwMgotI2RlZmluZSAgIENVUlNPUl9NT0RFXzI1 Nl8zMkJfQVggMHgwMwotI2RlZmluZSAgIENVUlNPUl9NT0RFXzY0XzMyQl9BWCAweDA3Ci0jZGVm aW5lICAgQ1VSU09SX01PREVfMTI4X0FSR0JfQVggKCgxIDw8IDUpIHwgQ1VSU09SX01PREVfMTI4 XzMyQl9BWCkKLSNkZWZpbmUgICBDVVJTT1JfTU9ERV8yNTZfQVJHQl9BWCAoKDEgPDwgNSkgfCBD VVJTT1JfTU9ERV8yNTZfMzJCX0FYKQotI2RlZmluZSAgIENVUlNPUl9NT0RFXzY0X0FSR0JfQVgg KCgxIDw8IDUpIHwgQ1VSU09SX01PREVfNjRfMzJCX0FYKQorI2RlZmluZSAgIE1DVVJTT1JfTU9E RQkJMHgyNworI2RlZmluZSAgIE1DVVJTT1JfTU9ERV9ESVNBQkxFICAgMHgwMAorI2RlZmluZSAg IE1DVVJTT1JfTU9ERV8xMjhfMzJCX0FYIDB4MDIKKyNkZWZpbmUgICBNQ1VSU09SX01PREVfMjU2 XzMyQl9BWCAweDAzCisjZGVmaW5lICAgTUNVUlNPUl9NT0RFXzY0XzMyQl9BWCAweDA3CisjZGVm aW5lICAgTUNVUlNPUl9NT0RFXzEyOF9BUkdCX0FYICgoMSA8PCA1KSB8IE1DVVJTT1JfTU9ERV8x MjhfMzJCX0FYKQorI2RlZmluZSAgIE1DVVJTT1JfTU9ERV8yNTZfQVJHQl9BWCAoKDEgPDwgNSkg fCBNQ1VSU09SX01PREVfMjU2XzMyQl9BWCkKKyNkZWZpbmUgICBNQ1VSU09SX01PREVfNjRfQVJH Ql9BWCAoKDEgPDwgNSkgfCBNQ1VSU09SX01PREVfNjRfMzJCX0FYKQogI2RlZmluZSAgIE1DVVJT T1JfUElQRV9TRUxFQ1RfTUFTSwkoMHgzIDw8IDI4KQogI2RlZmluZSAgIE1DVVJTT1JfUElQRV9T RUxFQ1RfU0hJRlQJMjgKICNkZWZpbmUgICBNQ1VSU09SX1BJUEVfU0VMRUNUKHBpcGUpCSgocGlw ZSkgPDwgMjgpCiAjZGVmaW5lICAgTUNVUlNPUl9HQU1NQV9FTkFCTEUgICgxIDw8IDI2KQotI2Rl ZmluZSAgIENVUlNPUl9ST1RBVEVfMTgwCSgxPDwxNSkKLSNkZWZpbmUgICBDVVJTT1JfVFJJQ0tM RV9GRUVEX0RJU0FCTEUJKDEgPDwgMTQpCisjZGVmaW5lICAgTUNVUlNPUl9QSVBFX0NTQ19FTkFC TEUgKDE8PDI0KQorI2RlZmluZSAgIE1DVVJTT1JfUk9UQVRFXzE4MAkoMTw8MTUpCisjZGVmaW5l ICAgTUNVUlNPUl9UUklDS0xFX0ZFRURfRElTQUJMRQkoMSA8PCAxNCkKICNkZWZpbmUgX0NVUkFC QVNFCQkweDcwMDg0CiAjZGVmaW5lIF9DVVJBUE9TCQkweDcwMDg4CiAjZGVmaW5lICAgQ1VSU09S X1BPU19NQVNLICAgICAgIDB4MDA3RkYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpp bmRleCBmZWFlNmJkNTFhNDQuLjBjZjAyZjIyNmZkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwpAQCAtOTU0OSwyMCArOTU0OSwyMCBAQCBzdGF0aWMgdTMyIGk5eHhfY3Vyc29y X2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAljbnRsID0g TUNVUlNPUl9HQU1NQV9FTkFCTEU7CiAKIAlpZiAoSEFTX0RESShkZXZfcHJpdikpCi0JCWNudGwg fD0gQ1VSU09SX1BJUEVfQ1NDX0VOQUJMRTsKKwkJY250bCB8PSBNQ1VSU09SX1BJUEVfQ1NDX0VO QUJMRTsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNSAmJiAhSVNfRzRYKGRldl9wcml2 KSkKIAkJY250bCB8PSBNQ1VSU09SX1BJUEVfU0VMRUNUKGNydGMtPnBpcGUpOwogCiAJc3dpdGNo IChwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3cpIHsKIAljYXNlIDY0OgotCQljbnRsIHw9IENVUlNP Ul9NT0RFXzY0X0FSR0JfQVg7CisJCWNudGwgfD0gTUNVUlNPUl9NT0RFXzY0X0FSR0JfQVg7CiAJ CWJyZWFrOwogCWNhc2UgMTI4OgotCQljbnRsIHw9IENVUlNPUl9NT0RFXzEyOF9BUkdCX0FYOwor CQljbnRsIHw9IE1DVVJTT1JfTU9ERV8xMjhfQVJHQl9BWDsKIAkJYnJlYWs7CiAJY2FzZSAyNTY6 Ci0JCWNudGwgfD0gQ1VSU09SX01PREVfMjU2X0FSR0JfQVg7CisJCWNudGwgfD0gTUNVUlNPUl9N T0RFXzI1Nl9BUkdCX0FYOwogCQlicmVhazsKIAlkZWZhdWx0OgogCQlNSVNTSU5HX0NBU0UocGxh bmVfc3RhdGUtPmJhc2UuY3J0Y193KTsKQEAgLTk1NzAsNyArOTU3MCw3IEBAIHN0YXRpYyB1MzIg aTl4eF9jdXJzb3JfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAogCX0KIAogCWlmIChwbGFuZV9zdGF0ZS0+YmFzZS5yb3RhdGlvbiAmIERSTV9NT0RFX1JPVEFU RV8xODApCi0JCWNudGwgfD0gQ1VSU09SX1JPVEFURV8xODA7CisJCWNudGwgfD0gTUNVUlNPUl9S T1RBVEVfMTgwOwogCiAJcmV0dXJuIGNudGw7CiB9CkBAIC05NzUxLDcgKzk3NTEsNyBAQCBzdGF0 aWMgYm9vbCBpOXh4X2N1cnNvcl9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX3BsYW5lICpwbGFu ZSwKIAogCXZhbCA9IEk5MTVfUkVBRChDVVJDTlRSKHBsYW5lLT5waXBlKSk7CiAKLQlyZXQgPSB2 YWwgJiBDVVJTT1JfTU9ERTsKKwlyZXQgPSB2YWwgJiBNQ1VSU09SX01PREU7CiAKIAlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA+PSA1IHx8IElTX0c0WChkZXZfcHJpdikpCiAJCSpwaXBlID0gcGxh bmUtPnBpcGU7CkBAIC0xNDc2OCw4ICsxNDc2OCw4IEBAIHZvaWQgaTgzMF9kaXNhYmxlX3BpcGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSkKIAlXQVJO X09OKEk5MTVfUkVBRChEU1BDTlRSKFBMQU5FX0EpKSAmIERJU1BMQVlfUExBTkVfRU5BQkxFKTsK IAlXQVJOX09OKEk5MTVfUkVBRChEU1BDTlRSKFBMQU5FX0IpKSAmIERJU1BMQVlfUExBTkVfRU5B QkxFKTsKIAlXQVJOX09OKEk5MTVfUkVBRChEU1BDTlRSKFBMQU5FX0MpKSAmIERJU1BMQVlfUExB TkVfRU5BQkxFKTsKLQlXQVJOX09OKEk5MTVfUkVBRChDVVJDTlRSKFBJUEVfQSkpICYgQ1VSU09S X01PREUpOwotCVdBUk5fT04oSTkxNV9SRUFEKENVUkNOVFIoUElQRV9CKSkgJiBDVVJTT1JfTU9E RSk7CisJV0FSTl9PTihJOTE1X1JFQUQoQ1VSQ05UUihQSVBFX0EpKSAmIE1DVVJTT1JfTU9ERSk7 CisJV0FSTl9PTihJOTE1X1JFQUQoQ1VSQ05UUihQSVBFX0IpKSAmIE1DVVJTT1JfTU9ERSk7CiAK IAlJOTE1X1dSSVRFKFBJUEVDT05GKHBpcGUpLCAwKTsKIAlQT1NUSU5HX1JFQUQoUElQRUNPTkYo cGlwZSkpOwotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK