From: Tvrtko Ursulin Subject: [PATCH 16/21] drm/i915: Convert i915_ppgtt_init_hw to uncore Date: Thu, 6 Jun 2019 10:36:34 +0100 Message-ID: <20190606093639.9372-17-tvrtko.ursulin@linux.intel.com> References: <20190606093639.9372-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1FDC98972B for ; Thu, 6 Jun 2019 09:37:10 +0000 (UTC) In-Reply-To: <20190606093639.9372-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1vcmUgcmVt b3ZhbCBvZiBpbXBsaWNpdCBkZXZfcHJpdiBmcm9tIHVzaW5nIG9sZCBtbWlvIGFjY2Vzc29ycy4K ClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCA5OCArKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggfCAgMiArLQogMyBm aWxlcyBjaGFuZ2VkLCA2MyBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwppbmRleCBkMDM0ODFiOGMxYjQuLjFjNWU2YzFhNTM2MCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCkBAIC0xMjk0LDcgKzEyOTQsNyBAQCBpbnQgaTkxNV9nZW1faW5pdF9o dyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYgKHJldCkKIAkJZ290byBv dXQ7CiAKLQlyZXQgPSBpOTE1X3BwZ3R0X2luaXRfaHcoZGV2X3ByaXYpOworCXJldCA9IGk5MTVf cHBndHRfaW5pdF9odygmZGV2X3ByaXYtPnVuY29yZSk7CiAJaWYgKHJldCkgewogCQlEUk1fRVJS T1IoIkVuYWJsaW5nIFBQR1RUIGZhaWxlZCAoJWQpXG4iLCByZXQpOwogCQlnb3RvIG91dDsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggMGNlY2M0M2E2NGIwLi5iMmMyZGM5OWJm OGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0xNjkzLDI1ICsxNjkzLDI4 IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBnZW42X3dyaXRlX3BkZShjb25zdCBzdHJ1Y3QgZ2VuNl9o d19wcGd0dCAqcHBndHQsCiAJCSAgcHBndHQtPnBkX2FkZHIgKyBwZGUpOwogfQogCi1zdGF0aWMg dm9pZCBnZW43X3BwZ3R0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CitzdGF0aWMgdm9pZCBnZW43X3BwZ3R0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNv cmUpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSB1bmNvcmVfdG9faTkxNSh1 bmNvcmUpOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAl1MzIgZWNvY2hrLCBl Y29iaXRzOwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwogCi0JZWNvYml0cyA9IEk5MTVfUkVB RChHQUNfRUNPX0JJVFMpOwotCUk5MTVfV1JJVEUoR0FDX0VDT19CSVRTLCBlY29iaXRzIHwgRUNP QklUU19QUEdUVF9DQUNIRTY0Qik7CisJZWNvYml0cyA9IGludGVsX3VuY29yZV9yZWFkKHVuY29y ZSwgR0FDX0VDT19CSVRTKTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJICAgR0FD X0VDT19CSVRTLAorCQkJICAgZWNvYml0cyB8IEVDT0JJVFNfUFBHVFRfQ0FDSEU2NEIpOwogCi0J ZWNvY2hrID0gSTkxNV9SRUFEKEdBTV9FQ09DSEspOwotCWlmIChJU19IQVNXRUxMKGRldl9wcml2 KSkgeworCWVjb2NoayA9IGludGVsX3VuY29yZV9yZWFkKHVuY29yZSwgR0FNX0VDT0NISyk7CisJ aWYgKElTX0hBU1dFTEwoaTkxNSkpIHsKIAkJZWNvY2hrIHw9IEVDT0NIS19QUEdUVF9XQl9IU1c7 CiAJfSBlbHNlIHsKIAkJZWNvY2hrIHw9IEVDT0NIS19QUEdUVF9MTENfSVZCOwogCQllY29jaGsg Jj0gfkVDT0NIS19QUEdUVF9HRkRUX0lWQjsKIAl9Ci0JSTkxNV9XUklURShHQU1fRUNPQ0hLLCBl Y29jaGspOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdBTV9FQ09DSEssIGVjb2Noayk7 CiAKLQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKKwlmb3JfZWFjaF9l bmdpbmUoZW5naW5lLCBpOTE1LCBpZCkgewogCQkvKiBHRlhfTU9ERSBpcyBwZXItcmluZyBvbiBn ZW43KyAqLwogCQlFTkdJTkVfV1JJVEUoZW5naW5lLAogCQkJICAgICBSSU5HX01PREVfR0VONywK QEAgLTE3MTksMjIgKzE3MjIsMjkgQEAgc3RhdGljIHZvaWQgZ2VuN19wcGd0dF9lbmFibGUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCX0KIH0KIAotc3RhdGljIHZvaWQgZ2Vu Nl9wcGd0dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGlj IHZvaWQgZ2VuNl9wcGd0dF9lbmFibGUoc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlKQogewog CXUzMiBlY29jaGssIGdhYl9jdGwsIGVjb2JpdHM7CiAKLQllY29iaXRzID0gSTkxNV9SRUFEKEdB Q19FQ09fQklUUyk7Ci0JSTkxNV9XUklURShHQUNfRUNPX0JJVFMsIGVjb2JpdHMgfCBFQ09CSVRT X1NOQl9CSVQgfAotCQkgICBFQ09CSVRTX1BQR1RUX0NBQ0hFNjRCKTsKKwllY29iaXRzID0gaW50 ZWxfdW5jb3JlX3JlYWQodW5jb3JlLCBHQUNfRUNPX0JJVFMpOworCWludGVsX3VuY29yZV93cml0 ZSh1bmNvcmUsCisJCQkgICBHQUNfRUNPX0JJVFMsCisJCQkgICBlY29iaXRzIHwgRUNPQklUU19T TkJfQklUIHwgRUNPQklUU19QUEdUVF9DQUNIRTY0Qik7CiAKLQlnYWJfY3RsID0gSTkxNV9SRUFE KEdBQl9DVEwpOwotCUk5MTVfV1JJVEUoR0FCX0NUTCwgZ2FiX2N0bCB8IEdBQl9DVExfQ09OVF9B RlRFUl9QQUdFRkFVTFQpOworCWdhYl9jdGwgPSBpbnRlbF91bmNvcmVfcmVhZCh1bmNvcmUsIEdB Ql9DVEwpOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsCisJCQkgICBHQUJfQ1RMLAorCQkJ ICAgZ2FiX2N0bCB8IEdBQl9DVExfQ09OVF9BRlRFUl9QQUdFRkFVTFQpOwogCi0JZWNvY2hrID0g STkxNV9SRUFEKEdBTV9FQ09DSEspOwotCUk5MTVfV1JJVEUoR0FNX0VDT0NISywgZWNvY2hrIHwg RUNPQ0hLX1NOQl9CSVQgfCBFQ09DSEtfUFBHVFRfQ0FDSEU2NEIpOworCWVjb2NoayA9IGludGVs X3VuY29yZV9yZWFkKHVuY29yZSwgR0FNX0VDT0NISyk7CisJaW50ZWxfdW5jb3JlX3dyaXRlKHVu Y29yZSwKKwkJCSAgIEdBTV9FQ09DSEssCisJCQkgICBlY29jaGsgfCBFQ09DSEtfU05CX0JJVCB8 IEVDT0NIS19QUEdUVF9DQUNIRTY0Qik7CiAKLQlpZiAoSEFTX1BQR1RUKGRldl9wcml2KSkgLyog bWF5IGJlIGRpc2FibGVkIGZvciBWVC1kICovCi0JCUk5MTVfV1JJVEUoR0ZYX01PREUsIF9NQVNL RURfQklUX0VOQUJMRShHRlhfUFBHVFRfRU5BQkxFKSk7CisJaWYgKEhBU19QUEdUVCh1bmNvcmVf dG9faTkxNSh1bmNvcmUpKSkgLyogbWF5IGJlIGRpc2FibGVkIGZvciBWVC1kICovCisJCWludGVs X3VuY29yZV93cml0ZSh1bmNvcmUsCisJCQkJICAgR0ZYX01PREUsCisJCQkJICAgX01BU0tFRF9C SVRfRU5BQkxFKEdGWF9QUEdUVF9FTkFCTEUpKTsKIH0KIAogLyogUFBHVFQgc3VwcG9ydCBmb3Ig U2FuZHliZHJpZ2UvR2VuNiBhbmQgbGF0ZXIgKi8KQEAgLTIxODUsMjEgKzIxOTUsMzEgQEAgc3Rh dGljIHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpnZW42X3BwZ3R0X2NyZWF0ZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqaTkxNSkKIAlyZXR1cm4gRVJSX1BUUihlcnIpOwogfQogCi1zdGF0aWMgdm9p ZCBndHRfd3JpdGVfd29ya2Fyb3VuZHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQorc3RhdGljIHZvaWQgZ3R0X3dyaXRlX3dvcmthcm91bmRzKHN0cnVjdCBpbnRlbF91bmNvcmUg KnVuY29yZSkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHVuY29yZV90b19p OTE1KHVuY29yZSk7CisKIAkvKiBUaGlzIGZ1bmN0aW9uIGlzIGZvciBndHQgcmVsYXRlZCB3b3Jr YXJvdW5kcy4gVGhpcyBmdW5jdGlvbiBpcwogCSAqIGNhbGxlZCBvbiBkcml2ZXIgbG9hZCBhbmQg YWZ0ZXIgYSBHUFUgcmVzZXQsIHNvIHlvdSBjYW4gcGxhY2UKIAkgKiB3b3JrYXJvdW5kcyBoZXJl IGV2ZW4gaWYgdGhleSBnZXQgb3ZlcndyaXR0ZW4gYnkgR1BVIHJlc2V0LgogCSAqLwogCS8qIFdh SW5jcmVhc2VEZWZhdWx0VExCRW50cmllczpjaHYsYmR3LHNrbCxieHQsa2JsLGdsayxjZmwsY25s LGljbCAqLwotCWlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQotCQlJOTE1X1dSSVRFKEdFTjhf TDNfTFJBXzFfR1BHUFUsIEdFTjhfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9CRFcpOwot CWVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQotCQlJOTE1X1dSSVRFKEdFTjhfTDNf TFJBXzFfR1BHUFUsIEdFTjhfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9DSFYpOwotCWVs c2UgaWYgKElTX0dFTjlfTFAoZGV2X3ByaXYpKQotCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJBXzFf R1BHUFUsIEdFTjlfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9CWFQpOwotCWVsc2UgaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkKLQkJSTkxNV9XUklURShHRU44X0wzX0xSQV8xX0dQ R1BVLCBHRU45X0wzX0xSQV8xX0dQR1BVX0RFRkFVTFRfVkFMVUVfU0tMKTsKKwlpZiAoSVNfQlJP QURXRUxMKGk5MTUpKQorCQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJCSAgIEdFTjhf TDNfTFJBXzFfR1BHUFUsCisJCQkJICAgR0VOOF9MM19MUkFfMV9HUEdQVV9ERUZBVUxUX1ZBTFVF X0JEVyk7CisJZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhpOTE1KSkKKwkJaW50ZWxfdW5jb3JlX3dy aXRlKHVuY29yZSwKKwkJCQkgICBHRU44X0wzX0xSQV8xX0dQR1BVLAorCQkJCSAgIEdFTjhfTDNf TFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9DSFYpOworCWVsc2UgaWYgKElTX0dFTjlfTFAoaTkx NSkpCisJCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsCisJCQkJICAgR0VOOF9MM19MUkFfMV9H UEdQVSwKKwkJCQkgICBHRU45X0wzX0xSQV8xX0dQR1BVX0RFRkFVTFRfVkFMVUVfQlhUKTsKKwll bHNlIGlmIChJTlRFTF9HRU4oaTkxNSkgPj0gOSkKKwkJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29y ZSwKKwkJCQkgICBHRU44X0wzX0xSQV8xX0dQR1BVLAorCQkJCSAgIEdFTjlfTDNfTFJBXzFfR1BH UFVfREVGQVVMVF9WQUxVRV9TS0wpOwogCiAJLyoKIAkgKiBUbyBzdXBwb3J0IDY0SyBQVEVzIHdl IG5lZWQgdG8gZmlyc3QgZW5hYmxlIHRoZSB1c2Ugb2YgdGhlCkBAIC0yMjEyLDIxICsyMjMyLDI1 IEBAIHN0YXRpYyB2b2lkIGd0dF93cml0ZV93b3JrYXJvdW5kcyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJICogMzJLIHBhZ2VzLCBidXQgd2UgZG9uJ3QgY3VycmVudGx5IGhh dmUgYW55IHN1cHBvcnQgZm9yIGl0IGluIG91cgogCSAqIGRyaXZlci4KIAkgKi8KLQlpZiAoSEFT X1BBR0VfU0laRVMoZGV2X3ByaXYsIEk5MTVfR1RUX1BBR0VfU0laRV82NEspICYmCi0JICAgIElO VEVMX0dFTihkZXZfcHJpdikgPD0gMTApCi0JCUk5MTVfV1JJVEUoR0VOOF9HQU1XX0VDT19ERVZf UldfSUEsCi0JCQkgICBJOTE1X1JFQUQoR0VOOF9HQU1XX0VDT19ERVZfUldfSUEpIHwKLQkJCSAg IEdBTVdfRUNPX0VOQUJMRV82NEtfSVBTX0ZJRUxEKTsKKwlpZiAoSEFTX1BBR0VfU0laRVMoaTkx NSwgSTkxNV9HVFRfUEFHRV9TSVpFXzY0SykgJiYKKwkgICAgSU5URUxfR0VOKGk5MTUpIDw9IDEw KQorCQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJCSAgIEdFTjhfR0FNV19FQ09fREVW X1JXX0lBLAorCQkJCSAgIGludGVsX3VuY29yZV9yZWFkKHVuY29yZSwKKwkJCQkJCSAgICAgR0VO OF9HQU1XX0VDT19ERVZfUldfSUEpIHwKKwkJCQkgICBHQU1XX0VDT19FTkFCTEVfNjRLX0lQU19G SUVMRCk7CiB9CiAKLWludCBpOTE1X3BwZ3R0X2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQoraW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgaW50ZWxfdW5jb3Jl ICp1bmNvcmUpCiB7Ci0JZ3R0X3dyaXRlX3dvcmthcm91bmRzKGRldl9wcml2KTsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHVuY29yZV90b19pOTE1KHVuY29yZSk7CisKKwlndHRf d3JpdGVfd29ya2Fyb3VuZHModW5jb3JlKTsKIAotCWlmIChJU19HRU4oZGV2X3ByaXYsIDYpKQot CQlnZW42X3BwZ3R0X2VuYWJsZShkZXZfcHJpdik7Ci0JZWxzZSBpZiAoSVNfR0VOKGRldl9wcml2 LCA3KSkKLQkJZ2VuN19wcGd0dF9lbmFibGUoZGV2X3ByaXYpOworCWlmIChJU19HRU4oaTkxNSwg NikpCisJCWdlbjZfcHBndHRfZW5hYmxlKHVuY29yZSk7CisJZWxzZSBpZiAoSVNfR0VOKGk5MTUs IDcpKQorCQlnZW43X3BwZ3R0X2VuYWJsZSh1bmNvcmUpOwogCiAJcmV0dXJuIDA7CiB9CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IDlhYzcwMTk4ODAzMC4uODA3MDMxNjJjOTlh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtNjI4LDcgKzYyOCw3IEBAIHZv aWQgaTkxNV9nZ3R0X2Rpc2FibGVfZ3VjKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsK IGludCBpOTE1X2dlbV9pbml0X2dndHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KTsKIHZvaWQgaTkxNV9nZ3R0X2NsZWFudXBfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KTsKIAotaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpOworaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgaW50ZWxfdW5jb3Jl ICp1bmNvcmUpOwogCiBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqaTkxNV9wcGd0dF9jcmVhdGUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaTkxNV9wcGd0dF9yZWxlYXNl KHN0cnVjdCBrcmVmICprcmVmKTsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4