From: Imre Deak Subject: [PATCH v2] drm/i915: Make CHICKEN_TRANS reg not depend on enum value Date: Mon, 19 Nov 2018 20:00:21 +0200 Message-ID: <20181119180021.370-1-imre.deak@intel.com> References: <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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id C2DA96E258 for ; Mon, 19 Nov 2018 18:00:28 +0000 (UTC) In-Reply-To: <20181119163326.23743-1-imre.deak@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 Cc: Lucas De Marchi List-Id: intel-gfx@lists.freedesktop.org RGVwZW5kaW5nIG9uIHRoZSB0cmFuc2NvZGVyIGVudW0gdmFsdWVzIHRvIHRyYW5zbGF0ZSBmcm9t IHRyYW5zY29kZXIgdG8KdGhlIGNvcnJlc3BvbmRpbmcgQ0hJQ0tFTl9UUkFOUyByZWdpc3RlciBj YW4gZWFzaWx5IGJyZWFrIGlmIHdlIGFkZCBhCm5ldyB0cmFuc2NvZGVyLiBBZGQgYW4gZXhwbGlj aXQgbWFwcGluZyBpbnN0ZWFkLCBieSB1c2luZyBoZWxwZXJzIHRvCmxvb2sgdXAgdGhlIHJlZ2lz dGVyIGluc3RhbmNlIGVpdGhlciBieSB0cmFuc2NvZGVyIG9yIHBvcnQgKHNpbmNlCnVuY29udmVu aWVudGx5IHRoZSByZWdpc3RlcnMgaGF2ZSBib3RoIHBvcnQgYW5kIHRyYW5zY29kZXIgc3BlY2lm aWMKYml0cykuCgpXaGlsZSBhdCBpdCBhbHNvIGNoZWNrIGZvciB0aGUgY29ycmVjdG5lc3Mgb2Yg R0VOLCBwb3J0LCB0cmFuc2NvZGVyLiBJCndhc24ndCBzdXJlIGlmIHBzcjJfZW5hYmxlZCBjYW4g b25seSBiZSBzZXQgZm9yIEdFTjkrLCBidXQgdGhhdCBzZWVtcyB0bwpiZSB0aGUgY2FzZSBpbmRl ZWQgKHNlZSBzZXR0aW5nIG9mIHNpbmtfcHNyMl9zdXBwb3J0IGluCmludGVsX3Bzcl9pbml0X2Rw Y2QoKSkuCgp2MiAoVmlsbGUpOgotIE1ha2UgZ2VuOV9jaGlja2VuX3RyYW5zX3JlZygpIGludGVy bmFsIHRvIGludGVsX3Bzci5jLgotIHMvdHJhbnMvY3B1X3RyYW5zY29kZXIvCgpDYzogVmlsbGUg U3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IEx1Y2FzIERlIE1h cmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPgpDYzogTWlrYSBLYWhvbGEgPG1pa2Eua2Fo b2xhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwu Y29tPgpSZXZpZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICB8ICA3ICsrKyst LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIHwgMzcgKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMg fCAyNSArKysrKysrKysrKysrKysrKysrKysrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDUyIGluc2Vy dGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4IDI1 YjA2OTE3NWMyYS4uMWJlZWQzOWRlMzAzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTcz OTksOSArNzM5OSwxMCBAQCBlbnVtIHsKICNkZWZpbmUgIEJEV19EUFJTX01BU0tfVkJMQU5LX1NS RAkoMSA8PCAwKQogI2RlZmluZSBDSElDS0VOX1BJUEVTTF8xKHBpcGUpIF9NTUlPX1BJUEUocGlw ZSwgX0NISUNLRU5fUElQRVNMXzFfQSwgX0NISUNLRU5fUElQRVNMXzFfQikKIAotI2RlZmluZSBD SElDS0VOX1RSQU5TX0EgICAgICAgICAweDQyMGMwCi0jZGVmaW5lIENISUNLRU5fVFJBTlNfQiAg ICAgICAgIDB4NDIwYzQKLSNkZWZpbmUgQ0hJQ0tFTl9UUkFOUyh0cmFucykgX01NSU9fVFJBTlMo dHJhbnMsIENISUNLRU5fVFJBTlNfQSwgQ0hJQ0tFTl9UUkFOU19CKQorI2RlZmluZSBDSElDS0VO X1RSQU5TX0EJCV9NTUlPKDB4NDIwYzApCisjZGVmaW5lIENISUNLRU5fVFJBTlNfQgkJX01NSU8o MHg0MjBjNCkKKyNkZWZpbmUgQ0hJQ0tFTl9UUkFOU19DCQlfTU1JTygweDQyMGM4KQorI2RlZmlu ZSBDSElDS0VOX1RSQU5TX0VEUAlfTU1JTygweDQyMGNjKQogI2RlZmluZSAgVlNDX0RBVEFfU0VM X1NPRlRXQVJFX0NPTlRST0wJKDEgPDwgMjUpIC8qIEdMSyBhbmQgQ05MKyAqLwogI2RlZmluZSAg RERJX1RSQUlOSU5HX09WRVJSSURFX0VOQUJMRQkoMSA8PCAxOSkKICNkZWZpbmUgIERESV9UUkFJ TklOR19PVkVSUklERV9WQUxVRQkoMSA8PCAxOCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RkaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKaW5k ZXggMDQwNDgzYzk2MDI5Li5hZDExNTQwYWM0MzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5j CkBAIC0zMzgwLDYgKzMzODAsMjYgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2RkaV9kcChz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJaW50ZWxfYXVkaW9fY29kZWNfZW5hYmxl KGVuY29kZXIsIGNydGNfc3RhdGUsIGNvbm5fc3RhdGUpOwogfQogCitzdGF0aWMgaTkxNV9yZWdf dAorZ2VuOV9jaGlja2VuX3RyYW5zX3JlZ19ieV9wb3J0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKKwkJCSAgICAgICBlbnVtIHBvcnQgcG9ydCkKK3sKKwlzdGF0aWMgY29uc3Qg aTkxNV9yZWdfdCByZWdzW10gPSB7CisJCVtQT1JUX0FdID0gQ0hJQ0tFTl9UUkFOU19FRFAsCisJ CVtQT1JUX0JdID0gQ0hJQ0tFTl9UUkFOU19BLAorCQlbUE9SVF9DXSA9IENISUNLRU5fVFJBTlNf QiwKKwkJW1BPUlRfRF0gPSBDSElDS0VOX1RSQU5TX0MsCisJCVtQT1JUX0VdID0gQ0hJQ0tFTl9U UkFOU19BLAorCX07CisKKwlXQVJOX09OKElOVEVMX0dFTihkZXZfcHJpdikgPCA5KTsKKworCWlm IChXQVJOX09OKHBvcnQgPCBQT1JUX0EgfHwgcG9ydCA+IFBPUlRfRSkpCisJCXBvcnQgPSBQT1JU X0E7CisKKwlyZXR1cm4gcmVnc1twb3J0XTsKK30KKwogc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxl X2RkaV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJCSAgY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkJICBjb25zdCBzdHJ1Y3QgZHJt X2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKQEAgLTM0MDMsMTcgKzM0MjMsMTAgQEAgc3Rh dGljIHZvaWQgaW50ZWxfZW5hYmxlX2RkaV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLAogCQkgKiB0aGUgYml0cyBhZmZlY3QgYSBzcGVjaWZpYyBEREkgcG9ydCByYXRoZXIgdGhh bgogCQkgKiBhIHNwZWNpZmljIHRyYW5zY29kZXIuCiAJCSAqLwotCQlzdGF0aWMgY29uc3QgZW51 bSB0cmFuc2NvZGVyIHBvcnRfdG9fdHJhbnNjb2RlcltdID0gewotCQkJW1BPUlRfQV0gPSBUUkFO U0NPREVSX0VEUCwKLQkJCVtQT1JUX0JdID0gVFJBTlNDT0RFUl9BLAotCQkJW1BPUlRfQ10gPSBU UkFOU0NPREVSX0IsCi0JCQlbUE9SVF9EXSA9IFRSQU5TQ09ERVJfQywKLQkJCVtQT1JUX0VdID0g VFJBTlNDT0RFUl9BLAotCQl9OwotCQllbnVtIHRyYW5zY29kZXIgdHJhbnNjb2RlciA9IHBvcnRf dG9fdHJhbnNjb2Rlcltwb3J0XTsKKwkJaTkxNV9yZWdfdCByZWcgPSBnZW45X2NoaWNrZW5fdHJh bnNfcmVnX2J5X3BvcnQoZGV2X3ByaXYsIHBvcnQpOwogCQl1MzIgdmFsOwogCi0JCXZhbCA9IEk5 MTVfUkVBRChDSElDS0VOX1RSQU5TKHRyYW5zY29kZXIpKTsKKwkJdmFsID0gSTkxNV9SRUFEKHJl Zyk7CiAKIAkJaWYgKHBvcnQgPT0gUE9SVF9FKQogCQkJdmFsIHw9IERESUVfVFJBSU5JTkdfT1ZF UlJJREVfRU5BQkxFIHwKQEAgLTM0MjIsOCArMzQzNSw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2Vu YWJsZV9kZGlfaGRtaShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCXZhbCB8PSBE RElfVFJBSU5JTkdfT1ZFUlJJREVfRU5BQkxFIHwKIAkJCQlERElfVFJBSU5JTkdfT1ZFUlJJREVf VkFMVUU7CiAKLQkJSTkxNV9XUklURShDSElDS0VOX1RSQU5TKHRyYW5zY29kZXIpLCB2YWwpOwot CQlQT1NUSU5HX1JFQUQoQ0hJQ0tFTl9UUkFOUyh0cmFuc2NvZGVyKSk7CisJCUk5MTVfV1JJVEUo cmVnLCB2YWwpOworCQlQT1NUSU5HX1JFQUQocmVnKTsKIAogCQl1ZGVsYXkoMSk7CiAKQEAgLTM0 MzQsNyArMzQ0Nyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9kZGlfaGRtaShzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCXZhbCAmPSB+KERESV9UUkFJTklOR19PVkVSUklE RV9FTkFCTEUgfAogCQkJCSBERElfVFJBSU5JTkdfT1ZFUlJJREVfVkFMVUUpOwogCi0JCUk5MTVf V1JJVEUoQ0hJQ0tFTl9UUkFOUyh0cmFuc2NvZGVyKSwgdmFsKTsKKwkJSTkxNV9XUklURShyZWcs IHZhbCk7CiAJfQogCiAJLyogSW4gSERNSS9EVkkgbW9kZSwgdGhlIHBvcnQgd2lkdGgsIGFuZCBz d2luZy9lbXBoYXNpcyB2YWx1ZXMKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggNWZkYzJm MTk2MDQ1Li4xNzQzZGY5MWM5YTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCkBAIC01OTIs NiArNTkyLDI1IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bzcl9hY3RpdmF0ZShzdHJ1Y3QgaW50ZWxf ZHAgKmludGVsX2RwKQogCWRldl9wcml2LT5wc3IuYWN0aXZlID0gdHJ1ZTsKIH0KIAorc3RhdGlj IGk5MTVfcmVnX3QgZ2VuOV9jaGlja2VuX3RyYW5zX3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCisJCQkJCSBlbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIpCit7CisJ c3RhdGljIGNvbnN0IGk5MTVfcmVnX3QgcmVnc1tdID0geworCQlbVFJBTlNDT0RFUl9BXSA9IENI SUNLRU5fVFJBTlNfQSwKKwkJW1RSQU5TQ09ERVJfQl0gPSBDSElDS0VOX1RSQU5TX0IsCisJCVtU UkFOU0NPREVSX0NdID0gQ0hJQ0tFTl9UUkFOU19DLAorCQlbVFJBTlNDT0RFUl9FRFBdID0gQ0hJ Q0tFTl9UUkFOU19FRFAsCisJfTsKKworCVdBUk5fT04oSU5URUxfR0VOKGRldl9wcml2KSA8IDkp OworCisJaWYgKFdBUk5fT04oY3B1X3RyYW5zY29kZXIgPj0gQVJSQVlfU0laRShyZWdzKSB8fAor CQkgICAgIXJlZ3NbY3B1X3RyYW5zY29kZXJdLnJlZykpCisJCWNwdV90cmFuc2NvZGVyID0gVFJB TlNDT0RFUl9BOworCisJcmV0dXJuIHJlZ3NbY3B1X3RyYW5zY29kZXJdOworfQorCiBzdGF0aWMg dm9pZCBpbnRlbF9wc3JfZW5hYmxlX3NvdXJjZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAog CQkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKQEAg LTYwNiw3ICs2MjUsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wc3JfZW5hYmxlX3NvdXJjZShzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQloc3dfcHNyX3NldHVwX2F1eChpbnRlbF9kcCk7CiAK IAlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQpIHsKLQkJdTMyIGNoaWNrZW4gPSBJOTE1 X1JFQUQoQ0hJQ0tFTl9UUkFOUyhjcHVfdHJhbnNjb2RlcikpOworCQlpOTE1X3JlZ190IHJlZyA9 IGdlbjlfY2hpY2tlbl90cmFuc19yZWcoZGV2X3ByaXYsCisJCQkJCQkJY3B1X3RyYW5zY29kZXIp OworCQl1MzIgY2hpY2tlbiA9IEk5MTVfUkVBRChyZWcpOwogCiAJCWlmIChJU19HRU45KGRldl9w cml2KSAmJiAhSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCiAJCQljaGlja2VuIHw9IChQU1IyX1ZT Q19FTkFCTEVfUFJPR19IRUFERVIKQEAgLTYxNCw3ICs2MzUsNyBAQCBzdGF0aWMgdm9pZCBpbnRl bF9wc3JfZW5hYmxlX3NvdXJjZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCiAJCWVsc2UK IAkJCWNoaWNrZW4gJj0gflZTQ19EQVRBX1NFTF9TT0ZUV0FSRV9DT05UUk9MOwotCQlJOTE1X1dS SVRFKENISUNLRU5fVFJBTlMoY3B1X3RyYW5zY29kZXIpLCBjaGlja2VuKTsKKwkJSTkxNV9XUklU RShyZWcsIGNoaWNrZW4pOwogCX0KIAogCS8qCi0tIAoyLjEzLjIKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=