From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 14/15] drm/i915: Clean up rotation DSPCNTR/DVSCNTR/etc. setup Date: Fri, 22 Jul 2016 16:43:15 +0300 Message-ID: <1469194996-1899-15-git-send-email-ville.syrjala@linux.intel.com> References: <1469194996-1899-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: <1469194996-1899-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 a2luZwpjb2RlIG9uY2Ugd2UgYWRkIHJlZmxlY3Rpb24gc3VwcG9ydCBmb3IgQ0hWLgoKU2lnbmVk LW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K UmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZp ZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI4ICsrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j ICB8IDI4ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjkg aW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDVmMzYwNDBlYjk2Yi4uNWM2MTJhMGRmZmIzIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yNjc0LDYgKzI2NzQsOSBAQCBzdGF0aWMgdm9pZCBpOXh4 X3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJICAgIG9i ai0+dGlsaW5nX21vZGUgIT0gSTkxNV9USUxJTkdfTk9ORSkKIAkJZHNwY250ciB8PSBESVNQUExB TkVfVElMRUQ7CiAKKwlpZiAocm90YXRpb24gJiBCSVQoRFJNX1JPVEFURV8xODApKQorCQlkc3Bj bnRyIHw9IERJU1BQTEFORV9ST1RBVEVfMTgwOworCiAJaWYgKElTX0c0WChkZXYpKQogCQlkc3Bj bnRyIHw9IERJU1BQTEFORV9UUklDS0xFX0ZFRURfRElTQUJMRTsKIApAQCAtMjY4OSw4ICsyNjky LDYgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwcmltYXJ5LAogCX0KIAogCWlmIChyb3RhdGlvbiAmIEJJVChEUk1fUk9UQVRFXzE4MCkp IHsKLQkJZHNwY250ciB8PSBESVNQUExBTkVfUk9UQVRFXzE4MDsKLQogCQl4ICs9IChjcnRjX3N0 YXRlLT5waXBlX3NyY193IC0gMSk7CiAJCXkgKz0gKGNydGNfc3RhdGUtPnBpcGVfc3JjX2ggLSAx KTsKIApAQCAtMjc4Myw2ICsyNzg0LDkgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3By aW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAlpZiAob2JqLT50aWxpbmdf bW9kZSAhPSBJOTE1X1RJTElOR19OT05FKQogCQlkc3BjbnRyIHw9IERJU1BQTEFORV9USUxFRDsK IAorCWlmIChyb3RhdGlvbiAmIEJJVChEUk1fUk9UQVRFXzE4MCkpCisJCWRzcGNudHIgfD0gRElT UFBMQU5FX1JPVEFURV8xODA7CisKIAlpZiAoIUlTX0hBU1dFTEwoZGV2KSAmJiAhSVNfQlJPQURX RUxMKGRldikpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1RSSUNLTEVfRkVFRF9ESVNBQkxFOwog CkBAIC0yNzkyLDE5ICsyNzk2LDE1IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0ZV9wcmlt YXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJCQkJCSAgZmItPnBpdGNoZXNb MF0sIHJvdGF0aW9uKTsKIAlsaW5lYXJfb2Zmc2V0IC09IGludGVsX2NydGMtPmRzcGFkZHJfb2Zm c2V0OwogCi0JaWYgKHJvdGF0aW9uICYgQklUKERSTV9ST1RBVEVfMTgwKSkgewotCQlkc3BjbnRy IHw9IERJU1BQTEFORV9ST1RBVEVfMTgwOwotCi0JCWlmICghSVNfSEFTV0VMTChkZXYpICYmICFJ U19CUk9BRFdFTEwoZGV2KSkgewotCQkJeCArPSAoY3J0Y19zdGF0ZS0+cGlwZV9zcmNfdyAtIDEp OwotCQkJeSArPSAoY3J0Y19zdGF0ZS0+cGlwZV9zcmNfaCAtIDEpOworCS8qIEhTVyBhbmQgQkRX IGRvZXMgdGhpcyBhdXRvbWFnaWNhbGx5IGluIGhhcmR3YXJlICovCisJaWYgKCFJU19IQVNXRUxM KGRldikgJiYgIUlTX0JST0FEV0VMTChkZXYpICYmCisJICAgIHJvdGF0aW9uICYgQklUKERSTV9S T1RBVEVfMTgwKSkgeworCQl4ICs9IChjcnRjX3N0YXRlLT5waXBlX3NyY193IC0gMSk7CisJCXkg Kz0gKGNydGNfc3RhdGUtPnBpcGVfc3JjX2ggLSAxKTsKIAotCQkJLyogRmluZGluZyB0aGUgbGFz dCBwaXhlbCBvZiB0aGUgbGFzdCBsaW5lIG9mIHRoZSBkaXNwbGF5Ci0JCQlkYXRhIGFuZCBhZGRp bmcgdG8gbGluZWFyX29mZnNldCovCi0JCQlsaW5lYXJfb2Zmc2V0ICs9Ci0JCQkJKGNydGNfc3Rh dGUtPnBpcGVfc3JjX2ggLSAxKSAqIGZiLT5waXRjaGVzWzBdICsKLQkJCQkoY3J0Y19zdGF0ZS0+ cGlwZV9zcmNfdyAtIDEpICogY3BwOwotCQl9CisJCWxpbmVhcl9vZmZzZXQgKz0KKwkJCShjcnRj X3N0YXRlLT5waXBlX3NyY19oIC0gMSkgKiBmYi0+cGl0Y2hlc1swXSArCisJCQkoY3J0Y19zdGF0 ZS0+cGlwZV9zcmNfdyAtIDEpICogY3BwOwogCX0KIAogCWludGVsX2NydGMtPmFkanVzdGVkX3gg PSB4OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBjY2I4OTRmMzk0MjUuLmYy NjU5NGUyZTg1MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTQzMyw2ICs0 MzMsOSBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwKIAlpZiAo b2JqLT50aWxpbmdfbW9kZSAhPSBJOTE1X1RJTElOR19OT05FKQogCQlzcHJjdGwgfD0gU1BfVElM RUQ7CiAKKwlpZiAocm90YXRpb24gJiBCSVQoRFJNX1JPVEFURV8xODApKQorCQlzcHJjdGwgfD0g U1BfUk9UQVRFXzE4MDsKKwogCS8qIFNpemVzIGFyZSAwIGJhc2VkICovCiAJc3JjX3ctLTsKIAlz cmNfaC0tOwpAQCAtNDQ1LDggKzQ0OCw2IEBAIHZsdl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9w bGFuZSAqZHBsYW5lLAogCWxpbmVhcl9vZmZzZXQgLT0gc3Byc3VyZl9vZmZzZXQ7CiAKIAlpZiAo cm90YXRpb24gJiBCSVQoRFJNX1JPVEFURV8xODApKSB7Ci0JCXNwcmN0bCB8PSBTUF9ST1RBVEVf MTgwOwotCiAJCXggKz0gc3JjX3c7CiAJCXkgKz0gc3JjX2g7CiAJCWxpbmVhcl9vZmZzZXQgKz0g c3JjX2ggKiBmYi0+cGl0Y2hlc1swXSArIHNyY193ICogY3BwOwpAQCAtNTU1LDYgKzU1Niw5IEBA IGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJaWYgKG9iai0+dGls aW5nX21vZGUgIT0gSTkxNV9USUxJTkdfTk9ORSkKIAkJc3ByY3RsIHw9IFNQUklURV9USUxFRDsK IAorCWlmIChyb3RhdGlvbiAmIEJJVChEUk1fUk9UQVRFXzE4MCkpCisJCXNwcmN0bCB8PSBTUFJJ VEVfUk9UQVRFXzE4MDsKKwogCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRl dikpCiAJCXNwcmN0bCAmPSB+U1BSSVRFX1RSSUNLTEVfRkVFRF9ESVNBQkxFOwogCWVsc2UKQEAg LTU3NywxNSArNTgxLDEyIEBAIGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsCiAJCQkJCQkgICBmYi0+cGl0Y2hlc1swXSwgcm90YXRpb24pOwogCWxpbmVhcl9vZmZzZXQg LT0gc3Byc3VyZl9vZmZzZXQ7CiAKLQlpZiAocm90YXRpb24gJiBCSVQoRFJNX1JPVEFURV8xODAp KSB7Ci0JCXNwcmN0bCB8PSBTUFJJVEVfUk9UQVRFXzE4MDsKLQotCQkvKiBIU1cgYW5kIEJEVyBk b2VzIHRoaXMgYXV0b21hZ2ljYWxseSBpbiBoYXJkd2FyZSAqLwotCQlpZiAoIUlTX0hBU1dFTEwo ZGV2KSAmJiAhSVNfQlJPQURXRUxMKGRldikpIHsKLQkJCXggKz0gc3JjX3c7Ci0JCQl5ICs9IHNy Y19oOwotCQkJbGluZWFyX29mZnNldCArPSBzcmNfaCAqIGZiLT5waXRjaGVzWzBdICsgc3JjX3cg KiBjcHA7Ci0JCX0KKwkvKiBIU1cgYW5kIEJEVyBkb2VzIHRoaXMgYXV0b21hZ2ljYWxseSBpbiBo YXJkd2FyZSAqLworCWlmICghSVNfSEFTV0VMTChkZXYpICYmICFJU19CUk9BRFdFTEwoZGV2KSAm JgorCSAgICByb3RhdGlvbiAmIEJJVChEUk1fUk9UQVRFXzE4MCkpIHsKKwkJeCArPSBzcmNfdzsK KwkJeSArPSBzcmNfaDsKKwkJbGluZWFyX29mZnNldCArPSBzcmNfaCAqIGZiLT5waXRjaGVzWzBd ICsgc3JjX3cgKiBjcHA7CiAJfQogCiAJaWYgKGtleS0+ZmxhZ3MpIHsKQEAgLTY5Niw2ICs2OTcs OSBAQCBpbGtfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWlmIChvYmot PnRpbGluZ19tb2RlICE9IEk5MTVfVElMSU5HX05PTkUpCiAJCWR2c2NudHIgfD0gRFZTX1RJTEVE OwogCisJaWYgKHJvdGF0aW9uICYgQklUKERSTV9ST1RBVEVfMTgwKSkKKwkJZHZzY250ciB8PSBE VlNfUk9UQVRFXzE4MDsKKwogCWlmIChJU19HRU42KGRldikpCiAJCWR2c2NudHIgfD0gRFZTX1RS SUNLTEVfRkVFRF9ESVNBQkxFOyAvKiBtdXN0IGRpc2FibGUgKi8KIApAQCAtNzE1LDggKzcxOSw2 IEBAIGlsa191cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJbGluZWFyX29m ZnNldCAtPSBkdnNzdXJmX29mZnNldDsKIAogCWlmIChyb3RhdGlvbiAmIEJJVChEUk1fUk9UQVRF XzE4MCkpIHsKLQkJZHZzY250ciB8PSBEVlNfUk9UQVRFXzE4MDsKLQogCQl4ICs9IHNyY193Owog CQl5ICs9IHNyY19oOwogCQlsaW5lYXJfb2Zmc2V0ICs9IHNyY19oICogZmItPnBpdGNoZXNbMF0g KyBzcmNfdyAqIGNwcDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK