From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: [RFC 4/8] drm/i915: Consolidated iir, imr and ier. Date: Thu, 18 Apr 2019 13:53:43 -0700 Message-ID: <20190418205347.6402-5-rodrigo.vivi@intel.com> References: <20190418205347.6402-1-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id E45766E1BC for ; Thu, 18 Apr 2019 20:53:36 +0000 (UTC) In-Reply-To: <20190418205347.6402-1-rodrigo.vivi@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 List-Id: intel-gfx@lists.freedesktop.org R2V0IGFsbCBmcmllbmRzIGJhY2sgdG9nZXRoZXIuCgpGb3IgZ2VuOCBndF8gcHJlZml4IHdvdWxk IGJlIGJldHRlciB0aGFuIHBtXyBvbiB0aGVtCnNpbmNlIHRoZXNlIHJlZ3MgaW5jbHVkZSBtb3Jl IHN0dWZmIHRoZW4gUE0sIGJ1dCBsZXQncwprZWVwIGZvciBsZWdhY3kgcmVhc29ucy4KClNpZ25l ZC1vZmYtYnk6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9pcnEuYyB8IDMwICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMiBmaWxl cyBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAppbmRleCA4NzQ2NjhiNWRhNTcuLmNiNTFjZjMzNTIyNiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCkBAIC02NTMsNiArNjUzLDggQEAgc3RydWN0IGludGVsX2lycSB7CiAJYm9v bCBycHNfaW50ZXJydXB0c19lbmFibGVkOwogCWJvb2wgZGlzcGxheV9pbnRlcnJ1cHRzX2VuYWJs ZWQ7CiAJdTMyIHBtX2lpcjsKKwl1MzIgcG1faW1yOworCXUzMiBwbV9pZXI7CiB9OwogCiBzdHJ1 Y3QgaW50ZWxfcnBzIHsKQEAgLTE1NjcsOCArMTU2OSw2IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlIHsKIAkJdTMyIGRlX2lycV9tYXNrW0k5MTVfTUFYX1BJUEVTXTsKIAl9OwogCXUzMiBndF9p cnFfbWFzazsKLQl1MzIgcG1faW1yOwotCXUzMiBwbV9pZXI7CiAJdTMyIHBtX3Jwc19ldmVudHM7 CiAJdTMyIHBtX2d1Y19ldmVudHM7CiAJdTMyIHBpcGVzdGF0X2lycV9tYXNrW0k5MTVfTUFYX1BJ UEVTXTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDAxOTQ3MmM5OGFhYy4uNjY3YmJjYzAx NTEzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTQwMCw3ICs0MDAsNyBAQCBzdGF0aWMg aTkxNV9yZWdfdCBnZW42X3BtX2lpcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiBzdGF0aWMgdm9pZCB3cml0ZV9wbV9pbXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogewogCWk5MTVfcmVnX3QgcmVnOwotCXUzMiBtYXNrID0gZGV2X3ByaXYtPnBtX2ltcjsK Kwl1MzIgbWFzayA9IGRldl9wcml2LT5pcnEucG1faW1yOwogCiAJaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gMTEpIHsKIAkJcmVnID0gR0VOMTFfR1BNX1dHQk9YUEVSRl9JTlRSX01BU0s7CkBA IC00MTksNyArNDE5LDcgQEAgc3RhdGljIHZvaWQgd3JpdGVfcG1faW1yKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHN0YXRpYyB2b2lkIHdyaXRlX3BtX2llcihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaTkxNV9yZWdfdCByZWc7Ci0JdTMyIG1hc2sg PSBkZXZfcHJpdi0+cG1faWVyOworCXUzMiBtYXNrID0gZGV2X3ByaXYtPmlycS5wbV9pZXI7CiAK IAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkgewogCQlyZWcgPSBHRU4xMV9HUE1fV0dC T1hQRVJGX0lOVFJfRU5BQkxFOwpAQCAtNDUwLDEyICs0NTAsMTIgQEAgc3RhdGljIHZvaWQgc25i X3VwZGF0ZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJbG9j a2RlcF9hc3NlcnRfaGVsZCgmZGV2X3ByaXYtPmlycS5sb2NrKTsKIAotCW5ld192YWwgPSBkZXZf cHJpdi0+cG1faW1yOworCW5ld192YWwgPSBkZXZfcHJpdi0+aXJxLnBtX2ltcjsKIAluZXdfdmFs ICY9IH5pbnRlcnJ1cHRfbWFzazsKIAluZXdfdmFsIHw9ICh+ZW5hYmxlZF9pcnFfbWFzayAmIGlu dGVycnVwdF9tYXNrKTsKIAotCWlmIChuZXdfdmFsICE9IGRldl9wcml2LT5wbV9pbXIpIHsKLQkJ ZGV2X3ByaXYtPnBtX2ltciA9IG5ld192YWw7CisJaWYgKG5ld192YWwgIT0gZGV2X3ByaXYtPmly cS5wbV9pbXIpIHsKKwkJZGV2X3ByaXYtPmlycS5wbV9pbXIgPSBuZXdfdmFsOwogCQl3cml0ZV9w bV9pbXIoZGV2X3ByaXYpOwogCX0KIH0KQEAgLTQ5Niw3ICs0OTYsNyBAQCBzdGF0aWMgdm9pZCBn ZW42X2VuYWJsZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIg ZW5hYmxlX21hcwogewogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5pcnEubG9jayk7 CiAKLQlkZXZfcHJpdi0+cG1faWVyIHw9IGVuYWJsZV9tYXNrOworCWRldl9wcml2LT5pcnEucG1f aWVyIHw9IGVuYWJsZV9tYXNrOwogCXdyaXRlX3BtX2llcihkZXZfcHJpdik7CiAJZ2VuNl91bm1h c2tfcG1faXJxKGRldl9wcml2LCBlbmFibGVfbWFzayk7CiAJLyogdW5tYXNrX3BtX2lycSBwcm92 aWRlcyBhbiBpbXBsaWNpdCBiYXJyaWVyIChQT1NUSU5HX1JFQUQpICovCkBAIC01MDYsNyArNTA2 LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9kaXNhYmxlX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIHUzMiBkaXNhYmxlX20KIHsKIAlsb2NrZGVwX2Fzc2VydF9oZWxkKCZk ZXZfcHJpdi0+aXJxLmxvY2spOwogCi0JZGV2X3ByaXYtPnBtX2llciAmPSB+ZGlzYWJsZV9tYXNr OworCWRldl9wcml2LT5pcnEucG1faWVyICY9IH5kaXNhYmxlX21hc2s7CiAJX19nZW42X21hc2tf cG1faXJxKGRldl9wcml2LCBkaXNhYmxlX21hc2spOwogCXdyaXRlX3BtX2llcihkZXZfcHJpdik7 CiAJLyogdGhvdWdoIGEgYmFycmllciBpcyBtaXNzaW5nIGhlcmUsIGJ1dCBkb24ndCByZWFsbHkg bmVlZCBhIG9uZSAqLwpAQCAtMzk0NCwxMSArMzk0NCwxMSBAQCBzdGF0aWMgdm9pZCBnZW41X2d0 X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkgKi8KIAkJaWYgKEhB U19FTkdJTkUoZGV2X3ByaXYsIFZFQ1MwKSkgewogCQkJcG1faXJxcyB8PSBQTV9WRUJPWF9VU0VS X0lOVEVSUlVQVDsKLQkJCWRldl9wcml2LT5wbV9pZXIgfD0gUE1fVkVCT1hfVVNFUl9JTlRFUlJV UFQ7CisJCQlkZXZfcHJpdi0+aXJxLnBtX2llciB8PSBQTV9WRUJPWF9VU0VSX0lOVEVSUlVQVDsK IAkJfQogCi0JCWRldl9wcml2LT5wbV9pbXIgPSAweGZmZmZmZmZmOwotCQlHRU4zX0lSUV9JTklU KHVuY29yZSwgR0VONl9QTSwgZGV2X3ByaXYtPnBtX2ltciwgcG1faXJxcyk7CisJCWRldl9wcml2 LT5pcnEucG1faW1yID0gMHhmZmZmZmZmZjsKKwkJR0VOM19JUlFfSU5JVCh1bmNvcmUsIEdFTjZf UE0sIGRldl9wcml2LT5pcnEucG1faW1yLCBwbV9pcnFzKTsKIAl9CiB9CiAKQEAgLTQwNzQsMTUg KzQwNzQsMTUgQEAgc3RhdGljIHZvaWQgZ2VuOF9ndF9pcnFfcG9zdGluc3RhbGwoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkgR1RfQ09OVEVYVF9TV0lUQ0hfSU5URVJSVVBU IDw8IEdFTjhfVkVDU19JUlFfU0hJRlQpCiAJfTsKIAotCWRldl9wcml2LT5wbV9pZXIgPSAweDA7 Ci0JZGV2X3ByaXYtPnBtX2ltciA9IH5kZXZfcHJpdi0+cG1faWVyOworCWRldl9wcml2LT5pcnEu cG1faWVyID0gMHgwOworCWRldl9wcml2LT5pcnEucG1faW1yID0gfmRldl9wcml2LT5pcnEucG1f aWVyOwogCUdFTjhfSVJRX0lOSVRfTkRYKHVuY29yZSwgR1QsIDAsIH5ndF9pbnRlcnJ1cHRzWzBd LCBndF9pbnRlcnJ1cHRzWzBdKTsKIAlHRU44X0lSUV9JTklUX05EWCh1bmNvcmUsIEdULCAxLCB+ Z3RfaW50ZXJydXB0c1sxXSwgZ3RfaW50ZXJydXB0c1sxXSk7CiAJLyoKIAkgKiBSUFMgaW50ZXJy dXB0cyB3aWxsIGdldCBlbmFibGVkL2Rpc2FibGVkIG9uIGRlbWFuZCB3aGVuIFJQUyBpdHNlbGYK IAkgKiBpcyBlbmFibGVkL2Rpc2FibGVkLiBTYW1lIHdpbCBiZSB0aGUgY2FzZSBmb3IgR3VDIGlu dGVycnVwdHMuCiAJICovCi0JR0VOOF9JUlFfSU5JVF9ORFgodW5jb3JlLCBHVCwgMiwgZGV2X3By aXYtPnBtX2ltciwgZGV2X3ByaXYtPnBtX2llcik7CisJR0VOOF9JUlFfSU5JVF9ORFgodW5jb3Jl LCBHVCwgMiwgZGV2X3ByaXYtPmlycS5wbV9pbXIsIGRldl9wcml2LT5pcnEucG1faWVyKTsKIAlH RU44X0lSUV9JTklUX05EWCh1bmNvcmUsIEdULCAzLCB+Z3RfaW50ZXJydXB0c1szXSwgZ3RfaW50 ZXJydXB0c1szXSk7CiB9CiAKQEAgLTQxOTUsOCArNDE5NSw4IEBAIHN0YXRpYyB2b2lkIGdlbjEx X2d0X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ ICogUlBTIGludGVycnVwdHMgd2lsbCBnZXQgZW5hYmxlZC9kaXNhYmxlZCBvbiBkZW1hbmQgd2hl biBSUFMgaXRzZWxmCiAJICogaXMgZW5hYmxlZC9kaXNhYmxlZC4KIAkgKi8KLQlkZXZfcHJpdi0+ cG1faWVyID0gMHgwOwotCWRldl9wcml2LT5wbV9pbXIgPSB+ZGV2X3ByaXYtPnBtX2llcjsKKwlk ZXZfcHJpdi0+aXJxLnBtX2llciA9IDB4MDsKKwlkZXZfcHJpdi0+aXJxLnBtX2ltciA9IH5kZXZf cHJpdi0+aXJxLnBtX2llcjsKIAlJOTE1X1dSSVRFKEdFTjExX0dQTV9XR0JPWFBFUkZfSU5UUl9F TkFCTEUsIDApOwogCUk5MTVfV1JJVEUoR0VOMTFfR1BNX1dHQk9YUEVSRl9JTlRSX01BU0ssICB+ MCk7CiB9Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeA==