From: ville.syrjala@linux.intel.com Subject: [PATCH v2 03/14] drm/i915: Extract i9xx_plane_ctl() and ironlake_plane_ctl() Date: Mon, 20 Mar 2017 18:47:43 +0200 Message-ID: <20170320164744.10820-1-ville.syrjala@linux.intel.com> References: <20170317211808.14693-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C9C589363 for ; Mon, 20 Mar 2017 16:47:52 +0000 (UTC) In-Reply-To: <20170317211808.14693-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClB1 bGwgdGhlIGNvZGUgdG8gY2FsY3VsYXRlIHRoZSBwcmUtU0tMIHByaW1hcnkgcGxhbmUgY29udHJv bCByZWdpc3Rlcgp2YWx1ZSBpbnRvIHNlcGFyYXRlIGZ1bmN0aW9ucy4gQWxsb3dzIHVzIHRvIHBy ZS1jb21wdXRlIGl0IGluIHRoZQpmdXR1cmUuCgp2MjogU3BsaXQgdGhlIHByZS1pbGsgdnMuIGls aysgdW5pZmljYXRpb24gdG8gYSBzZXBhcmF0ZSBwYXRjaCAoQ2hyaXMpCgpDYzogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTA0ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNjYgaW5zZXJ0aW9ucygrKSwgMzggZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDhhOWYxYmQyMWUwZS4uYmQ2 YzFjNTQ2OWU0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yOTYyLDI4 ICsyOTYyLDIzIEBAIGludCBza2xfY2hlY2tfcGxhbmVfc3VyZmFjZShzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKnBsYW5lX3N0YXRlKQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCBpOXh4 X3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCi0JCQkJICAg ICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCi0JCQkJICAgICAg Y29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3N0YXRpYyB1MzIg aTl4eF9wbGFuZV9jdGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUs CisJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7Ci0J c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwcmltYXJ5LT5kZXYp OwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0 YXRlLT5iYXNlLmNydGMpOwotCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3Rh dGUtPmJhc2UuZmI7Ci0JaW50IHBsYW5lID0gaW50ZWxfY3J0Yy0+cGxhbmU7Ci0JdTMyIGxpbmVh cl9vZmZzZXQ7Ci0JdTMyIGRzcGNudHI7Ci0JaTkxNV9yZWdfdCByZWcgPSBEU1BDTlRSKHBsYW5l KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPQorCQl0b19pOTE1KHBsYW5l X3N0YXRlLT5iYXNlLnBsYW5lLT5kZXYpOworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOworCWNvbnN0IHN0cnVjdCBkcm1fZnJh bWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7CiAJdW5zaWduZWQgaW50IHJvdGF0 aW9uID0gcGxhbmVfc3RhdGUtPmJhc2Uucm90YXRpb247Ci0JaW50IHggPSBwbGFuZV9zdGF0ZS0+ YmFzZS5zcmMueDEgPj4gMTY7Ci0JaW50IHkgPSBwbGFuZV9zdGF0ZS0+YmFzZS5zcmMueTEgPj4g MTY7Ci0JdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKKwl1MzIgZHNwY250cjsKIAotCWRzcGNudHIg PSBESVNQUExBTkVfR0FNTUFfRU5BQkxFOworCWRzcGNudHIgPSBESVNQTEFZX1BMQU5FX0VOQUJM RSB8IERJU1BQTEFORV9HQU1NQV9FTkFCTEU7CiAKLQlkc3BjbnRyIHw9IERJU1BMQVlfUExBTkVf RU5BQkxFOworCWlmIChJU19HNFgoZGV2X3ByaXYpKQorCQlkc3BjbnRyIHw9IERJU1BQTEFORV9U UklDS0xFX0ZFRURfRElTQUJMRTsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNCkgewot CQlpZiAoaW50ZWxfY3J0Yy0+cGlwZSA9PSBQSVBFX0IpCisJCWlmIChjcnRjLT5waXBlID09IFBJ UEVfQikKIAkJCWRzcGNudHIgfD0gRElTUFBMQU5FX1NFTF9QSVBFX0I7CiAJfQogCkBAIC0zMDEw LDcgKzMwMDUsOCBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKnByaW1hcnksCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1JHQlgxMDEwMTA7 CiAJCWJyZWFrOwogCWRlZmF1bHQ6Ci0JCUJVRygpOworCQlNSVNTSU5HX0NBU0UoZmItPmZvcm1h dC0+Zm9ybWF0KTsKKwkJcmV0dXJuIDA7CiAJfQogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gNCAmJgpAQCAtMzAyMyw4ICszMDE5LDI2IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3By aW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAlpZiAocm90YXRpb24gJiBE Uk1fUkVGTEVDVF9YKQogCQlkc3BjbnRyIHw9IERJU1BQTEFORV9NSVJST1I7CiAKLQlpZiAoSVNf RzRYKGRldl9wcml2KSkKLQkJZHNwY250ciB8PSBESVNQUExBTkVfVFJJQ0tMRV9GRUVEX0RJU0FC TEU7CisJcmV0dXJuIGRzcGNudHI7Cit9CisKK3N0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1h cnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKKwkJCQkgICAgICBjb25zdCBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJCQkgICAgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocHJpbWFyeS0+ZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0 YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKKwlz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5iYXNlLmZiOworCWludCBw bGFuZSA9IGludGVsX2NydGMtPnBsYW5lOworCXUzMiBsaW5lYXJfb2Zmc2V0OworCXUzMiBkc3Bj bnRyOworCWk5MTVfcmVnX3QgcmVnID0gRFNQQ05UUihwbGFuZSk7CisJdW5zaWduZWQgaW50IHJv dGF0aW9uID0gcGxhbmVfc3RhdGUtPmJhc2Uucm90YXRpb247CisJaW50IHggPSBwbGFuZV9zdGF0 ZS0+YmFzZS5zcmMueDEgPj4gMTY7CisJaW50IHkgPSBwbGFuZV9zdGF0ZS0+YmFzZS5zcmMueTEg Pj4gMTY7CisJdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKKworCWRzcGNudHIgPSBpOXh4X3BsYW5l X2N0bChjcnRjX3N0YXRlLCBwbGFuZV9zdGF0ZSk7CiAKIAlpbnRlbF9hZGRfZmJfb2Zmc2V0cygm eCwgJnksIHBsYW5lX3N0YXRlLCAwKTsKIApAQCAtMzEwNSwyNSArMzExOSwxOSBAQCBzdGF0aWMg dm9pZCBpOXh4X2Rpc2FibGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5 LAogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxh Z3MpOwogfQogCi1zdGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAotCQkJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAotCQkJCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGUpCitzdGF0aWMgdTMyIGlyb25sYWtlX3BsYW5lX2N0bChjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IHByaW1hcnktPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRldik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBw bGFuZV9zdGF0ZS0+YmFzZS5mYjsKLQlpbnQgcGxhbmUgPSBpbnRlbF9jcnRjLT5wbGFuZTsKLQl1 MzIgbGluZWFyX29mZnNldDsKLQl1MzIgZHNwY250cjsKLQlpOTE1X3JlZ190IHJlZyA9IERTUENO VFIocGxhbmUpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9CisJCXRvX2k5 MTUocGxhbmVfc3RhdGUtPmJhc2UucGxhbmUtPmRldik7CisJY29uc3Qgc3RydWN0IGRybV9mcmFt ZWJ1ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKIAl1bnNpZ25lZCBpbnQgcm90YXRp b24gPSBwbGFuZV9zdGF0ZS0+YmFzZS5yb3RhdGlvbjsKLQlpbnQgeCA9IHBsYW5lX3N0YXRlLT5i YXNlLnNyYy54MSA+PiAxNjsKLQlpbnQgeSA9IHBsYW5lX3N0YXRlLT5iYXNlLnNyYy55MSA+PiAx NjsKLQl1bnNpZ25lZCBsb25nIGlycWZsYWdzOworCXUzMiBkc3BjbnRyOwogCi0JZHNwY250ciA9 IERJU1BQTEFORV9HQU1NQV9FTkFCTEU7Ci0JZHNwY250ciB8PSBESVNQTEFZX1BMQU5FX0VOQUJM RTsKKwlkc3BjbnRyID0gRElTUExBWV9QTEFORV9FTkFCTEUgfCBESVNQUExBTkVfR0FNTUFfRU5B QkxFOworCisJaWYgKCFJU19IQVNXRUxMKGRldl9wcml2KSAmJiAhSVNfQlJPQURXRUxMKGRldl9w cml2KSkKKwkJZHNwY250ciB8PSBESVNQUExBTkVfVFJJQ0tMRV9GRUVEX0RJU0FCTEU7CiAKIAlp ZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJZHNw Y250ciB8PSBESVNQUExBTkVfUElQRV9DU0NfRU5BQkxFOwpAQCAtMzE0OCw3ICszMTU2LDggQEAg c3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFu ZSAqcHJpbWFyeSwKIAkJZHNwY250ciB8PSBESVNQUExBTkVfUkdCWDEwMTAxMDsKIAkJYnJlYWs7 CiAJZGVmYXVsdDoKLQkJQlVHKCk7CisJCU1JU1NJTkdfQ0FTRShmYi0+Zm9ybWF0LT5mb3JtYXQp OworCQlyZXR1cm4gMDsKIAl9CiAKIAlpZiAoZmItPm1vZGlmaWVyID09IEk5MTVfRk9STUFUX01P RF9YX1RJTEVEKQpAQCAtMzE1Nyw4ICszMTY2LDI3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3Vw ZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJaWYgKHJvdGF0 aW9uICYgRFJNX1JPVEFURV8xODApCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1JPVEFURV8xODA7 CiAKLQlpZiAoIUlTX0hBU1dFTEwoZGV2X3ByaXYpICYmICFJU19CUk9BRFdFTEwoZGV2X3ByaXYp KQotCQlkc3BjbnRyIHw9IERJU1BQTEFORV9UUklDS0xFX0ZFRURfRElTQUJMRTsKKwlyZXR1cm4g ZHNwY250cjsKK30KKworc3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKKwkJCQkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJCQkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKnBsYW5lX3N0YXRlKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwcmltYXJ5LT5k ZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwor CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0YXRl LT5iYXNlLmNydGMpOworCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUt PmJhc2UuZmI7CisJaW50IHBsYW5lID0gaW50ZWxfY3J0Yy0+cGxhbmU7CisJdTMyIGxpbmVhcl9v ZmZzZXQ7CisJdTMyIGRzcGNudHI7CisJaTkxNV9yZWdfdCByZWcgPSBEU1BDTlRSKHBsYW5lKTsK Kwl1bnNpZ25lZCBpbnQgcm90YXRpb24gPSBwbGFuZV9zdGF0ZS0+YmFzZS5yb3RhdGlvbjsKKwlp bnQgeCA9IHBsYW5lX3N0YXRlLT5iYXNlLnNyYy54MSA+PiAxNjsKKwlpbnQgeSA9IHBsYW5lX3N0 YXRlLT5iYXNlLnNyYy55MSA+PiAxNjsKKwl1bnNpZ25lZCBsb25nIGlycWZsYWdzOworCisJZHNw Y250ciA9IGlyb25sYWtlX3BsYW5lX2N0bChjcnRjX3N0YXRlLCBwbGFuZV9zdGF0ZSk7CiAKIAlp bnRlbF9hZGRfZmJfb2Zmc2V0cygmeCwgJnksIHBsYW5lX3N0YXRlLCAwKTsKIAotLSAKMi4xMC4y CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK