From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [CI 13/33] drm/i915: Convert i915_ppgtt_init_hw to intel_gt Date: Fri, 21 Jun 2019 08:07:51 +0100 Message-ID: <20190621070811.7006-13-tvrtko.ursulin@linux.intel.com> References: <20190621070811.7006-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B4526E819 for ; Fri, 21 Jun 2019 07:08:26 +0000 (UTC) In-Reply-To: <20190621070811.7006-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 CnYyOgogKiBSZWJhc2UgZm9yIHVuY29yZV90b19pOTE1IHJlbW92YWwuCgpTaWduZWQtb2ZmLWJ5 OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgfCAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jIHwgMTAxICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgICAzICstCiAzIGZpbGVzIGNoYW5nZWQsIDY3 IGluc2VydGlvbnMoKyksIDM5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmlu ZGV4IDI2Y2FhMGI1YjVkNy4uNzY5Y2ZiMTVlNmNhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK QEAgLTEyNjcsNyArMTI2Nyw3IEBAIGludCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAocmV0KQogCQlnb3RvIG91dDsKIAotCXJldCA9IGk5 MTVfcHBndHRfaW5pdF9odyhkZXZfcHJpdik7CisJcmV0ID0gaTkxNV9wcGd0dF9pbml0X2h3KCZk ZXZfcHJpdi0+Z3QpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJFbmFibGluZyBQUEdUVCBm YWlsZWQgKCVkKVxuIiwgcmV0KTsKIAkJZ290byBvdXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCmluZGV4IDY5N2U4NTExYWIyNC4uOWViYTU0NjBhZDE0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYwpAQCAtMTcyMCwyNSArMTcyMCwyOSBAQCBzdGF0aWMgaW5saW5lIHZv aWQgZ2VuNl93cml0ZV9wZGUoY29uc3Qgc3RydWN0IGdlbjZfcHBndHQgKnBwZ3R0LAogCQkgIHBw Z3R0LT5wZF9hZGRyICsgcGRlKTsKIH0KIAotc3RhdGljIHZvaWQgZ2VuN19wcGd0dF9lbmFibGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIHZvaWQgZ2VuN19wcGd0 dF9lbmFibGUoc3RydWN0IGludGVsX2d0ICpndCkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqaTkxNSA9IGd0LT5pOTE1OworCXN0cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSA9IGd0LT51 bmNvcmU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCXUzMiBlY29jaGssIGVj b2JpdHM7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAKLQllY29iaXRzID0gSTkxNV9SRUFE KEdBQ19FQ09fQklUUyk7Ci0JSTkxNV9XUklURShHQUNfRUNPX0JJVFMsIGVjb2JpdHMgfCBFQ09C SVRTX1BQR1RUX0NBQ0hFNjRCKTsKKwllY29iaXRzID0gaW50ZWxfdW5jb3JlX3JlYWQodW5jb3Jl LCBHQUNfRUNPX0JJVFMpOworCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsCisJCQkgICBHQUNf RUNPX0JJVFMsCisJCQkgICBlY29iaXRzIHwgRUNPQklUU19QUEdUVF9DQUNIRTY0Qik7CiAKLQll Y29jaGsgPSBJOTE1X1JFQUQoR0FNX0VDT0NISyk7Ci0JaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYp KSB7CisJZWNvY2hrID0gaW50ZWxfdW5jb3JlX3JlYWQodW5jb3JlLCBHQU1fRUNPQ0hLKTsKKwlp ZiAoSVNfSEFTV0VMTChpOTE1KSkgewogCQllY29jaGsgfD0gRUNPQ0hLX1BQR1RUX1dCX0hTVzsK IAl9IGVsc2UgewogCQllY29jaGsgfD0gRUNPQ0hLX1BQR1RUX0xMQ19JVkI7CiAJCWVjb2NoayAm PSB+RUNPQ0hLX1BQR1RUX0dGRFRfSVZCOwogCX0KLQlJOTE1X1dSSVRFKEdBTV9FQ09DSEssIGVj b2Noayk7CisJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwgR0FNX0VDT0NISywgZWNvY2hrKTsK IAotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgeworCWZvcl9lYWNoX2Vu Z2luZShlbmdpbmUsIGk5MTUsIGlkKSB7CiAJCS8qIEdGWF9NT0RFIGlzIHBlci1yaW5nIG9uIGdl bjcrICovCiAJCUVOR0lORV9XUklURShlbmdpbmUsCiAJCQkgICAgIFJJTkdfTU9ERV9HRU43LApA QCAtMTc0NiwyMiArMTc1MCwzMCBAQCBzdGF0aWMgdm9pZCBnZW43X3BwZ3R0X2VuYWJsZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfQogfQogCi1zdGF0aWMgdm9pZCBnZW42 X3BwZ3R0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMg dm9pZCBnZW42X3BwZ3R0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfZ3QgKmd0KQogeworCXN0cnVjdCBp bnRlbF91bmNvcmUgKnVuY29yZSA9IGd0LT51bmNvcmU7CiAJdTMyIGVjb2NoaywgZ2FiX2N0bCwg ZWNvYml0czsKIAotCWVjb2JpdHMgPSBJOTE1X1JFQUQoR0FDX0VDT19CSVRTKTsKLQlJOTE1X1dS SVRFKEdBQ19FQ09fQklUUywgZWNvYml0cyB8IEVDT0JJVFNfU05CX0JJVCB8Ci0JCSAgIEVDT0JJ VFNfUFBHVFRfQ0FDSEU2NEIpOworCWVjb2JpdHMgPSBpbnRlbF91bmNvcmVfcmVhZCh1bmNvcmUs IEdBQ19FQ09fQklUUyk7CisJaW50ZWxfdW5jb3JlX3dyaXRlKHVuY29yZSwKKwkJCSAgIEdBQ19F Q09fQklUUywKKwkJCSAgIGVjb2JpdHMgfCBFQ09CSVRTX1NOQl9CSVQgfCBFQ09CSVRTX1BQR1RU X0NBQ0hFNjRCKTsKIAotCWdhYl9jdGwgPSBJOTE1X1JFQUQoR0FCX0NUTCk7Ci0JSTkxNV9XUklU RShHQUJfQ1RMLCBnYWJfY3RsIHwgR0FCX0NUTF9DT05UX0FGVEVSX1BBR0VGQVVMVCk7CisJZ2Fi X2N0bCA9IGludGVsX3VuY29yZV9yZWFkKHVuY29yZSwgR0FCX0NUTCk7CisJaW50ZWxfdW5jb3Jl X3dyaXRlKHVuY29yZSwKKwkJCSAgIEdBQl9DVEwsCisJCQkgICBnYWJfY3RsIHwgR0FCX0NUTF9D T05UX0FGVEVSX1BBR0VGQVVMVCk7CiAKLQllY29jaGsgPSBJOTE1X1JFQUQoR0FNX0VDT0NISyk7 Ci0JSTkxNV9XUklURShHQU1fRUNPQ0hLLCBlY29jaGsgfCBFQ09DSEtfU05CX0JJVCB8IEVDT0NI S19QUEdUVF9DQUNIRTY0Qik7CisJZWNvY2hrID0gaW50ZWxfdW5jb3JlX3JlYWQodW5jb3JlLCBH QU1fRUNPQ0hLKTsKKwlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJICAgR0FNX0VDT0NI SywKKwkJCSAgIGVjb2NoayB8IEVDT0NIS19TTkJfQklUIHwgRUNPQ0hLX1BQR1RUX0NBQ0hFNjRC KTsKIAotCWlmIChIQVNfUFBHVFQoZGV2X3ByaXYpKSAvKiBtYXkgYmUgZGlzYWJsZWQgZm9yIFZU LWQgKi8KLQkJSTkxNV9XUklURShHRlhfTU9ERSwgX01BU0tFRF9CSVRfRU5BQkxFKEdGWF9QUEdU VF9FTkFCTEUpKTsKKwlpZiAoSEFTX1BQR1RUKHVuY29yZS0+aTkxNSkpIC8qIG1heSBiZSBkaXNh YmxlZCBmb3IgVlQtZCAqLworCQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJCSAgIEdG WF9NT0RFLAorCQkJCSAgIF9NQVNLRURfQklUX0VOQUJMRShHRlhfUFBHVFRfRU5BQkxFKSk7CiB9 CiAKIC8qIFBQR1RUIHN1cHBvcnQgZm9yIFNhbmR5YmRyaWdlL0dlbjYgYW5kIGxhdGVyICovCkBA IC0yMTc0LDIxICsyMTg2LDMyIEBAIHN0YXRpYyBzdHJ1Y3QgaTkxNV9wcGd0dCAqZ2VuNl9wcGd0 dF9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJcmV0dXJuIEVSUl9QVFIo ZXJyKTsKIH0KIAotc3RhdGljIHZvaWQgZ3R0X3dyaXRlX3dvcmthcm91bmRzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGd0dF93cml0ZV93b3JrYXJvdW5k cyhzdHJ1Y3QgaW50ZWxfZ3QgKmd0KQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 ID0gZ3QtPmk5MTU7CisJc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlID0gZ3QtPnVuY29yZTsK KwogCS8qIFRoaXMgZnVuY3Rpb24gaXMgZm9yIGd0dCByZWxhdGVkIHdvcmthcm91bmRzLiBUaGlz IGZ1bmN0aW9uIGlzCiAJICogY2FsbGVkIG9uIGRyaXZlciBsb2FkIGFuZCBhZnRlciBhIEdQVSBy ZXNldCwgc28geW91IGNhbiBwbGFjZQogCSAqIHdvcmthcm91bmRzIGhlcmUgZXZlbiBpZiB0aGV5 IGdldCBvdmVyd3JpdHRlbiBieSBHUFUgcmVzZXQuCiAJICovCiAJLyogV2FJbmNyZWFzZURlZmF1 bHRUTEJFbnRyaWVzOmNodixiZHcsc2tsLGJ4dCxrYmwsZ2xrLGNmbCxjbmwsaWNsICovCi0JaWYg KElTX0JST0FEV0VMTChkZXZfcHJpdikpCi0JCUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQ VSwgR0VOOF9MM19MUkFfMV9HUEdQVV9ERUZBVUxUX1ZBTFVFX0JEVyk7Ci0JZWxzZSBpZiAoSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpCi0JCUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQVSwg R0VOOF9MM19MUkFfMV9HUEdQVV9ERUZBVUxUX1ZBTFVFX0NIVik7Ci0JZWxzZSBpZiAoSVNfR0VO OV9MUChkZXZfcHJpdikpCi0JCUk5MTVfV1JJVEUoR0VOOF9MM19MUkFfMV9HUEdQVSwgR0VOOV9M M19MUkFfMV9HUEdQVV9ERUZBVUxUX1ZBTFVFX0JYVCk7Ci0JZWxzZSBpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA+PSA5KQotCQlJOTE1X1dSSVRFKEdFTjhfTDNfTFJBXzFfR1BHUFUsIEdFTjlfTDNf TFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9TS0wpOworCWlmIChJU19CUk9BRFdFTEwoaTkxNSkp CisJCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsCisJCQkJICAgR0VOOF9MM19MUkFfMV9HUEdQ VSwKKwkJCQkgICBHRU44X0wzX0xSQV8xX0dQR1BVX0RFRkFVTFRfVkFMVUVfQkRXKTsKKwllbHNl IGlmIChJU19DSEVSUllWSUVXKGk5MTUpKQorCQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAor CQkJCSAgIEdFTjhfTDNfTFJBXzFfR1BHUFUsCisJCQkJICAgR0VOOF9MM19MUkFfMV9HUEdQVV9E RUZBVUxUX1ZBTFVFX0NIVik7CisJZWxzZSBpZiAoSVNfR0VOOV9MUChpOTE1KSkKKwkJaW50ZWxf dW5jb3JlX3dyaXRlKHVuY29yZSwKKwkJCQkgICBHRU44X0wzX0xSQV8xX0dQR1BVLAorCQkJCSAg IEdFTjlfTDNfTFJBXzFfR1BHUFVfREVGQVVMVF9WQUxVRV9CWFQpOworCWVsc2UgaWYgKElOVEVM X0dFTihpOTE1KSA+PSA5KQorCQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJCSAgIEdF TjhfTDNfTFJBXzFfR1BHUFUsCisJCQkJICAgR0VOOV9MM19MUkFfMV9HUEdQVV9ERUZBVUxUX1ZB TFVFX1NLTCk7CiAKIAkvKgogCSAqIFRvIHN1cHBvcnQgNjRLIFBURXMgd2UgbmVlZCB0byBmaXJz dCBlbmFibGUgdGhlIHVzZSBvZiB0aGUKQEAgLTIyMDEsMjEgKzIyMjQsMjUgQEAgc3RhdGljIHZv aWQgZ3R0X3dyaXRlX3dvcmthcm91bmRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAkgKiAzMksgcGFnZXMsIGJ1dCB3ZSBkb24ndCBjdXJyZW50bHkgaGF2ZSBhbnkgc3VwcG9y dCBmb3IgaXQgaW4gb3VyCiAJICogZHJpdmVyLgogCSAqLwotCWlmIChIQVNfUEFHRV9TSVpFUyhk ZXZfcHJpdiwgSTkxNV9HVFRfUEFHRV9TSVpFXzY0SykgJiYKLQkgICAgSU5URUxfR0VOKGRldl9w cml2KSA8PSAxMCkKLQkJSTkxNV9XUklURShHRU44X0dBTVdfRUNPX0RFVl9SV19JQSwKLQkJCSAg IEk5MTVfUkVBRChHRU44X0dBTVdfRUNPX0RFVl9SV19JQSkgfAotCQkJICAgR0FNV19FQ09fRU5B QkxFXzY0S19JUFNfRklFTEQpOworCWlmIChIQVNfUEFHRV9TSVpFUyhpOTE1LCBJOTE1X0dUVF9Q QUdFX1NJWkVfNjRLKSAmJgorCSAgICBJTlRFTF9HRU4oaTkxNSkgPD0gMTApCisJCWludGVsX3Vu Y29yZV93cml0ZSh1bmNvcmUsCisJCQkJICAgR0VOOF9HQU1XX0VDT19ERVZfUldfSUEsCisJCQkJ ICAgaW50ZWxfdW5jb3JlX3JlYWQodW5jb3JlLAorCQkJCQkJICAgICBHRU44X0dBTVdfRUNPX0RF Vl9SV19JQSkgfAorCQkJCSAgIEdBTVdfRUNPX0VOQUJMRV82NEtfSVBTX0ZJRUxEKTsKIH0KIAot aW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CitpbnQgaTkxNV9wcGd0dF9pbml0X2h3KHN0cnVjdCBpbnRlbF9ndCAqZ3QpCiB7Ci0JZ3R0X3dy aXRlX3dvcmthcm91bmRzKGRldl9wcml2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSA9IGd0LT5pOTE1OworCisJZ3R0X3dyaXRlX3dvcmthcm91bmRzKGd0KTsKIAotCWlmIChJU19H RU4oZGV2X3ByaXYsIDYpKQotCQlnZW42X3BwZ3R0X2VuYWJsZShkZXZfcHJpdik7Ci0JZWxzZSBp ZiAoSVNfR0VOKGRldl9wcml2LCA3KSkKLQkJZ2VuN19wcGd0dF9lbmFibGUoZGV2X3ByaXYpOwor CWlmIChJU19HRU4oaTkxNSwgNikpCisJCWdlbjZfcHBndHRfZW5hYmxlKGd0KTsKKwllbHNlIGlm IChJU19HRU4oaTkxNSwgNykpCisJCWdlbjdfcHBndHRfZW5hYmxlKGd0KTsKIAogCXJldHVybiAw OwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCA0ZDZmOTY3NjNhOTguLjBm NTkxZmExODZmNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTY4LDYgKzY4 LDcgQEAKIHN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGU7CiBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdDsKIHN0cnVjdCBpOTE1X3ZtYTsKK3N0cnVjdCBpbnRlbF9ndDsKIAogdHlwZWRlZiB1 MzIgZ2VuNl9wdGVfdDsKIHR5cGVkZWYgdTY0IGdlbjhfcHRlX3Q7CkBAIC02NTYsNyArNjU3LDcg QEAgdm9pZCBpOTE1X2dndHRfZGlzYWJsZV9ndWMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUpOwogaW50IGk5MTVfZ2VtX2luaXRfZ2d0dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpOwogdm9pZCBpOTE1X2dndHRfY2xlYW51cF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpOwogCi1pbnQgaTkxNV9wcGd0dF9pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CitpbnQgaTkxNV9wcGd0dF9pbml0X2h3KHN0cnVjdCBpbnRlbF9n dCAqZ3QpOwogCiBzdHJ1Y3QgaTkxNV9wcGd0dCAqaTkxNV9wcGd0dF9jcmVhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=