From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 5/6] drm/i915: Clean up rotation DSPCNTR/DVSCNTR/etc. setup Date: Fri, 21 Oct 2016 22:22:47 +0300 Message-ID: <1477077768-4274-6-git-send-email-ville.syrjala@linux.intel.com> References: <1477077768-4274-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: <1477077768-4274-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 c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3YWFl YTdhNDRjMGEuLjUzMzQ0MmFjNzEzYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtMzA3OCw2ICszMDc4LDkgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcHJpbWFyeV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAogCSAgICBmYi0+bW9kaWZpZXJbMF0gPT0g STkxNV9GT1JNQVRfTU9EX1hfVElMRUQpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1RJTEVEOwog CisJaWYgKHJvdGF0aW9uICYgRFJNX1JPVEFURV8xODApCisJCWRzcGNudHIgfD0gRElTUFBMQU5F X1JPVEFURV8xODA7CisKIAlpZiAoSVNfRzRYKGRldl9wcml2KSkKIAkJZHNwY250ciB8PSBESVNQ UExBTkVfVFJJQ0tMRV9GRUVEX0RJU0FCTEU7CiAKQEAgLTMwODgsMTAgKzMwOTEsOCBAQCBzdGF0 aWMgdm9pZCBpOXh4X3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1h cnksCiAJCQlpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4LCAmeSwgcGxhbmVfc3RhdGUsIDAp OwogCiAJaWYgKHJvdGF0aW9uICYgRFJNX1JPVEFURV8xODApIHsKLQkJZHNwY250ciB8PSBESVNQ UExBTkVfUk9UQVRFXzE4MDsKLQotCQl4ICs9IChjcnRjX3N0YXRlLT5waXBlX3NyY193IC0gMSk7 Ci0JCXkgKz0gKGNydGNfc3RhdGUtPnBpcGVfc3JjX2ggLSAxKTsKKwkJeCArPSBjcnRjX3N0YXRl LT5waXBlX3NyY193IC0gMTsKKwkJeSArPSBjcnRjX3N0YXRlLT5waXBlX3NyY19oIC0gMTsKIAl9 CiAKIAlsaW5lYXJfb2Zmc2V0ID0gaW50ZWxfZmJfeHlfdG9fbGluZWFyKHgsIHksIHBsYW5lX3N0 YXRlLCAwKTsKQEAgLTMxODAsNiArMzE4MSw5IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0 ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJaWYgKGZiLT5tb2Rp ZmllclswXSA9PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCkKIAkJZHNwY250ciB8PSBESVNQUExB TkVfVElMRUQ7CiAKKwlpZiAocm90YXRpb24gJiBEUk1fUk9UQVRFXzE4MCkKKwkJZHNwY250ciB8 PSBESVNQUExBTkVfUk9UQVRFXzE4MDsKKwogCWlmICghSVNfSEFTV0VMTChkZXZfcHJpdikgJiYg IUlTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1RSSUNLTEVf RkVFRF9ESVNBQkxFOwogCkBAIC0zMTg4LDEzICszMTkyLDExIEBAIHN0YXRpYyB2b2lkIGlyb25s YWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJaW50 ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQgPQogCQlpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KCZ4 LCAmeSwgcGxhbmVfc3RhdGUsIDApOwogCi0JaWYgKHJvdGF0aW9uICYgRFJNX1JPVEFURV8xODAp IHsKLQkJZHNwY250ciB8PSBESVNQUExBTkVfUk9UQVRFXzE4MDsKLQotCQlpZiAoIUlTX0hBU1dF TEwoZGV2X3ByaXYpICYmICFJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7Ci0JCQl4ICs9IChjcnRj X3N0YXRlLT5waXBlX3NyY193IC0gMSk7Ci0JCQl5ICs9IChjcnRjX3N0YXRlLT5waXBlX3NyY19o IC0gMSk7Ci0JCX0KKwkvKiBIU1crIGRvZXMgdGhpcyBhdXRvbWFnaWNhbGx5IGluIGhhcmR3YXJl ICovCisJaWYgKCFJU19IQVNXRUxMKGRldl9wcml2KSAmJiAhSVNfQlJPQURXRUxMKGRldl9wcml2 KSAmJgorCSAgICByb3RhdGlvbiAmIERSTV9ST1RBVEVfMTgwKSB7CisJCXggKz0gY3J0Y19zdGF0 ZS0+cGlwZV9zcmNfdyAtIDE7CisJCXkgKz0gY3J0Y19zdGF0ZS0+cGlwZV9zcmNfaCAtIDE7CiAJ fQogCiAJbGluZWFyX29mZnNldCA9IGludGVsX2ZiX3h5X3RvX2xpbmVhcih4LCB5LCBwbGFuZV9z dGF0ZSwgMCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDM4MjFjZjJhODIw OS4uOWUwMDI4MTFlNjk3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtNDI3 LDYgKzQyNyw5IEBAIHZsdl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLAog CWlmIChmYi0+bW9kaWZpZXJbMF0gPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQpCiAJCXNwcmN0 bCB8PSBTUF9USUxFRDsKIAorCWlmIChyb3RhdGlvbiAmIERSTV9ST1RBVEVfMTgwKQorCQlzcHJj dGwgfD0gU1BfUk9UQVRFXzE4MDsKKwogCS8qIFNpemVzIGFyZSAwIGJhc2VkICovCiAJc3JjX3ct LTsKIAlzcmNfaC0tOwpAQCAtNDM3LDggKzQ0MCw2IEBAIHZsdl91cGRhdGVfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqZHBsYW5lLAogCXNwcnN1cmZfb2Zmc2V0ID0gaW50ZWxfY29tcHV0ZV90aWxl X29mZnNldCgmeCwgJnksIHBsYW5lX3N0YXRlLCAwKTsKIAogCWlmIChyb3RhdGlvbiAmIERSTV9S T1RBVEVfMTgwKSB7Ci0JCXNwcmN0bCB8PSBTUF9ST1RBVEVfMTgwOwotCiAJCXggKz0gc3JjX3c7 CiAJCXkgKz0gc3JjX2g7CiAJfQpAQCAtNTQ2LDYgKzU0Nyw5IEBAIGl2Yl91cGRhdGVfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaWYgKGZiLT5tb2RpZmllclswXSA9PSBJOTE1X0ZP Uk1BVF9NT0RfWF9USUxFRCkKIAkJc3ByY3RsIHw9IFNQUklURV9USUxFRDsKIAorCWlmIChyb3Rh dGlvbiAmIERSTV9ST1RBVEVfMTgwKQorCQlzcHJjdGwgfD0gU1BSSVRFX1JPVEFURV8xODA7CisK IAlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJ c3ByY3RsICY9IH5TUFJJVEVfVFJJQ0tMRV9GRUVEX0RJU0FCTEU7CiAJZWxzZQpAQCAtNTY2LDE0 ICs1NzAsMTEgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlp bnRlbF9hZGRfZmJfb2Zmc2V0cygmeCwgJnksIHBsYW5lX3N0YXRlLCAwKTsKIAlzcHJzdXJmX29m ZnNldCA9IGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoJngsICZ5LCBwbGFuZV9zdGF0ZSwgMCk7 CiAKLQlpZiAocm90YXRpb24gJiBEUk1fUk9UQVRFXzE4MCkgewotCQlzcHJjdGwgfD0gU1BSSVRF X1JPVEFURV8xODA7Ci0KLQkJLyogSFNXIGFuZCBCRFcgZG9lcyB0aGlzIGF1dG9tYWdpY2FsbHkg aW4gaGFyZHdhcmUgKi8KLQkJaWYgKCFJU19IQVNXRUxMKGRldl9wcml2KSAmJiAhSVNfQlJPQURX RUxMKGRldl9wcml2KSkgewotCQkJeCArPSBzcmNfdzsKLQkJCXkgKz0gc3JjX2g7Ci0JCX0KKwkv KiBIU1crIGRvZXMgdGhpcyBhdXRvbWFnaWNhbGx5IGluIGhhcmR3YXJlICovCisJaWYgKCFJU19I QVNXRUxMKGRldl9wcml2KSAmJiAhSVNfQlJPQURXRUxMKGRldl9wcml2KSAmJgorCSAgICByb3Rh dGlvbiAmIERSTV9ST1RBVEVfMTgwKSB7CisJCXggKz0gc3JjX3c7CisJCXkgKz0gc3JjX2g7CiAJ fQogCiAJbGluZWFyX29mZnNldCA9IGludGVsX2ZiX3h5X3RvX2xpbmVhcih4LCB5LCBwbGFuZV9z dGF0ZSwgMCk7CkBAIC02ODQsNiArNjg1LDkgQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKIAlpZiAoZmItPm1vZGlmaWVyWzBdID09IEk5MTVfRk9STUFUX01PRF9Y X1RJTEVEKQogCQlkdnNjbnRyIHw9IERWU19USUxFRDsKIAorCWlmIChyb3RhdGlvbiAmIERSTV9S T1RBVEVfMTgwKQorCQlkdnNjbnRyIHw9IERWU19ST1RBVEVfMTgwOworCiAJaWYgKElTX0dFTjYo ZGV2X3ByaXYpKQogCQlkdnNjbnRyIHw9IERWU19UUklDS0xFX0ZFRURfRElTQUJMRTsgLyogbXVz dCBkaXNhYmxlICovCiAKQEAgLTcwMSw4ICs3MDUsNiBAQCBpbGtfdXBkYXRlX3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCWR2c3N1cmZfb2Zmc2V0ID0gaW50ZWxfY29tcHV0ZV90aWxl X29mZnNldCgmeCwgJnksIHBsYW5lX3N0YXRlLCAwKTsKIAogCWlmIChyb3RhdGlvbiAmIERSTV9S T1RBVEVfMTgwKSB7Ci0JCWR2c2NudHIgfD0gRFZTX1JPVEFURV8xODA7Ci0KIAkJeCArPSBzcmNf dzsKIAkJeSArPSBzcmNfaDsKIAl9Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==