From: ville.syrjala@linux.intel.com Subject: [PATCH 07/14] drm/i915: Extract i845_cursor_ctl() and i9xx_cursor_ctl() Date: Fri, 17 Mar 2017 23:18:01 +0200 Message-ID: <20170317211808.14693-8-ville.syrjala@linux.intel.com> References: <20170317211808.14693-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 885E66EDC8 for ; Fri, 17 Mar 2017 21:18:33 +0000 (UTC) In-Reply-To: <20170317211808.14693-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClB1 bGwgdGhlIGNvZGUgdG8gY2FsY3VsYXRlIHRoZSBjdXJzb3IgY29udHJvbCByZWdpc3RlciB2YWx1 ZSBpbnRvCnNlcGFyYXRlIGZ1bmN0aW9ucy4gQWxsb3dzIHVzIHRvIHByZS1jb21wdXRlIHRoZW0g aW4gdGhlIGZ1dHVyZS4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3ly amFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIHwgMTE5ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNzIgaW5zZXJ0aW9ucygrKSwgNDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDk5YjcyYzQyMTlhOC4uMDQwOTc4ZTcwNGYzIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC05MTYxLDcgKzkxNjEsMzMgQEAgc3Rh dGljIGJvb2wgaGFzd2VsbF9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMs CiAJcmV0dXJuIGFjdGl2ZTsKIH0KIAorc3RhdGljIHUzMiBpODQ1X2N1cnNvcl9jdGwoY29uc3Qg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKQoreworCXVuc2lnbmVkIGludCB3aWR0aCA9 IHBsYW5lX3N0YXRlLT5iYXNlLmNydGNfdzsKKwl1bnNpZ25lZCBpbnQgc3RyaWRlID0gcm91bmR1 cF9wb3dfb2ZfdHdvKHdpZHRoKSAqIDQ7CisKKwlzd2l0Y2ggKHN0cmlkZSkgeworCWRlZmF1bHQ6 CisJCVdBUk5fT05DRSgxLCAiSW52YWxpZCBjdXJzb3Igd2lkdGgvc3RyaWRlLCB3aWR0aD0ldSwg c3RyaWRlPSV1XG4iLAorCQkJICB3aWR0aCwgc3RyaWRlKTsKKwkJc3RyaWRlID0gMjU2OworCQkv KiBmYWxsdGhyb3VnaCAqLworCWNhc2UgMjU2OgorCWNhc2UgNTEyOgorCWNhc2UgMTAyNDoKKwlj YXNlIDIwNDg6CisJCWJyZWFrOworCX0KKworCXJldHVybiBDVVJTT1JfRU5BQkxFIHwKKwkJQ1VS U09SX0dBTU1BX0VOQUJMRSB8CisJCUNVUlNPUl9GT1JNQVRfQVJHQiB8CisJCUNVUlNPUl9TVFJJ REUoc3RyaWRlKTsKK30KKwogc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfY3Vyc29yKHN0cnVjdCBk cm1fY3J0YyAqY3J0YywgdTMyIGJhc2UsCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkgICAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ ZGV2OwpAQCAtOTE3MiwyNiArOTE5OCw4IEBAIHN0YXRpYyB2b2lkIGk4NDVfdXBkYXRlX2N1cnNv cihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHUzMiBiYXNlLAogCWlmIChwbGFuZV9zdGF0ZSAmJiBw bGFuZV9zdGF0ZS0+YmFzZS52aXNpYmxlKSB7CiAJCXVuc2lnbmVkIGludCB3aWR0aCA9IHBsYW5l X3N0YXRlLT5iYXNlLmNydGNfdzsKIAkJdW5zaWduZWQgaW50IGhlaWdodCA9IHBsYW5lX3N0YXRl LT5iYXNlLmNydGNfaDsKLQkJdW5zaWduZWQgaW50IHN0cmlkZSA9IHJvdW5kdXBfcG93X29mX3R3 byh3aWR0aCkgKiA0OwotCi0JCXN3aXRjaCAoc3RyaWRlKSB7Ci0JCWRlZmF1bHQ6Ci0JCQlXQVJO X09OQ0UoMSwgIkludmFsaWQgY3Vyc29yIHdpZHRoL3N0cmlkZSwgd2lkdGg9JXUsIHN0cmlkZT0l dVxuIiwKLQkJCQkgIHdpZHRoLCBzdHJpZGUpOwotCQkJc3RyaWRlID0gMjU2OwotCQkJLyogZmFs bHRocm91Z2ggKi8KLQkJY2FzZSAyNTY6Ci0JCWNhc2UgNTEyOgotCQljYXNlIDEwMjQ6Ci0JCWNh c2UgMjA0ODoKLQkJCWJyZWFrOwotCQl9Ci0KLQkJY250bCB8PSBDVVJTT1JfRU5BQkxFIHwKLQkJ CUNVUlNPUl9HQU1NQV9FTkFCTEUgfAotCQkJQ1VSU09SX0ZPUk1BVF9BUkdCIHwKLQkJCUNVUlNP Ul9TVFJJREUoc3RyaWRlKTsKIAorCQljbnRsID0gaTg0NV9jdXJzb3JfY3RsKGNydGNfc3RhdGUs IHBsYW5lX3N0YXRlKTsKIAkJc2l6ZSA9IChoZWlnaHQgPDwgMTIpIHwgd2lkdGg7CiAJfQogCkBA IC05MjI0LDcgKzkyMzIsNDUgQEAgc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfY3Vyc29yKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywgdTMyIGJhc2UsCiAJfQogfQogCitzdGF0aWMgdTMyIGk5eHhfY3Vy c29yX2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJCSAg IGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCit7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0KKwkJdG9faTkxNShwbGFuZV9zdGF0ZS0+YmFz ZS5wbGFuZS0+ZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CisJ dWludDMyX3QgY250bCA9IDA7CisKKwljbnRsID0gTUNVUlNPUl9HQU1NQV9FTkFCTEU7CisKKwlp ZiAoSEFTX0RESShkZXZfcHJpdikpCisJCWNudGwgfD0gQ1VSU09SX1BJUEVfQ1NDX0VOQUJMRTsK KworCWNudGwgfD0gcGlwZSA8PCAyODsgLyogQ29ubmVjdCB0byBjb3JyZWN0IHBpcGUgKi8KKwor CXN3aXRjaCAocGxhbmVfc3RhdGUtPmJhc2UuY3J0Y193KSB7CisJY2FzZSA2NDoKKwkJY250bCB8 PSBDVVJTT1JfTU9ERV82NF9BUkdCX0FYOworCQlicmVhazsKKwljYXNlIDEyODoKKwkJY250bCB8 PSBDVVJTT1JfTU9ERV8xMjhfQVJHQl9BWDsKKwkJYnJlYWs7CisJY2FzZSAyNTY6CisJCWNudGwg fD0gQ1VSU09SX01PREVfMjU2X0FSR0JfQVg7CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCU1JU1NJ TkdfQ0FTRShwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjX3cpOworCQlyZXR1cm4gMDsKKwl9CisKKwlp ZiAocGxhbmVfc3RhdGUtPmJhc2Uucm90YXRpb24gJiBEUk1fUk9UQVRFXzE4MCkKKwkJY250bCB8 PSBDVVJTT1JfUk9UQVRFXzE4MDsKKworCXJldHVybiBjbnRsOworfQorCiBzdGF0aWMgdm9pZCBp OXh4X3VwZGF0ZV9jdXJzb3Ioc3RydWN0IGRybV9jcnRjICpjcnRjLCB1MzIgYmFzZSwKKwkJCSAg ICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSAgICAg ICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKQogewogCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CkBAIC05MjMzLDMwICs5Mjc5LDggQEAgc3Rh dGljIHZvaWQgaTl4eF91cGRhdGVfY3Vyc29yKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgdTMyIGJh c2UsCiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXVpbnQzMl90IGNudGwgPSAwOwog Ci0JaWYgKHBsYW5lX3N0YXRlICYmIHBsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUpIHsKLQkJY250 bCA9IE1DVVJTT1JfR0FNTUFfRU5BQkxFOwotCQlzd2l0Y2ggKHBsYW5lX3N0YXRlLT5iYXNlLmNy dGNfdykgewotCQkJY2FzZSA2NDoKLQkJCQljbnRsIHw9IENVUlNPUl9NT0RFXzY0X0FSR0JfQVg7 Ci0JCQkJYnJlYWs7Ci0JCQljYXNlIDEyODoKLQkJCQljbnRsIHw9IENVUlNPUl9NT0RFXzEyOF9B UkdCX0FYOwotCQkJCWJyZWFrOwotCQkJY2FzZSAyNTY6Ci0JCQkJY250bCB8PSBDVVJTT1JfTU9E RV8yNTZfQVJHQl9BWDsKLQkJCQlicmVhazsKLQkJCWRlZmF1bHQ6Ci0JCQkJTUlTU0lOR19DQVNF KHBsYW5lX3N0YXRlLT5iYXNlLmNydGNfdyk7Ci0JCQkJcmV0dXJuOwotCQl9Ci0JCWNudGwgfD0g cGlwZSA8PCAyODsgLyogQ29ubmVjdCB0byBjb3JyZWN0IHBpcGUgKi8KLQotCQlpZiAoSEFTX0RE SShkZXZfcHJpdikpCi0JCQljbnRsIHw9IENVUlNPUl9QSVBFX0NTQ19FTkFCTEU7Ci0KLQkJaWYg KHBsYW5lX3N0YXRlLT5iYXNlLnJvdGF0aW9uICYgRFJNX1JPVEFURV8xODApCi0JCQljbnRsIHw9 IENVUlNPUl9ST1RBVEVfMTgwOwotCX0KKwlpZiAocGxhbmVfc3RhdGUgJiYgcGxhbmVfc3RhdGUt PmJhc2UudmlzaWJsZSkKKwkJY250bCA9IGk5eHhfY3Vyc29yX2N0bChjcnRjX3N0YXRlLCBwbGFu ZV9zdGF0ZSk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y3Vyc29yX2NudGwgIT0gY250bCkgewogCQlJ OTE1X1dSSVRFX0ZXKENVUkNOVFIocGlwZSksIGNudGwpOwpAQCAtOTI3Myw2ICs5Mjk3LDcgQEAg c3RhdGljIHZvaWQgaTl4eF91cGRhdGVfY3Vyc29yKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgdTMy IGJhc2UsCiAKIC8qIElmIG5vLXBhcnQgb2YgdGhlIGN1cnNvciBpcyB2aXNpYmxlIG9uIHRoZSBm cmFtZWJ1ZmZlciwgdGhlbiB0aGUgR1BVIG1heSBoYW5nLi4uICovCiBzdGF0aWMgdm9pZCBpbnRl bF9jcnRjX3VwZGF0ZV9jdXJzb3Ioc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCSAgICAgY29u c3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkJICAgICBjb25zdCBz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKQogewogCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBjcnRjLT5kZXY7CkBAIC05MzEyLDkgKzkzMzcsOSBAQCBzdGF0aWMgdm9pZCBp bnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3Ioc3RydWN0IGRybV9jcnRjICpjcnRjLAogCUk5MTVfV1JJ VEVfRlcoQ1VSUE9TKHBpcGUpLCBwb3MpOwogCiAJaWYgKElTX0k4NDVHKGRldl9wcml2KSB8fCBJ U19JODY1RyhkZXZfcHJpdikpCi0JCWk4NDVfdXBkYXRlX2N1cnNvcihjcnRjLCBiYXNlLCBwbGFu ZV9zdGF0ZSk7CisJCWk4NDVfdXBkYXRlX2N1cnNvcihjcnRjLCBiYXNlLCBjcnRjX3N0YXRlLCBw bGFuZV9zdGF0ZSk7CiAJZWxzZQotCQlpOXh4X3VwZGF0ZV9jdXJzb3IoY3J0YywgYmFzZSwgcGxh bmVfc3RhdGUpOworCQlpOXh4X3VwZGF0ZV9jdXJzb3IoY3J0YywgYmFzZSwgY3J0Y19zdGF0ZSwg cGxhbmVfc3RhdGUpOwogCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPnVuY29y ZS5sb2NrLCBpcnFmbGFncyk7CiB9CkBAIC0xMzc0NCw3ICsxMzc2OSw3IEBAIGludGVsX2Rpc2Fi bGVfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAogCWludGVsX2NydGMtPmN1 cnNvcl9hZGRyID0gMDsKLQlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0YywgTlVMTCk7CisJ aW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIE5VTEwsIE5VTEwpOwogfQogCiBzdGF0aWMg dm9pZApAQCAtMTM3NjYsNyArMTM3OTEsNyBAQCBpbnRlbF91cGRhdGVfY3Vyc29yX3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlhZGRyID0gb2JqLT5waHlzX2hhbmRsZS0+YnVzYWRk cjsKIAogCWludGVsX2NydGMtPmN1cnNvcl9hZGRyID0gYWRkcjsKLQlpbnRlbF9jcnRjX3VwZGF0 ZV9jdXJzb3IoY3J0Yywgc3RhdGUpOworCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCBj cnRjX3N0YXRlLCBzdGF0ZSk7CiB9CiAKIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfcGxhbmUgKgotLSAK Mi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK