From mboxrd@z Thu Jan 1 00:00:00 1970 From: kai.chen@intel.com Subject: [PATCH 2/2] drm/i915: Remove decoupled MMIO code Date: Tue, 23 May 2017 14:58:12 -0700 Message-ID: <20170523215812.18328-3-kai.chen@intel.com> References: <20170523215812.18328-1-kai.chen@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id D21966E17D for ; Tue, 23 May 2017 21:57:59 +0000 (UTC) In-Reply-To: <20170523215812.18328-1-kai.chen@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 RnJvbTogS2FpIENoZW4gPGthaS5jaGVuQGludGVsLmNvbT4KClRoaXMgaXMgYSBmb2xsb3ctdXAg cGF0Y2ggdG8gdGhlIHByZXZpb3VzIHBhdGNoIChbUEFUQ0hbMS8yXSBkcm0vaTkxNToKRGlzYWJs ZSBkZWNvdXBsZWQgTU1JTykgdG8gcmVtb3ZlIHRoZSBkZWFkIGNvZGUgZm9yIGRlY291cGxlZCBN TUlPCmltcGxlbWVudGF0aW9uLCBhcyBpdCB3b24ndCBiZSB1c2VkIGFueSBsb25nZXIgb24gR0VO OUxQLgoKVGhlcmVmb3JlLCB0aGlzIHBhdGNoIHJldmVydHM6Cgpjb21taXQgODVlZTE3ZWJlZWRk MWFmMGRjY2Q5OGY4MmFiNGU2NDRlMjlkODRjMApBdXRob3I6IFByYXZlZW4gUGFuZXJpIDxwcmF2 ZWVuLnBhbmVyaUBpbnRlbC5jb20+CkRhdGU6ICAgVHVlIE5vdiAxNSAyMjo0OToyMCAyMDE2ICsw NTMwCgogICAgZHJtL2k5MTUvYnh0OiBCcm94dG9uIGRlY291cGxlZCBNTUlPCgpTaWduZWQtb2Zm LWJ5OiBLYWkgQ2hlbiA8a2FpLmNoZW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggICAgIHwgICAzIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmggICAgIHwgICA3IC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDEy NiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwg MTM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGE2ZjIwNDcuLjQx ZmYwMzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNzAzLDcgKzcwMyw2IEBAIHN0cnVj dCBpbnRlbF9jc3IgewogCWZ1bmMoaGFzX2FsaWFzaW5nX3BwZ3R0KTsgXAogCWZ1bmMoaGFzX2Nz cik7IFwKIAlmdW5jKGhhc19kZGkpOyBcCi0JZnVuYyhoYXNfZGVjb3VwbGVkX21taW8pOyBcCiAJ ZnVuYyhoYXNfZHBfbXN0KTsgXAogCWZ1bmMoaGFzX2ZiYyk7IFwKIAlmdW5jKGhhc19mcGdhX2Ri Zyk7IFwKQEAgLTI5NDQsOCArMjk0Myw2IEBAIGludGVsX2luZm8oY29uc3Qgc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogI2RlZmluZSBHVF9GUkVRVUVOQ1lfTVVMVElQTElFUiA1 MAogI2RlZmluZSBHRU45X0ZSRVFfU0NBTEVSIDMKIAotI2RlZmluZSBIQVNfREVDT1VQTEVEX01N SU8oZGV2X3ByaXYpIChJTlRFTF9JTkZPKGRldl9wcml2KS0+aGFzX2RlY291cGxlZF9tbWlvKQot CiAjaW5jbHVkZSAiaTkxNV90cmFjZS5oIgogCiBzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWxfc2Nh bm91dF9uZWVkc192dGRfd2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggZWUxNDRlYy4uNzg4NzJmOSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3JlZy5oCkBAIC03NzkyLDEzICs3NzkyLDYgQEAgZW51bSB7CiAjZGVmaW5lICBTS0xfRlVT RV9QRzFfRElTVF9TVEFUVVMgICAgICAgICAgICAgICgxPDwyNikKICNkZWZpbmUgIFNLTF9GVVNF X1BHMl9ESVNUX1NUQVRVUyAgICAgICAgICAgICAgKDE8PDI1KQogCi0vKiBEZWNvdXBsZWQgTU1J TyByZWdpc3RlciBwYWlyIGZvciBrZXJuZWwgZHJpdmVyICovCi0jZGVmaW5lIEdFTjlfREVDT1VQ TEVEX1JFRzBfRFcwCQkJX01NSU8oMHhGMDApCi0jZGVmaW5lIEdFTjlfREVDT1VQTEVEX1JFRzBf RFcxCQkJX01NSU8oMHhGMDQpCi0jZGVmaW5lIEdFTjlfREVDT1VQTEVEX0RXMV9HTwkJCSgxPDwz MSkKLSNkZWZpbmUgR0VOOV9ERUNPVVBMRURfUERfU0hJRlQJCQkyOAotI2RlZmluZSBHRU45X0RF Q09VUExFRF9PUF9TSElGVAkJCTI0Ci0KIC8qIFBlci1waXBlIERESSBGdW5jdGlvbiBDb250cm9s ICovCiAjZGVmaW5lIF9UUkFOU19ERElfRlVOQ19DVExfQQkJMHg2MDQwMAogI2RlZmluZSBfVFJB TlNfRERJX0ZVTkNfQ1RMX0IJCTB4NjE0MDAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMK aW5kZXggYTlhNjkzMy4uMzkwMTgwMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMK QEAgLTQwMCw4ICs0MDAsNiBAQCBjaGVja19mb3JfdW5jbGFpbWVkX21taW8oc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogc3RhdGljIHZvaWQgX19pbnRlbF91bmNvcmVfZWFybHlf c2FuaXRpemUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCQkgIGJvb2wg cmVzdG9yZV9mb3JjZXdha2UpCiB7Ci0Jc3RydWN0IGludGVsX2RldmljZV9pbmZvICppbmZvID0g bWt3cml0ZV9kZXZpY2VfaW5mbyhkZXZfcHJpdik7Ci0KIAkvKiBjbGVhciBvdXQgdW5jbGFpbWVk IHJlZyBkZXRlY3Rpb24gYml0ICovCiAJaWYgKGNoZWNrX2Zvcl91bmNsYWltZWRfbW1pbyhkZXZf cHJpdikpCiAJCURSTV9ERUJVRygidW5jbGFpbWVkIG1taW8gZGV0ZWN0ZWQgb24gdW5jb3JlIGlu aXQsIGNsZWFyaW5nXG4iKTsKQEAgLTQxNCw5ICs0MTIsNiBAQCBzdGF0aWMgdm9pZCBfX2ludGVs X3VuY29yZV9lYXJseV9zYW5pdGl6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJCQkJICAgR1RfRklGT19DVExfUkM2X1BPTElDWV9TVEFMTCk7CiAJfQogCi0JaWYgKElTX0JY VF9SRVZJRChkZXZfcHJpdiwgMCwgQlhUX1JFVklEX0JfTEFTVCkpCi0JCWluZm8tPmhhc19kZWNv dXBsZWRfbW1pbyA9IGZhbHNlOwotCiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9yZXNldChkZXZf cHJpdiwgcmVzdG9yZV9mb3JjZXdha2UpOwogfQogCkBAIC04MDEsNzggKzc5Niw2IEBAIHVuY2xh aW1lZF9yZWdfZGVidWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCV9fdW5j bGFpbWVkX3JlZ19kZWJ1ZyhkZXZfcHJpdiwgcmVnLCByZWFkLCBiZWZvcmUpOwogfQogCi1lbnVt IGRlY291cGxlZF9wb3dlcl9kb21haW4gewotCUdFTjlfREVDT1VQTEVEX1BEX0JMSVRURVIgPSAw LAotCUdFTjlfREVDT1VQTEVEX1BEX1JFTkRFUiwKLQlHRU45X0RFQ09VUExFRF9QRF9NRURJQSwK LQlHRU45X0RFQ09VUExFRF9QRF9BTEwKLX07Ci0KLWVudW0gZGVjb3VwbGVkX29wcyB7Ci0JR0VO OV9ERUNPVVBMRURfT1BfV1JJVEUgPSAwLAotCUdFTjlfREVDT1VQTEVEX09QX1JFQUQKLX07Ci0K LXN0YXRpYyBjb25zdCBlbnVtIGRlY291cGxlZF9wb3dlcl9kb21haW4gZncyZHBkX2RvbWFpbltd ID0gewotCUdFTjlfREVDT1VQTEVEX1BEX1JFTkRFUiwKLQlHRU45X0RFQ09VUExFRF9QRF9CTElU VEVSLAotCUdFTjlfREVDT1VQTEVEX1BEX0FMTCwKLQlHRU45X0RFQ09VUExFRF9QRF9NRURJQSwK LQlHRU45X0RFQ09VUExFRF9QRF9BTEwsCi0JR0VOOV9ERUNPVVBMRURfUERfQUxMLAotCUdFTjlf REVDT1VQTEVEX1BEX0FMTAotfTsKLQotLyoKLSAqIERlY291cGxlZCBNTUlPIGFjY2VzcyBmb3Ig b25seSAxIERXT1JECi0gKi8KLXN0YXRpYyB2b2lkIF9fZ2VuOV9kZWNvdXBsZWRfbW1pb19hY2Nl c3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCQkgdTMyIHJlZywKLQkJ CQkJIGVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZG9tYWluLAotCQkJCQkgZW51bSBkZWNvdXBs ZWRfb3BzIG9wZXJhdGlvbikKLXsKLQllbnVtIGRlY291cGxlZF9wb3dlcl9kb21haW4gZHBfZG9t YWluOwotCXUzMiBjdHJsX3JlZ19kYXRhID0gMDsKLQotCWRwX2RvbWFpbiA9IGZ3MmRwZF9kb21h aW5bZndfZG9tYWluIC0gMV07Ci0KLQljdHJsX3JlZ19kYXRhIHw9IHJlZzsKLQljdHJsX3JlZ19k YXRhIHw9IChvcGVyYXRpb24gPDwgR0VOOV9ERUNPVVBMRURfT1BfU0hJRlQpOwotCWN0cmxfcmVn X2RhdGEgfD0gKGRwX2RvbWFpbiA8PCBHRU45X0RFQ09VUExFRF9QRF9TSElGVCk7Ci0JY3RybF9y ZWdfZGF0YSB8PSBHRU45X0RFQ09VUExFRF9EVzFfR087Ci0JX19yYXdfaTkxNV93cml0ZTMyKGRl dl9wcml2LCBHRU45X0RFQ09VUExFRF9SRUcwX0RXMSwgY3RybF9yZWdfZGF0YSk7Ci0KLQlpZiAo d2FpdF9mb3JfYXRvbWljKChfX3Jhd19pOTE1X3JlYWQzMihkZXZfcHJpdiwKLQkJCSAgICBHRU45 X0RFQ09VUExFRF9SRUcwX0RXMSkgJgotCQkJICAgIEdFTjlfREVDT1VQTEVEX0RXMV9HTykgPT0g MCwKLQkJCSAgICBGT1JDRVdBS0VfQUNLX1RJTUVPVVRfTVMpKQotCQlEUk1fRVJST1IoIkRlY291 cGxlZCBNTUlPIHdhaXQgdGltZWQgb3V0XG4iKTsKLX0KLQotc3RhdGljIGlubGluZSB1MzIKLV9f Z2VuOV9kZWNvdXBsZWRfbW1pb19yZWFkMzIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAotCQkJICAgICB1MzIgcmVnLAotCQkJICAgICBlbnVtIGZvcmNld2FrZV9kb21haW5zIGZ3 X2RvbWFpbikKLXsKLQlfX2dlbjlfZGVjb3VwbGVkX21taW9fYWNjZXNzKGRldl9wcml2LCByZWcs IGZ3X2RvbWFpbiwKLQkJCQkgICAgIEdFTjlfREVDT1VQTEVEX09QX1JFQUQpOwotCi0JcmV0dXJu IF9fcmF3X2k5MTVfcmVhZDMyKGRldl9wcml2LCBHRU45X0RFQ09VUExFRF9SRUcwX0RXMCk7Ci19 Ci0KLXN0YXRpYyBpbmxpbmUgdm9pZAotX19nZW45X2RlY291cGxlZF9tbWlvX3dyaXRlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgICB1MzIgcmVnLCB1MzIgZGF0YSwK LQkJCSAgICBlbnVtIGZvcmNld2FrZV9kb21haW5zIGZ3X2RvbWFpbikKLXsKLQotCV9fcmF3X2k5 MTVfd3JpdGUzMihkZXZfcHJpdiwgR0VOOV9ERUNPVVBMRURfUkVHMF9EVzAsIGRhdGEpOwotCi0J X19nZW45X2RlY291cGxlZF9tbWlvX2FjY2VzcyhkZXZfcHJpdiwgcmVnLCBmd19kb21haW4sCi0J CQkJICAgICBHRU45X0RFQ09VUExFRF9PUF9XUklURSk7Ci19Ci0KLQogI2RlZmluZSBHRU4yX1JF QURfSEVBREVSKHgpIFwKIAl1IyN4IHZhbCA9IDA7IFwKIAlhc3NlcnRfcnBtX3dha2Vsb2NrX2hl bGQoZGV2X3ByaXYpOwpAQCAtOTY5LDI4ICs4OTIsNiBAQCBmdW5jIyNfcmVhZCMjeChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGk5MTVfcmVnX3QgcmVnLCBib29sIHRyYWNlKSB7 CiAjZGVmaW5lIF9fZ2VuNl9yZWFkKHgpIF9fZ2VuX3JlYWQoZ2VuNiwgeCkKICNkZWZpbmUgX19m d3RhYmxlX3JlYWQoeCkgX19nZW5fcmVhZChmd3RhYmxlLCB4KQogCi0jZGVmaW5lIF9fZ2VuOV9k ZWNvdXBsZWRfcmVhZCh4KSBcCi1zdGF0aWMgdSMjeCBcCi1nZW45X2RlY291cGxlZF9yZWFkIyN4 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgXAotCQkgICAgICAgaTkxNV9yZWdf dCByZWcsIGJvb2wgdHJhY2UpIHsgXAotCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZW5naW5l OyBcCi0JR0VONl9SRUFEX0hFQURFUih4KTsgXAotCWZ3X2VuZ2luZSA9IF9fZnd0YWJsZV9yZWdf cmVhZF9md19kb21haW5zKG9mZnNldCk7IFwKLQlpZiAoZndfZW5naW5lICYgfmRldl9wcml2LT51 bmNvcmUuZndfZG9tYWluc19hY3RpdmUpIHsgXAotCQl1bnNpZ25lZCBpOyBcCi0JCXUzMiAqcHRy X2RhdGEgPSAodTMyICopICZ2YWw7IFwKLQkJZm9yIChpID0gMDsgaSA8IHgvMzI7IGkrKywgb2Zm c2V0ICs9IHNpemVvZih1MzIpLCBwdHJfZGF0YSsrKSBcCi0JCQkqcHRyX2RhdGEgPSBfX2dlbjlf ZGVjb3VwbGVkX21taW9fcmVhZDMyKGRldl9wcml2LCBcCi0JCQkJCQkJCSBvZmZzZXQsIFwKLQkJ CQkJCQkJIGZ3X2VuZ2luZSk7IFwKLQl9IGVsc2UgeyBcCi0JCXZhbCA9IF9fcmF3X2k5MTVfcmVh ZCMjeChkZXZfcHJpdiwgcmVnKTsgXAotCX0gXAotCUdFTjZfUkVBRF9GT09URVI7IFwKLX0KLQot X19nZW45X2RlY291cGxlZF9yZWFkKDMyKQotX19nZW45X2RlY291cGxlZF9yZWFkKDY0KQogX19m d3RhYmxlX3JlYWQoOCkKIF9fZnd0YWJsZV9yZWFkKDE2KQogX19md3RhYmxlX3JlYWQoMzIpCkBA IC0xMDc3LDI1ICs5NzgsNiBAQCBmdW5jIyNfd3JpdGUjI3goc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCBpOTE1X3JlZ190IHJlZywgdSMjeCB2YWwsIGJvbwogI2RlZmluZSBfX2dl bjhfd3JpdGUoeCkgX19nZW5fd3JpdGUoZ2VuOCwgeCkKICNkZWZpbmUgX19md3RhYmxlX3dyaXRl KHgpIF9fZ2VuX3dyaXRlKGZ3dGFibGUsIHgpCiAKLSNkZWZpbmUgX19nZW45X2RlY291cGxlZF93 cml0ZSh4KSBcCi1zdGF0aWMgdm9pZCBcCi1nZW45X2RlY291cGxlZF93cml0ZSMjeChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIFwKLQkJCWk5MTVfcmVnX3QgcmVnLCB1IyN4IHZh bCwgXAotCQlib29sIHRyYWNlKSB7IFwKLQllbnVtIGZvcmNld2FrZV9kb21haW5zIGZ3X2VuZ2lu ZTsgXAotCUdFTjZfV1JJVEVfSEVBREVSOyBcCi0JZndfZW5naW5lID0gX19md3RhYmxlX3JlZ193 cml0ZV9md19kb21haW5zKG9mZnNldCk7IFwKLQlpZiAoZndfZW5naW5lICYgfmRldl9wcml2LT51 bmNvcmUuZndfZG9tYWluc19hY3RpdmUpIFwKLQkJX19nZW45X2RlY291cGxlZF9tbWlvX3dyaXRl KGRldl9wcml2LCBcCi0JCQkJCSAgICBvZmZzZXQsIFwKLQkJCQkJICAgIHZhbCwgXAotCQkJCQkg ICAgZndfZW5naW5lKTsgXAotCWVsc2UgXAotCQlfX3Jhd19pOTE1X3dyaXRlIyN4KGRldl9wcml2 LCByZWcsIHZhbCk7IFwKLQlHRU42X1dSSVRFX0ZPT1RFUjsgXAotfQotCi1fX2dlbjlfZGVjb3Vw bGVkX3dyaXRlKDMyKQogX19md3RhYmxlX3dyaXRlKDgpCiBfX2Z3dGFibGVfd3JpdGUoMTYpCiBf X2Z3dGFibGVfd3JpdGUoMzIpCkBAIC0xMzMyLDE0ICsxMjE0LDYgQEAgdm9pZCBpbnRlbF91bmNv cmVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCUFTU0lHTl9GV19E T01BSU5TX1RBQkxFKF9fZ2VuOV9md19yYW5nZXMpOwogCQlBU1NJR05fV1JJVEVfTU1JT19WRlVO Q1MoZGV2X3ByaXYsIGZ3dGFibGUpOwogCQlBU1NJR05fUkVBRF9NTUlPX1ZGVU5DUyhkZXZfcHJp diwgZnd0YWJsZSk7Ci0JCWlmIChIQVNfREVDT1VQTEVEX01NSU8oZGV2X3ByaXYpKSB7Ci0JCQlk ZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLm1taW9fcmVhZGwgPQotCQkJCQkJZ2VuOV9kZWNvdXBsZWRf cmVhZDMyOwotCQkJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5tbWlvX3JlYWRxID0KLQkJCQkJCWdl bjlfZGVjb3VwbGVkX3JlYWQ2NDsKLQkJCWRldl9wcml2LT51bmNvcmUuZnVuY3MubW1pb193cml0 ZWwgPQotCQkJCQkJZ2VuOV9kZWNvdXBsZWRfd3JpdGUzMjsKLQkJfQogCX0KIAogCWlvc2ZfbWJp X3JlZ2lzdGVyX3BtaWNfYnVzX2FjY2Vzc19ub3RpZmllcigKLS0gCjIuOS4zCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK