From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC 17/33] drm/i915: Stop using I915_READ/WRITE in intel_wopcm_init_hw Date: Mon, 17 Jun 2019 19:12:20 +0100 Message-ID: <20190617181236.7981-18-tvrtko.ursulin@linux.intel.com> References: <20190617181236.7981-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 449628931F for ; Mon, 17 Jun 2019 18:13:14 +0000 (UTC) In-Reply-To: <20190617181236.7981-1-tvrtko.ursulin@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: Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1vcmUgbGVn YWN5IG1taW8gYWNjZXNzb3IgcmVtb3ZhbC4gV2UgcGFzcyBpbiBpbnRlbF9ndCBleHBsaWNpdGx5 IGFsbG93aW5nCmNvZGUgdG8gdXNlIG5ldyBpbnRlbF91bmNvcmVfcmVhZC93cml0ZSBoZWxwZXJz LgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNv bT4KUmV2aWV3ZWQtYnk6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3dvcGNtLmMgfCAzMSArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcGNtLmggfCAgNCArKystCiAzIGZpbGVz IGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCmluZGV4IGJiYmY3YTBhZjUwYy4uYWM3NmFjNzgxYWZlIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKQEAgLTEyNzEsNyArMTI3MSw3IEBAIHN0YXRpYyBpbnQgaW5pdF9odyhzdHJ1 Y3QgaW50ZWxfZ3QgKmd0KQogCQlnb3RvIG91dDsKIAl9CiAKLQlyZXQgPSBpbnRlbF93b3BjbV9p bml0X2h3KCZpOTE1LT53b3BjbSk7CisJcmV0ID0gaW50ZWxfd29wY21faW5pdF9odygmaTkxNS0+ d29wY20sIGd0KTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiRW5hYmxpbmcgV09QQ00gZmFp bGVkICglZClcbiIsIHJldCk7CiAJCWdvdG8gb3V0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfd29wY20uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcGNt LmMKaW5kZXggN2I0YmE4NGI5ZmI4Li45MzE5ODdlMzcyNDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3dvcGNtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfd29wY20uYwpAQCAtMjI1LDE3ICsyMjUsMTggQEAgaW50IGludGVsX3dvcGNtX2luaXQoc3Ry dWN0IGludGVsX3dvcGNtICp3b3BjbSkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGlubGluZSBp bnQgd3JpdGVfYW5kX3ZlcmlmeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0J CQkJICAgaTkxNV9yZWdfdCByZWcsIHUzMiB2YWwsIHUzMiBtYXNrLAotCQkJCSAgIHUzMiBsb2Nr ZWRfYml0KQorc3RhdGljIGludAord3JpdGVfYW5kX3ZlcmlmeShzdHJ1Y3QgaW50ZWxfZ3QgKmd0 LAorCQkgaTkxNV9yZWdfdCByZWcsIHUzMiB2YWwsIHUzMiBtYXNrLCB1MzIgbG9ja2VkX2JpdCkK IHsKKwlzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUgPSBndC0+dW5jb3JlOwogCXUzMiByZWdf dmFsOwogCiAJR0VNX0JVR19PTih2YWwgJiB+bWFzayk7CiAKLQlJOTE1X1dSSVRFKHJlZywgdmFs KTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLCByZWcsIHZhbCk7CiAKLQlyZWdfdmFsID0g STkxNV9SRUFEKHJlZyk7CisJcmVnX3ZhbCA9IGludGVsX3VuY29yZV9yZWFkKHVuY29yZSwgcmVn KTsKIAogCXJldHVybiAocmVnX3ZhbCAmIG1hc2spICE9ICh2YWwgfCBsb2NrZWRfYml0KSA/IC1F SU8gOiAwOwogfQpAQCAtMjUwLDI5ICsyNTEsMzAgQEAgc3RhdGljIGlubGluZSBpbnQgd3JpdGVf YW5kX3ZlcmlmeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAgKgogICogUmV0 dXJuOiAwIG9uIHN1Y2Nlc3MuIC1FSU8gaWYgcmVnaXN0ZXJzIHdlcmUgbG9ja2VkIHdpdGggaW5j b3JyZWN0IHZhbHVlcy4KICAqLwotaW50IGludGVsX3dvcGNtX2luaXRfaHcoc3RydWN0IGludGVs X3dvcGNtICp3b3BjbSkKK2ludCBpbnRlbF93b3BjbV9pbml0X2h3KHN0cnVjdCBpbnRlbF93b3Bj bSAqd29wY20sIHN0cnVjdCBpbnRlbF9ndCAqZ3QpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gd29wY21fdG9faTkxNSh3b3BjbSk7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUgPSB3b3BjbV90b19pOTE1KHdvcGNtKTsKKwlzdHJ1Y3QgaW50ZWxfdW5jb3Jl ICp1bmNvcmUgPSBndC0+dW5jb3JlOwogCXUzMiBodWNfYWdlbnQ7CiAJdTMyIG1hc2s7CiAJaW50 IGVycjsKIAotCWlmICghVVNFU19HVUMoZGV2X3ByaXYpKQorCWlmICghVVNFU19HVUMoaTkxNSkp CiAJCXJldHVybiAwOwogCi0JR0VNX0JVR19PTighSEFTX0dVQyhkZXZfcHJpdikpOworCUdFTV9C VUdfT04oIUhBU19HVUMoaTkxNSkpOwogCUdFTV9CVUdfT04oIXdvcGNtLT5ndWMuc2l6ZSk7CiAJ R0VNX0JVR19PTighd29wY20tPmd1Yy5iYXNlKTsKIAotCWVyciA9IHdyaXRlX2FuZF92ZXJpZnko ZGV2X3ByaXYsIEdVQ19XT1BDTV9TSVpFLCB3b3BjbS0+Z3VjLnNpemUsCisJZXJyID0gd3JpdGVf YW5kX3ZlcmlmeShndCwgR1VDX1dPUENNX1NJWkUsIHdvcGNtLT5ndWMuc2l6ZSwKIAkJCSAgICAg ICBHVUNfV09QQ01fU0laRV9NQVNLIHwgR1VDX1dPUENNX1NJWkVfTE9DS0VELAogCQkJICAgICAg IEdVQ19XT1BDTV9TSVpFX0xPQ0tFRCk7CiAJaWYgKGVycikKIAkJZ290byBlcnJfb3V0OwogCi0J aHVjX2FnZW50ID0gVVNFU19IVUMoZGV2X3ByaXYpID8gSFVDX0xPQURJTkdfQUdFTlRfR1VDIDog MDsKKwlodWNfYWdlbnQgPSBVU0VTX0hVQyhpOTE1KSA/IEhVQ19MT0FESU5HX0FHRU5UX0dVQyA6 IDA7CiAJbWFzayA9IEdVQ19XT1BDTV9PRkZTRVRfTUFTSyB8IEdVQ19XT1BDTV9PRkZTRVRfVkFM SUQgfCBodWNfYWdlbnQ7Ci0JZXJyID0gd3JpdGVfYW5kX3ZlcmlmeShkZXZfcHJpdiwgRE1BX0dV Q19XT1BDTV9PRkZTRVQsCisJZXJyID0gd3JpdGVfYW5kX3ZlcmlmeShndCwgRE1BX0dVQ19XT1BD TV9PRkZTRVQsCiAJCQkgICAgICAgd29wY20tPmd1Yy5iYXNlIHwgaHVjX2FnZW50LCBtYXNrLAog CQkJICAgICAgIEdVQ19XT1BDTV9PRkZTRVRfVkFMSUQpOwogCWlmIChlcnIpCkBAIC0yODMsOCAr Mjg1LDkgQEAgaW50IGludGVsX3dvcGNtX2luaXRfaHcoc3RydWN0IGludGVsX3dvcGNtICp3b3Bj bSkKIGVycl9vdXQ6CiAJRFJNX0VSUk9SKCJGYWlsZWQgdG8gaW5pdCBXT1BDTSByZWdpc3RlcnM6 XG4iKTsKIAlEUk1fRVJST1IoIkRNQV9HVUNfV09QQ01fT0ZGU0VUPSUjeFxuIiwKLQkJICBJOTE1 X1JFQUQoRE1BX0dVQ19XT1BDTV9PRkZTRVQpKTsKLQlEUk1fRVJST1IoIkdVQ19XT1BDTV9TSVpF PSUjeFxuIiwgSTkxNV9SRUFEKEdVQ19XT1BDTV9TSVpFKSk7CisJCSAgaW50ZWxfdW5jb3JlX3Jl YWQodW5jb3JlLCBETUFfR1VDX1dPUENNX09GRlNFVCkpOworCURSTV9FUlJPUigiR1VDX1dPUENN X1NJWkU9JSN4XG4iLAorCQkgIGludGVsX3VuY29yZV9yZWFkKHVuY29yZSwgR1VDX1dPUENNX1NJ WkUpKTsKIAogCXJldHVybiBlcnI7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF93b3BjbS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29wY20uaAppbmRl eCAxMTQ0MDE5NzE1MjAuLjU2YWFlZDRkNjRmZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfd29wY20uaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3Bj bS5oCkBAIC05LDYgKzksOCBAQAogCiAjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KIAorc3RydWN0 IGludGVsX2d0OworCiAvKioKICAqIHN0cnVjdCBpbnRlbF93b3BjbSAtIE92ZXJhbGwgV09QQ00g aW5mbyBhbmQgV09QQ00gcmVnaW9ucy4KICAqIEBzaXplOiBTaXplIG9mIG92ZXJhbGwgV09QQ00u CkBAIC00MSw2ICs0Myw2IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGludGVsX3dvcGNtX2d1Y19zaXpl KHN0cnVjdCBpbnRlbF93b3BjbSAqd29wY20pCiAKIHZvaWQgaW50ZWxfd29wY21faW5pdF9lYXJs eShzdHJ1Y3QgaW50ZWxfd29wY20gKndvcGNtKTsKIGludCBpbnRlbF93b3BjbV9pbml0KHN0cnVj dCBpbnRlbF93b3BjbSAqd29wY20pOwotaW50IGludGVsX3dvcGNtX2luaXRfaHcoc3RydWN0IGlu dGVsX3dvcGNtICp3b3BjbSk7CitpbnQgaW50ZWxfd29wY21faW5pdF9odyhzdHJ1Y3QgaW50ZWxf d29wY20gKndvcGNtLCBzdHJ1Y3QgaW50ZWxfZ3QgKmd0KTsKIAogI2VuZGlmCi0tIAoyLjIwLjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==