From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Paauwe Subject: [PATCH 2/3] drm/i915: Remove HAS_4LVL_PPGTT Date: Wed, 31 Oct 2018 08:54:14 -0700 Message-ID: <20181031155415.579111-2-bob.j.paauwe@intel.com> References: <20181029213951.544255-1-bob.j.paauwe@intel.com> <20181031155415.579111-1-bob.j.paauwe@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id E3F636E321 for ; Wed, 31 Oct 2018 15:54:15 +0000 (UTC) In-Reply-To: <20181031155415.579111-1-bob.j.paauwe@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 List-Id: intel-gfx@lists.freedesktop.org V2Ugbm8gbG9uZ2VyIG5lZWQgdG8gZGlmZmVyZW50aWF0ZSBiZXR3ZWVuIDRMVkwgYW5kIEZVTEwg cHBndHQgYXMKdGhlIG51bWJlciBvZiBiaXRzIGluIHRoZSBhZGRyZXNzIHJhbmdlIHByb3ZpZGVz IHRoYXQgaW5mb3JtYXRpb24gbm93LgoKU2lnbmVkLW9mZi1ieTogQm9iIFBhYXV3ZSA8Ym9iLmou cGFhdXdlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAg ICAgICAgICAgIHwgMiAtLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYyAgICAgICAg ICAgICB8IDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uaCAg ICB8IDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2h1Z2VfcGFnZXMuYyB8IDQg KystLQogNCBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYjEwOWZjMGMyOWJlLi41YjEwNGRhZDc1ZDggMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjU4Nyw4ICsyNTg3LDYgQEAgaW50ZWxfaW5mbyhj b25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJKElOVEVMX1BQR1RUKGRl dl9wcml2KSAhPSBJTlRFTF9QUEdUVF9OT05FKQogI2RlZmluZSBIQVNfRlVMTF9QUEdUVChkZXZf cHJpdikgXAogCShJTlRFTF9QUEdUVChkZXZfcHJpdikgPj0gSU5URUxfUFBHVFRfRlVMTCkKLSNk ZWZpbmUgSEFTXzRMVkxfUFBHVFQoZGV2X3ByaXYpCVwKLQkoSU5URUxfUFBHVFQoZGV2X3ByaXYp ID49IElOVEVMX1BQR1RUX0ZVTExfNExWTCkKIAogI2RlZmluZSBIQVNfUEFHRV9TSVpFUyhkZXZf cHJpdiwgc2l6ZXMpICh7IFwKIAlHRU1fQlVHX09OKChzaXplcykgPT0gMCk7IFwKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3BjaS5jCmluZGV4IDdmZDExNTBkNGJhZi4uZmFjNGM2OWNiNWRiIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcGNpLmMKQEAgLTQwMCw3ICs0MDAsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGlu dGVsX2RldmljZV9pbmZvIGludGVsX2hhc3dlbGxfZ3QzX2luZm8gPSB7CiAJLnBhZ2Vfc2l6ZXMg PSBJOTE1X0dUVF9QQUdFX1NJWkVfNEsgfCBcCiAJCSAgICAgIEk5MTVfR1RUX1BBR0VfU0laRV8y TSwgXAogCS5oYXNfbG9naWNhbF9yaW5nX2NvbnRleHRzID0gMSwgXAotCS5wcGd0dCA9IElOVEVM X1BQR1RUX0ZVTExfNExWTCwgXAorCS5wcGd0dCA9IElOVEVMX1BQR1RUX0ZVTEwsIFwKIAkucHBn dHRfYml0cyA9IDQ4LCBcCiAJLmhhc182NGJpdF9yZWxvYyA9IDEsIFwKIAkuaGFzX3Jlc2V0X2Vu Z2luZSA9IDEKQEAgLTUyMiw3ICs1MjIsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2Rl dmljZV9pbmZvIGludGVsX3NreWxha2VfZ3Q0X2luZm8gPSB7CiAJLmhhc19sb2dpY2FsX3Jpbmdf Y29udGV4dHMgPSAxLCBcCiAJLmhhc19sb2dpY2FsX3JpbmdfcHJlZW1wdGlvbiA9IDEsIFwKIAku aGFzX2d1YyA9IDEsIFwKLQkucHBndHQgPSBJTlRFTF9QUEdUVF9GVUxMXzRMVkwsIFwKKwkucHBn dHQgPSBJTlRFTF9QUEdUVF9GVUxMLCBcCiAJLnBwZ3R0X2JpdHMgPSA0OCwgXAogCS5oYXNfcmVz ZXRfZW5naW5lID0gMSwgXAogCS5oYXNfc25vb3AgPSB0cnVlLCBcCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGV2aWNlX2luZm8uaAppbmRleCA0OTgwZGE4Y2NmYzMuLmRjNjBiZTRiMTQzNSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5oCkBAIC04MCw3ICs4MCw2 IEBAIGVudW0gaW50ZWxfcHBndHQgewogCUlOVEVMX1BQR1RUX05PTkUgPSBJOTE1X0dFTV9QUEdU VF9OT05FLAogCUlOVEVMX1BQR1RUX0FMSUFTSU5HID0gSTkxNV9HRU1fUFBHVFRfQUxJQVNJTkcs CiAJSU5URUxfUFBHVFRfRlVMTCA9IEk5MTVfR0VNX1BQR1RUX0ZVTEwsCi0JSU5URUxfUFBHVFRf RlVMTF80TFZMLAogfTsKIAogI2RlZmluZSBERVZfSU5GT19GT1JfRUFDSF9GTEFHKGZ1bmMpIFwK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9odWdlX3BhZ2VzLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaHVnZV9wYWdlcy5jCmluZGV4IDYwYjAx Mjc4MTAwMi4uOTVhYmY4NDc1NDY0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9z ZWxmdGVzdHMvaHVnZV9wYWdlcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0 cy9odWdlX3BhZ2VzLmMKQEAgLTE0MzYsNyArMTQzNiw3IEBAIHN0YXRpYyBpbnQgaWd0X3BwZ3R0 X3Bpbl91cGRhdGUodm9pZCAqYXJnKQogCSAqIGh1Z2UtZ3R0LXBhZ2VzLgogCSAqLwogCi0JaWYg KCFIQVNfNExWTF9QUEdUVChkZXZfcHJpdikpIHsKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdikt PnBwZ3R0X2JpdHMgPD0gMzIpIHsKIAkJcHJfaW5mbygiRXh0ZW5kZWQgcmFuZ2UgUFBHVFQgbm90 IHN1cHBvcnRlZCwgc2tpcHBpbmdcbiIpOwogCQlyZXR1cm4gMDsKIAl9CkBAIC0xNjk3LDcgKzE2 OTcsNyBAQCBpbnQgaTkxNV9nZW1faHVnZV9wYWdlX21vY2tfc2VsZnRlc3RzKHZvaWQpCiAJCXJl dHVybiAtRU5PTUVNOwogCiAJLyogUHJldGVuZCB0byBiZSBhIGRldmljZSB3aGljaCBzdXBwb3J0 cyB0aGUgNDhiIFBQR1RUICovCi0JbWt3cml0ZV9kZXZpY2VfaW5mbyhkZXZfcHJpdiktPnBwZ3R0 ID0gSU5URUxfUFBHVFRfRlVMTF80TFZMOworCW1rd3JpdGVfZGV2aWNlX2luZm8oZGV2X3ByaXYp LT5wcGd0dCA9IElOVEVMX1BQR1RUX0ZVTEw7CiAKIAlwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2 OwogCWRtYV9jb2VyY2VfbWFza19hbmRfY29oZXJlbnQoJnBkZXYtPmRldiwgRE1BX0JJVF9NQVNL KDM5KSk7Ci0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=