From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 14/15] drm/i915: Clean up rotation DSPCNTR/DVSCNTR/etc. setup Date: Mon, 26 Sep 2016 19:30:59 +0300 Message-ID: <1474907460-10717-15-git-send-email-ville.syrjala@linux.intel.com> References: <1474907460-10717-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1474907460-10717-1-git-send-email-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: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v dmUgdGhlIHBsYW5lIGNvbnRyb2wgcmVnaXN0ZXIgcm90YXRpb24gc2V0dXAgYXdheSBmcm9tIHRo ZQpjb29yZGluYXRlIG11bmdpbmcgY29kZS4gVGhpcyB3aWxsIHJlc3VsdCBpbiBuZWF0ZXIgbG9v a2luZwpjb2RlIG9uY2Ugd2UgYWRkIHJlZmxlY3Rpb24gc3VwcG9ydCBmb3IgQ0hWLgoKdjI6IERy b3AgdGhlIEJJVCgpLCBkcm9wIHNvbWUgdXNsZXNzIHBhcmVucywKClNpZ25lZC1vZmYtYnk6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5 OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6IEpv b25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyNCArKysrKysrKysrKysrLS0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDI2ICsrKysrKysr KysrKysrLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDIz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBiMTk1 MTZkZDk2N2MuLmM4ZmEzNWU5MjFmOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtMzA3MSw2ICszMDcxLDkgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcHJpbWFyeV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAogCSAgICBmYi0+bW9kaWZpZXJbMF0gPT0g STkxNV9GT1JNQVRfTU9EX1hfVElMRUQpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1RJTEVEOwog CisJaWYgKHJvdGF0aW9uICYgRFJNX1JPVEFURV8xODApCisJCWRzcGNudHIgfD0gRElTUFBMQU5F X1JPVEFURV8xODA7CisKIAlpZiAoSVNfRzRYKGRldikpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5F X1RSSUNLTEVfRkVFRF9ESVNBQkxFOwogCkBAIC0zMDgxLDEwICszMDg0LDggQEAgc3RhdGljIHZv aWQgaTl4eF91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAog CQkJaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldCgmeCwgJnksIHBsYW5lX3N0YXRlLCAwKTsKIAog CWlmIChyb3RhdGlvbiAmIERSTV9ST1RBVEVfMTgwKSB7Ci0JCWRzcGNudHIgfD0gRElTUFBMQU5F X1JPVEFURV8xODA7Ci0KLQkJeCArPSAoY3J0Y19zdGF0ZS0+cGlwZV9zcmNfdyAtIDEpOwotCQl5 ICs9IChjcnRjX3N0YXRlLT5waXBlX3NyY19oIC0gMSk7CisJCXggKz0gY3J0Y19zdGF0ZS0+cGlw ZV9zcmNfdyAtIDE7CisJCXkgKz0gY3J0Y19zdGF0ZS0+cGlwZV9zcmNfaCAtIDE7CiAJfQogCiAJ bGluZWFyX29mZnNldCA9IGludGVsX2ZiX3h5X3RvX2xpbmVhcih4LCB5LCBwbGFuZV9zdGF0ZSwg MCk7CkBAIC0zMTczLDYgKzMxNzQsOSBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVfcHJp bWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAogCWlmIChmYi0+bW9kaWZpZXJb MF0gPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1RJ TEVEOwogCisJaWYgKHJvdGF0aW9uICYgRFJNX1JPVEFURV8xODApCisJCWRzcGNudHIgfD0gRElT UFBMQU5FX1JPVEFURV8xODA7CisKIAlpZiAoIUlTX0hBU1dFTEwoZGV2KSAmJiAhSVNfQlJPQURX RUxMKGRldikpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1RSSUNLTEVfRkVFRF9ESVNBQkxFOwog CkBAIC0zMTgxLDEzICszMTg1LDExIEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0ZV9wcmlt YXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJaW50ZWxfY3J0Yy0+ZHNwYWRk cl9vZmZzZXQgPQogCQlpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwgcGxhbmVfc3Rh dGUsIDApOwogCi0JaWYgKHJvdGF0aW9uICYgRFJNX1JPVEFURV8xODApIHsKLQkJZHNwY250ciB8 PSBESVNQUExBTkVfUk9UQVRFXzE4MDsKLQotCQlpZiAoIUlTX0hBU1dFTEwoZGV2KSAmJiAhSVNf QlJPQURXRUxMKGRldikpIHsKLQkJCXggKz0gKGNydGNfc3RhdGUtPnBpcGVfc3JjX3cgLSAxKTsK LQkJCXkgKz0gKGNydGNfc3RhdGUtPnBpcGVfc3JjX2ggLSAxKTsKLQkJfQorCS8qIEhTVysgZG9l cyB0aGlzIGF1dG9tYWdpY2FsbHkgaW4gaGFyZHdhcmUgKi8KKwlpZiAoIUlTX0hBU1dFTEwoZGV2 X3ByaXYpICYmICFJU19CUk9BRFdFTEwoZGV2X3ByaXYpICYmCisJICAgIHJvdGF0aW9uICYgRFJN X1JPVEFURV8xODApIHsKKwkJeCArPSBjcnRjX3N0YXRlLT5waXBlX3NyY193IC0gMTsKKwkJeSAr PSBjcnRjX3N0YXRlLT5waXBlX3NyY19oIC0gMTsKIAl9CiAKIAlsaW5lYXJfb2Zmc2V0ID0gaW50 ZWxfZmJfeHlfdG9fbGluZWFyKHgsIHksIHBsYW5lX3N0YXRlLCAwKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc3ByaXRlLmMKaW5kZXggNGMwZmUzMTdkNzZlLi4zNjcwZjQ2Mjg4OGYgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC00MjMsNiArNDIzLDkgQEAgdmx2X3VwZGF0ZV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsCiAJaWYgKGZiLT5tb2RpZmllclswXSA9PSBJ OTE1X0ZPUk1BVF9NT0RfWF9USUxFRCkKIAkJc3ByY3RsIHw9IFNQX1RJTEVEOwogCisJaWYgKHJv dGF0aW9uICYgRFJNX1JPVEFURV8xODApCisJCXNwcmN0bCB8PSBTUF9ST1RBVEVfMTgwOworCiAJ LyogU2l6ZXMgYXJlIDAgYmFzZWQgKi8KIAlzcmNfdy0tOwogCXNyY19oLS07CkBAIC00MzMsOCAr NDM2LDYgQEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsCiAJc3By c3VyZl9vZmZzZXQgPSBpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwgcGxhbmVfc3Rh dGUsIDApOwogCiAJaWYgKHJvdGF0aW9uICYgRFJNX1JPVEFURV8xODApIHsKLQkJc3ByY3RsIHw9 IFNQX1JPVEFURV8xODA7Ci0KIAkJeCArPSBzcmNfdzsKIAkJeSArPSBzcmNfaDsKIAl9CkBAIC01 NDIsNiArNTQzLDkgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK IAlpZiAoZmItPm1vZGlmaWVyWzBdID09IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEKQogCQlzcHJj dGwgfD0gU1BSSVRFX1RJTEVEOwogCisJaWYgKHJvdGF0aW9uICYgRFJNX1JPVEFURV8xODApCisJ CXNwcmN0bCB8PSBTUFJJVEVfUk9UQVRFXzE4MDsKKwogCWlmIChJU19IQVNXRUxMKGRldikgfHwg SVNfQlJPQURXRUxMKGRldikpCiAJCXNwcmN0bCAmPSB+U1BSSVRFX1RSSUNLTEVfRkVFRF9ESVNB QkxFOwogCWVsc2UKQEAgLTU2MiwxNCArNTY2LDExIEBAIGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJaW50ZWxfYWRkX2ZiX29mZnNldHMoJngsICZ5LCBwbGFuZV9z dGF0ZSwgMCk7CiAJc3Byc3VyZl9vZmZzZXQgPSBpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4 LCAmeSwgcGxhbmVfc3RhdGUsIDApOwogCi0JaWYgKHJvdGF0aW9uICYgRFJNX1JPVEFURV8xODAp IHsKLQkJc3ByY3RsIHw9IFNQUklURV9ST1RBVEVfMTgwOwotCi0JCS8qIEhTVyBhbmQgQkRXIGRv ZXMgdGhpcyBhdXRvbWFnaWNhbGx5IGluIGhhcmR3YXJlICovCi0JCWlmICghSVNfSEFTV0VMTChk ZXYpICYmICFJU19CUk9BRFdFTEwoZGV2KSkgewotCQkJeCArPSBzcmNfdzsKLQkJCXkgKz0gc3Jj X2g7Ci0JCX0KKwkvKiBIU1crIGRvZXMgdGhpcyBhdXRvbWFnaWNhbGx5IGluIGhhcmR3YXJlICov CisJaWYgKCFJU19IQVNXRUxMKGRldl9wcml2KSAmJiAhSVNfQlJPQURXRUxMKGRldl9wcml2KSAm JgorCSAgICByb3RhdGlvbiAmIERSTV9ST1RBVEVfMTgwKSB7CisJCXggKz0gc3JjX3c7CisJCXkg Kz0gc3JjX2g7CiAJfQogCiAJbGluZWFyX29mZnNldCA9IGludGVsX2ZiX3h5X3RvX2xpbmVhcih4 LCB5LCBwbGFuZV9zdGF0ZSwgMCk7CkBAIC02ODAsNiArNjgxLDkgQEAgaWxrX3VwZGF0ZV9wbGFu ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpZiAoZmItPm1vZGlmaWVyWzBdID09IEk5MTVf Rk9STUFUX01PRF9YX1RJTEVEKQogCQlkdnNjbnRyIHw9IERWU19USUxFRDsKIAorCWlmIChyb3Rh dGlvbiAmIERSTV9ST1RBVEVfMTgwKQorCQlkdnNjbnRyIHw9IERWU19ST1RBVEVfMTgwOworCiAJ aWYgKElTX0dFTjYoZGV2KSkKIAkJZHZzY250ciB8PSBEVlNfVFJJQ0tMRV9GRUVEX0RJU0FCTEU7 IC8qIG11c3QgZGlzYWJsZSAqLwogCkBAIC02OTcsOCArNzAxLDYgQEAgaWxrX3VwZGF0ZV9wbGFu ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlkdnNzdXJmX29mZnNldCA9IGludGVsX2NvbXB1 dGVfdGlsZV9vZmZzZXQoJngsICZ5LCBwbGFuZV9zdGF0ZSwgMCk7CiAKIAlpZiAocm90YXRpb24g JiBEUk1fUk9UQVRFXzE4MCkgewotCQlkdnNjbnRyIHw9IERWU19ST1RBVEVfMTgwOwotCiAJCXgg Kz0gc3JjX3c7CiAJCXkgKz0gc3JjX2g7CiAJfQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=