From: Imre Deak Subject: [PATCH] drm/i915: Make CHICKEN_TRANS reg not depend on enum value Date: Mon, 19 Nov 2018 18:33:26 +0200 Message-ID: <20181119163326.23743-1-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 486BE6E116 for ; Mon, 19 Nov 2018 16:33:29 +0000 (UTC) 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 Cc: Lucas De Marchi List-Id: intel-gfx@lists.freedesktop.org RGVwZW5kaW5nIG9uIHRoZSB0cmFuc2NvZGVyIGVudW0gdmFsdWVzIHRvIHRyYW5zbGF0ZSBmcm9t IHRyYW5zY29kZXIgdG8gdGhlCmNvcnJlc3BvbmRpbmcgQ0hJQ0tFTl9UUkFOUyByZWdpc3RlciBj YW4gZWFzaWx5IGJyZWFrIGlmIHdlIGFkZCBhIG5ldwp0cmFuc2NvZGVyLiBBZGQgYW4gZXhwbGlj aXQgbWFwcGluZyBpbnN0ZWFkLCBieSB1c2luZyBoZWxwZXJzIHRvIGxvb2sgdXAgdGhlCnJlZ2lz dGVyIGluc3RhbmNlIGVpdGhlciBieSB0cmFuc2NvZGVyIG9yIHBvcnQgKHNpbmNlIHVuY29udmVu aWVudGx5IHRoZQpyZWdpc3RlcnMgaGF2ZSBib3RoIHBvcnQgYW5kIHRyYW5zY29kZXIgc3BlY2lm aWMgYml0cykuCgpXaGlsZSBhdCBpdCBhbHNvIGNoZWNrIGZvciB0aGUgY29ycmVjdG5lc3Mgb2Yg R0VOLCBwb3J0LCB0cmFuc2NvZGVyLiBJIHdhc24ndApzdXJlIGlmIHBzcjJfZW5hYmxlZCBjYW4g b25seSBiZSBzZXQgZm9yIEdFTjkrLCBidXQgdGhhdCBzZWVtcyB0byBiZSB0aGUgY2FzZQppbmRl ZWQgKHNlZSBzZXR0aW5nIG9mIHNpbmtfcHNyMl9zdXBwb3J0IGluIGludGVsX3Bzcl9pbml0X2Rw Y2QoKSkuCgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KQ2M6IEx1Y2FzIERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPgpDYzogTWlr YSBLYWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFr IDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmggIHwgIDcgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyB8IDUzICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5j IHwgIDYgKysrLS0KIDQgZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggMjViMDY5MTc1YzJhLi4xYmVlZDM5 ZGUzMDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNzM5OSw5ICs3Mzk5LDEwIEBAIGVu dW0gewogI2RlZmluZSAgQkRXX0RQUlNfTUFTS19WQkxBTktfU1JECSgxIDw8IDApCiAjZGVmaW5l IENISUNLRU5fUElQRVNMXzEocGlwZSkgX01NSU9fUElQRShwaXBlLCBfQ0hJQ0tFTl9QSVBFU0xf MV9BLCBfQ0hJQ0tFTl9QSVBFU0xfMV9CKQogCi0jZGVmaW5lIENISUNLRU5fVFJBTlNfQSAgICAg ICAgIDB4NDIwYzAKLSNkZWZpbmUgQ0hJQ0tFTl9UUkFOU19CICAgICAgICAgMHg0MjBjNAotI2Rl ZmluZSBDSElDS0VOX1RSQU5TKHRyYW5zKSBfTU1JT19UUkFOUyh0cmFucywgQ0hJQ0tFTl9UUkFO U19BLCBDSElDS0VOX1RSQU5TX0IpCisjZGVmaW5lIENISUNLRU5fVFJBTlNfQQkJX01NSU8oMHg0 MjBjMCkKKyNkZWZpbmUgQ0hJQ0tFTl9UUkFOU19CCQlfTU1JTygweDQyMGM0KQorI2RlZmluZSBD SElDS0VOX1RSQU5TX0MJCV9NTUlPKDB4NDIwYzgpCisjZGVmaW5lIENISUNLRU5fVFJBTlNfRURQ CV9NTUlPKDB4NDIwY2MpCiAjZGVmaW5lICBWU0NfREFUQV9TRUxfU09GVFdBUkVfQ09OVFJPTAko MSA8PCAyNSkgLyogR0xLIGFuZCBDTkwrICovCiAjZGVmaW5lICBERElfVFJBSU5JTkdfT1ZFUlJJ REVfRU5BQkxFCSgxIDw8IDE5KQogI2RlZmluZSAgRERJX1RSQUlOSU5HX09WRVJSSURFX1ZBTFVF CSgxIDw8IDE4KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYwppbmRleCAwNDA0ODNjOTYwMjkuLjEy NmU2YWFjMzM1ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTMzODAsNiArMzM4MCw0 MiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfZGRpX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyLAogCQlpbnRlbF9hdWRpb19jb2RlY19lbmFibGUoZW5jb2RlciwgY3J0Y19zdGF0 ZSwgY29ubl9zdGF0ZSk7CiB9CiAKK2k5MTVfcmVnX3QgZ2VuOV9jaGlja2VuX3RyYW5zX3JlZyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJICBlbnVtIHRyYW5zY29kZXIg dHJhbnMpCit7CisJc3RhdGljIGNvbnN0IGk5MTVfcmVnX3QgcmVnc1tdID0geworCQlbVFJBTlND T0RFUl9BXSA9IENISUNLRU5fVFJBTlNfQSwKKwkJW1RSQU5TQ09ERVJfQl0gPSBDSElDS0VOX1RS QU5TX0IsCisJCVtUUkFOU0NPREVSX0NdID0gQ0hJQ0tFTl9UUkFOU19DLAorCQlbVFJBTlNDT0RF Ul9FRFBdID0gQ0hJQ0tFTl9UUkFOU19FRFAsCisJfTsKKworCVdBUk5fT04oSU5URUxfR0VOKGRl dl9wcml2KSA8IDkpOworCisJaWYgKFdBUk5fT04odHJhbnMgPj0gQVJSQVlfU0laRShyZWdzKSB8 fCAhcmVnc1t0cmFuc10ucmVnKSkKKwkJdHJhbnMgPSBUUkFOU0NPREVSX0E7CisKKwlyZXR1cm4g cmVnc1t0cmFuc107Cit9CisKK3N0YXRpYyBpOTE1X3JlZ190CitnZW45X2NoaWNrZW5fdHJhbnNf cmVnX2J5X3BvcnQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICAg IGVudW0gcG9ydCBwb3J0KQoreworCXN0YXRpYyBjb25zdCBlbnVtIHRyYW5zY29kZXIgcG9ydF90 b190cmFuc2NvZGVyW10gPSB7CisJCVtQT1JUX0FdID0gVFJBTlNDT0RFUl9FRFAsCisJCVtQT1JU X0JdID0gVFJBTlNDT0RFUl9BLAorCQlbUE9SVF9DXSA9IFRSQU5TQ09ERVJfQiwKKwkJW1BPUlRf RF0gPSBUUkFOU0NPREVSX0MsCisJCVtQT1JUX0VdID0gVFJBTlNDT0RFUl9BLAorCX07CisKKwlp ZiAoV0FSTl9PTihwb3J0IDwgUE9SVF9BIHx8IHBvcnQgPiBQT1JUX0UpKQorCQlwb3J0ID0gUE9S VF9BOworCisJcmV0dXJuIGdlbjlfY2hpY2tlbl90cmFuc19yZWcoZGV2X3ByaXYsIHBvcnRfdG9f dHJhbnNjb2Rlcltwb3J0XSk7Cit9CisKIHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9kZGlfaGRt aShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkgIGNvbnN0IHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJCSAgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0 b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCkBAIC0zNDAzLDE3ICszNDM5LDEwIEBAIHN0YXRpYyB2b2lk IGludGVsX2VuYWJsZV9kZGlfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJ ICogdGhlIGJpdHMgYWZmZWN0IGEgc3BlY2lmaWMgRERJIHBvcnQgcmF0aGVyIHRoYW4KIAkJICog YSBzcGVjaWZpYyB0cmFuc2NvZGVyLgogCQkgKi8KLQkJc3RhdGljIGNvbnN0IGVudW0gdHJhbnNj b2RlciBwb3J0X3RvX3RyYW5zY29kZXJbXSA9IHsKLQkJCVtQT1JUX0FdID0gVFJBTlNDT0RFUl9F RFAsCi0JCQlbUE9SVF9CXSA9IFRSQU5TQ09ERVJfQSwKLQkJCVtQT1JUX0NdID0gVFJBTlNDT0RF Ul9CLAotCQkJW1BPUlRfRF0gPSBUUkFOU0NPREVSX0MsCi0JCQlbUE9SVF9FXSA9IFRSQU5TQ09E RVJfQSwKLQkJfTsKLQkJZW51bSB0cmFuc2NvZGVyIHRyYW5zY29kZXIgPSBwb3J0X3RvX3RyYW5z Y29kZXJbcG9ydF07CisJCWk5MTVfcmVnX3QgcmVnID0gZ2VuOV9jaGlja2VuX3RyYW5zX3JlZ19i eV9wb3J0KGRldl9wcml2LCBwb3J0KTsKIAkJdTMyIHZhbDsKIAotCQl2YWwgPSBJOTE1X1JFQUQo Q0hJQ0tFTl9UUkFOUyh0cmFuc2NvZGVyKSk7CisJCXZhbCA9IEk5MTVfUkVBRChyZWcpOwogCiAJ CWlmIChwb3J0ID09IFBPUlRfRSkKIAkJCXZhbCB8PSBERElFX1RSQUlOSU5HX09WRVJSSURFX0VO QUJMRSB8CkBAIC0zNDIyLDggKzM0NTEsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfZGRp X2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQl2YWwgfD0gRERJX1RSQUlO SU5HX09WRVJSSURFX0VOQUJMRSB8CiAJCQkJRERJX1RSQUlOSU5HX09WRVJSSURFX1ZBTFVFOwog Ci0JCUk5MTVfV1JJVEUoQ0hJQ0tFTl9UUkFOUyh0cmFuc2NvZGVyKSwgdmFsKTsKLQkJUE9TVElO R19SRUFEKENISUNLRU5fVFJBTlModHJhbnNjb2RlcikpOworCQlJOTE1X1dSSVRFKHJlZywgdmFs KTsKKwkJUE9TVElOR19SRUFEKHJlZyk7CiAKIAkJdWRlbGF5KDEpOwogCkBAIC0zNDM0LDcgKzM0 NjMsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfZGRpX2hkbWkoc3RydWN0IGludGVsX2Vu Y29kZXIgKmVuY29kZXIsCiAJCQl2YWwgJj0gfihERElfVFJBSU5JTkdfT1ZFUlJJREVfRU5BQkxF IHwKIAkJCQkgRERJX1RSQUlOSU5HX09WRVJSSURFX1ZBTFVFKTsKIAotCQlJOTE1X1dSSVRFKENI SUNLRU5fVFJBTlModHJhbnNjb2RlciksIHZhbCk7CisJCUk5MTVfV1JJVEUocmVnLCB2YWwpOwog CX0KIAogCS8qIEluIEhETUkvRFZJIG1vZGUsIHRoZSBwb3J0IHdpZHRoLCBhbmQgc3dpbmcvZW1w aGFzaXMgdmFsdWVzCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGY1NzViYTJhNTlkYS4u MGQwNjRiNzEwMDJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTUyNiw2ICsxNTI2 LDggQEAgdm9pZCBpY2xfc2FuaXRpemVfZW5jb2Rlcl9wbGxfbWFwcGluZyhzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqZW5jb2Rlcik7CiAKIHVuc2lnbmVkIGludCBpbnRlbF9mYl9hbGlnbl9oZWlnaHQo Y29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJCQkJICAgaW50IGNvbG9yX3BsYW5l LCB1bnNpZ25lZCBpbnQgaGVpZ2h0KTsKK2k5MTVfcmVnX3QgZ2VuOV9jaGlja2VuX3RyYW5zX3Jl ZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJICBlbnVtIHRyYW5zY29k ZXIgdHJhbnMpOwogCiAvKiBpbnRlbF9hdWRpby5jICovCiB2b2lkIGludGVsX2luaXRfYXVkaW9f aG9va3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcHNyLmMKaW5kZXggNWZkYzJmMTk2MDQ1Li5iNGQ4MTFjNjI0NzMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Bzci5jCkBAIC02MDYsNyArNjA2LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHNyX2Vu YWJsZV9zb3VyY2Uoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJaHN3X3Bzcl9zZXR1cF9h dXgoaW50ZWxfZHApOwogCiAJaWYgKGRldl9wcml2LT5wc3IucHNyMl9lbmFibGVkKSB7Ci0JCXUz MiBjaGlja2VuID0gSTkxNV9SRUFEKENISUNLRU5fVFJBTlMoY3B1X3RyYW5zY29kZXIpKTsKKwkJ aTkxNV9yZWdfdCByZWcgPSBnZW45X2NoaWNrZW5fdHJhbnNfcmVnKGRldl9wcml2LAorCQkJCQkJ CWNwdV90cmFuc2NvZGVyKTsKKwkJdTMyIGNoaWNrZW4gPSBJOTE1X1JFQUQocmVnKTsKIAogCQlp ZiAoSVNfR0VOOShkZXZfcHJpdikgJiYgIUlTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQogCQkJY2hp Y2tlbiB8PSAoUFNSMl9WU0NfRU5BQkxFX1BST0dfSEVBREVSCkBAIC02MTQsNyArNjE2LDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfcHNyX2VuYWJsZV9zb3VyY2Uoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCwKIAogCQllbHNlCiAJCQljaGlja2VuICY9IH5WU0NfREFUQV9TRUxfU09GVFdBUkVfQ09O VFJPTDsKLQkJSTkxNV9XUklURShDSElDS0VOX1RSQU5TKGNwdV90cmFuc2NvZGVyKSwgY2hpY2tl bik7CisJCUk5MTVfV1JJVEUocmVnLCBjaGlja2VuKTsKIAl9CiAKIAkvKgotLSAKMi4xMy4yCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK