From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Paauwe Subject: [PATCH] drm/i915: Make 48bit full ppgtt configuration generic (v2) Date: Thu, 6 Sep 2018 13:04:09 -0700 Message-ID: <20180906200409.4069910-1-bob.j.paauwe@intel.com> References: <20180831154704.3800568-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 52B3C6E72D for ; Thu, 6 Sep 2018 20:04:09 +0000 (UTC) In-Reply-To: <20180831154704.3800568-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 Cc: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org NDggYml0IHBwZ3R0IGRldmljZSBjb25maWd1cmF0aW9uIGlzIHJlYWxseSBqdXN0IGV4dGVuZGVk IGFkZHJlc3MKcmFuZ2UgZnVsbCBwcGd0dCBhbmQgbWF5IGFjdHVhbGx5IGJlIHNvbWV0aGluZyBv dGhlciB0aGFuIDQ4IGJpdHMuCgpDaGFuZ2UgVVNFU19GVUxMXzQ4QklUX1BQR1RUKCkgdG8gVVNF U19GVUxMXzRMVkxfUFBHVFQoKSB0byBiZXR0ZXIKZGVzY3JpYmUgdGhhdCBhIDQgbGV2ZWwgd2Fs ayB0YWJsZSBleHRlbmRlZCByYW5nZSBQUEdUVCBpcyBiZWluZwp1c2VkLiBBZGQgYSBuZXcgZGV2 aWNlIGluZm8gZmllbGQgdGhhdCBzcGVjaWZpZXMgdGhlIG51bWJlciBvZgpiaXRzIHRvIHByZXBh cmUgZm9yIGNhc2VzIHdoZXJlIHRoZSByYW5nZSBpcyBub3QgMzIgb3IgNDggYml0cy4KCnYyOiBr ZWVwIFVTRVNfRlVMTF9QUEdUVCgpIHVuY2hhbmdlZCAoQ2hyaXMpCgpTaWduZWQtb2ZmLWJ5OiBC b2IgUGFhdXdlIDxib2Iuai5wYWF1d2VAaW50ZWwuY29tPgpDQzogUm9kcmlnbyBWaXZpIDxyb2Ry aWdvLnZpdmlAaW50ZWwuY29tPgpDQzogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGlu dGVsLmNvbT4KQ0M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICAgICAgICB8ICAyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgICAgICAgICAgICAgfCAxOSAr KysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jICAgICAg ICAgICAgICAgICAgfCAgNyArKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZp Y2VfaW5mby5oICAgICAgICAgfCAgMyArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0 cy9odWdlX3BhZ2VzLmMgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVz dHMvbW9ja19nZW1fZGV2aWNlLmMgfCAgMiArKwogNiBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRp b25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA1YTRk YTViNzIzZmQuLmEzNjc2ODZmZDczNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNTY5 LDcgKzI1NjksNyBAQCBpbnRlbF9pbmZvKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAogI2RlZmluZSBVU0VTX1BQR1RUKGRldl9wcml2KQkJKGk5MTVfbW9kcGFyYW1z LmVuYWJsZV9wcGd0dCkKICNkZWZpbmUgVVNFU19GVUxMX1BQR1RUKGRldl9wcml2KQkoaTkxNV9t b2RwYXJhbXMuZW5hYmxlX3BwZ3R0ID49IDIpCi0jZGVmaW5lIFVTRVNfRlVMTF80OEJJVF9QUEdU VChkZXZfcHJpdikJKGk5MTVfbW9kcGFyYW1zLmVuYWJsZV9wcGd0dCA9PSAzKQorI2RlZmluZSBV U0VTX0ZVTExfNExWTF9QUEdUVChkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uZnVsbF9wcGd0 dF9iaXRzID4gMzIpCiAjZGVmaW5lIEhBU19QQUdFX1NJWkVTKGRldl9wcml2LCBzaXplcykgKHsg XAogCUdFTV9CVUdfT04oKHNpemVzKSA9PSAwKTsgXAogCSgoc2l6ZXMpICYgfihkZXZfcHJpdikt PmluZm8ucGFnZV9zaXplcykgPT0gMDsgXApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpp bmRleCBlYjBlNDQ2ZDY0ODIuLjUzMGE0YzE0NTJiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMKQEAgLTEzNywxOCArMTM3LDE4IEBAIGludCBpbnRlbF9zYW5pdGl6ZV9lbmFibGVf cHBndHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgIAlpbnQg ZW5hYmxlX3BwZ3R0KQogewogCWJvb2wgaGFzX2Z1bGxfcHBndHQ7Ci0JYm9vbCBoYXNfZnVsbF80 OGJpdF9wcGd0dDsKKwlib29sIGhhc19mdWxsXzRsdmxfcHBndHQ7CiAKIAlpZiAoIWRldl9wcml2 LT5pbmZvLmhhc19hbGlhc2luZ19wcGd0dCkKIAkJcmV0dXJuIDA7CiAKIAloYXNfZnVsbF9wcGd0 dCA9IGRldl9wcml2LT5pbmZvLmhhc19mdWxsX3BwZ3R0OwotCWhhc19mdWxsXzQ4Yml0X3BwZ3R0 ID0gZGV2X3ByaXYtPmluZm8uaGFzX2Z1bGxfNDhiaXRfcHBndHQ7CisJaGFzX2Z1bGxfNGx2bF9w cGd0dCA9IFVTRVNfRlVMTF80TFZMX1BQR1RUKGRldl9wcml2KTsKIAogCWlmIChpbnRlbF92Z3B1 X2FjdGl2ZShkZXZfcHJpdikpIHsKIAkJLyogR1ZULWcgaGFzIG5vIHN1cHBvcnQgZm9yIDMyYml0 IHBwZ3R0ICovCiAJCWhhc19mdWxsX3BwZ3R0ID0gZmFsc2U7Ci0JCWhhc19mdWxsXzQ4Yml0X3Bw Z3R0ID0gaW50ZWxfdmdwdV9oYXNfZnVsbF80OGJpdF9wcGd0dChkZXZfcHJpdik7CisJCWhhc19m dWxsXzRsdmxfcHBndHQgPSBpbnRlbF92Z3B1X2hhc19mdWxsXzQ4Yml0X3BwZ3R0KGRldl9wcml2 KTsKIAl9CiAKIAkvKgpAQCAtMTY0LDcgKzE2NCw3IEBAIGludCBpbnRlbF9zYW5pdGl6ZV9lbmFi bGVfcHBndHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWlmIChlbmFibGVf cHBndHQgPT0gMiAmJiBoYXNfZnVsbF9wcGd0dCkKIAkJcmV0dXJuIDI7CiAKLQlpZiAoZW5hYmxl X3BwZ3R0ID09IDMgJiYgaGFzX2Z1bGxfNDhiaXRfcHBndHQpCisJaWYgKGVuYWJsZV9wcGd0dCA9 PSAzICYmIGhhc19mdWxsXzRsdmxfcHBndHQpCiAJCXJldHVybiAzOwogCiAJLyogRGlzYWJsZSBw cGd0dCBvbiBTTkIgaWYgVlQtZCBpcyBvbi4gKi8KQEAgLTE3Myw3ICsxNzMsNyBAQCBpbnQgaW50 ZWxfc2FuaXRpemVfZW5hYmxlX3BwZ3R0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkJcmV0dXJuIDA7CiAJfQogCi0JaWYgKGhhc19mdWxsXzQ4Yml0X3BwZ3R0KQorCWlmICho YXNfZnVsbF80bHZsX3BwZ3R0KQogCQlyZXR1cm4gMzsKIAogCWlmIChoYXNfZnVsbF9wcGd0dCkK QEAgLTE2NDcsOSArMTY0NywxMCBAQCBzdGF0aWMgc3RydWN0IGk5MTVfaHdfcHBndHQgKmdlbjhf cHBndHRfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCXBwZ3R0LT52bS5p OTE1ID0gaTkxNTsKIAlwcGd0dC0+dm0uZG1hID0gJmk5MTUtPmRybS5wZGV2LT5kZXY7CiAKLQlw cGd0dC0+dm0udG90YWwgPSBVU0VTX0ZVTExfNDhCSVRfUFBHVFQoaTkxNSkgPwotCQkxVUxMIDw8 IDQ4IDoKLQkJMVVMTCA8PCAzMjsKKwlpZiAoKGk5MTVfbW9kcGFyYW1zLmVuYWJsZV9wcGd0dCA8 IDMpICYmIFVTRVNfRlVMTF80TFZMX1BQR1RUKGk5MTUpKQorCQlwcGd0dC0+dm0udG90YWwgPSAx VUxMIDw8IDMyOworCWVsc2UKKwkJcHBndHQtPnZtLnRvdGFsID0gMVVMTCA8PCBpOTE1LT5pbmZv LmZ1bGxfcHBndHRfYml0czsKIAogCS8qCiAJICogRnJvbSBiZHcsIHRoZXJlIGlzIHN1cHBvcnQg Zm9yIHJlYWQtb25seSBwYWdlcyBpbiB0aGUgUFBHVFQuCkBAIC0xNzg4LDcgKzE3ODksNyBAQCBz dGF0aWMgdm9pZCBnZW44X3BwZ3R0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAKIAlmb3JfZWFjaF9lbmdpbmUoZW5n aW5lLCBkZXZfcHJpdiwgaWQpIHsKLQkJdTMyIGZvdXJfbGV2ZWwgPSBVU0VTX0ZVTExfNDhCSVRf UFBHVFQoZGV2X3ByaXYpID8KKwkJdTMyIGZvdXJfbGV2ZWwgPSBVU0VTX0ZVTExfNExWTF9QUEdU VChkZXZfcHJpdikgPwogCQkJCSBHRU44X0dGWF9QUEdUVF80OEIgOiAwOwogCQlJOTE1X1dSSVRF KFJJTkdfTU9ERV9HRU43KGVuZ2luZSksCiAJCQkgICBfTUFTS0VEX0JJVF9FTkFCTEUoR0ZYX1BQ R1RUX0VOQUJMRSB8IGZvdXJfbGV2ZWwpKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcGNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCmluZGV4IGQ2 ZjdiOWZlMWQyNi4uYTk5YzFmNmRlNjRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3BjaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMKQEAgLTI5 OSw2ICsyOTksNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVs X3NhbmR5YnJpZGdlX21fZ3QyX2luZm8gPSB7CiAJLmhhc19yYzZwID0gMSwgXAogCS5oYXNfYWxp YXNpbmdfcHBndHQgPSAxLCBcCiAJLmhhc19mdWxsX3BwZ3R0ID0gMSwgXAorCS5mdWxsX3BwZ3R0 X2JpdHMgPSAzMiwgXAogCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLCBcCiAJR0VOX0RFRkFVTFRf UEFHRV9TSVpFUywgXAogCUlWQl9DVVJTT1JfT0ZGU0VUUwpAQCAtMzUzLDYgKzM1NCw3IEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfdmFsbGV5dmlld19pbmZv ID0gewogCS5oYXNfaG90cGx1ZyA9IDEsCiAJLmhhc19hbGlhc2luZ19wcGd0dCA9IDEsCiAJLmhh c19mdWxsX3BwZ3R0ID0gMSwKKwkuZnVsbF9wcGd0dF9iaXRzID0gMzIsIFwKIAkuaGFzX3Nub29w ID0gdHJ1ZSwKIAkuaGFzX2NvaGVyZW50X2dndHQgPSBmYWxzZSwKIAkucmluZ19tYXNrID0gUkVO REVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HLApAQCAtMzk5LDcgKzQwMSw3IEBAIHN0YXRp YyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfaGFzd2VsbF9ndDNfaW5mbyA9 IHsKIAkucGFnZV9zaXplcyA9IEk5MTVfR1RUX1BBR0VfU0laRV80SyB8IFwKIAkJICAgICAgSTkx NV9HVFRfUEFHRV9TSVpFXzJNLCBcCiAJLmhhc19sb2dpY2FsX3JpbmdfY29udGV4dHMgPSAxLCBc Ci0JLmhhc19mdWxsXzQ4Yml0X3BwZ3R0ID0gMSwgXAorCS5mdWxsX3BwZ3R0X2JpdHMgPSA0OCwg XAogCS5oYXNfNjRiaXRfcmVsb2MgPSAxLCBcCiAJLmhhc19yZXNldF9lbmdpbmUgPSAxCiAKQEAg LTQ0NSw2ICs0NDcsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGlu dGVsX2NoZXJyeXZpZXdfaW5mbyA9IHsKIAkuaGFzX2dtY2hfZGlzcGxheSA9IDEsCiAJLmhhc19h bGlhc2luZ19wcGd0dCA9IDEsCiAJLmhhc19mdWxsX3BwZ3R0ID0gMSwKKwkuZnVsbF9wcGd0dF9i aXRzID0gMzIsIFwKIAkuaGFzX3Jlc2V0X2VuZ2luZSA9IDEsCiAJLmhhc19zbm9vcCA9IHRydWUs CiAJLmhhc19jb2hlcmVudF9nZ3R0ID0gZmFsc2UsCkBAIC01MjAsNyArNTIzLDcgQEAgc3RhdGlj IGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9za3lsYWtlX2d0NF9pbmZvID0g ewogCS5oYXNfZ3VjID0gMSwgXAogCS5oYXNfYWxpYXNpbmdfcHBndHQgPSAxLCBcCiAJLmhhc19m dWxsX3BwZ3R0ID0gMSwgXAotCS5oYXNfZnVsbF80OGJpdF9wcGd0dCA9IDEsIFwKKwkuZnVsbF9w cGd0dF9iaXRzID0gNDgsIFwKIAkuaGFzX3Jlc2V0X2VuZ2luZSA9IDEsIFwKIAkuaGFzX3Nub29w ID0gdHJ1ZSwgXAogCS5oYXNfY29oZXJlbnRfZ2d0dCA9IGZhbHNlLCBcCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uaAppbmRleCA2ZWVjZDY0NzM0ZDUuLjA4MzU5MGU5ODE5 NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5oCkBAIC0xODIsNiAr MTgyLDkgQEAgc3RydWN0IGludGVsX2RldmljZV9pbmZvIHsKIAkJdTE2IGRlZ2FtbWFfbHV0X3Np emU7CiAJCXUxNiBnYW1tYV9sdXRfc2l6ZTsKIAl9IGNvbG9yOworCisJLyogUFBHVFQgYml0IHNp emUgKi8KKwlpbnQgZnVsbF9wcGd0dF9iaXRzOwogfTsKIAogc3RydWN0IGludGVsX2RyaXZlcl9j YXBzIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9odWdlX3Bh Z2VzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaHVnZV9wYWdlcy5jCmluZGV4 IGUyNzIxMjc3ODNmZS4uOWY3NDI0NGVmM2UxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9zZWxmdGVzdHMvaHVnZV9wYWdlcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl bGZ0ZXN0cy9odWdlX3BhZ2VzLmMKQEAgLTE0MzQsNyArMTQzNCw3IEBAIHN0YXRpYyBpbnQgaWd0 X3BwZ3R0X3Bpbl91cGRhdGUodm9pZCAqYXJnKQogCSAqIGh1Z2UtZ3R0LXBhZ2VzLgogCSAqLwog Ci0JaWYgKCFVU0VTX0ZVTExfNDhCSVRfUFBHVFQoZGV2X3ByaXYpKSB7CisJaWYgKCFVU0VTX0ZV TExfNExWTF9QUEdUVChkZXZfcHJpdikpIHsKIAkJcHJfaW5mbygiNDhiIFBQR1RUIG5vdCBzdXBw b3J0ZWQsIHNraXBwaW5nXG4iKTsKIAkJcmV0dXJuIDA7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jCmluZGV4IDQzZWQ4YjI4YWVhYS4u MzNkNzIyNWVkYmJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMv bW9ja19nZW1fZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21v Y2tfZ2VtX2RldmljZS5jCkBAIC0xODEsNiArMTgxLDggQEAgc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKm1vY2tfZ2VtX2RldmljZSh2b2lkKQogCQlJOTE1X0dUVF9QQUdFX1NJWkVfNjRLIHwKIAkJ STkxNV9HVFRfUEFHRV9TSVpFXzJNOwogCisJbWt3cml0ZV9kZXZpY2VfaW5mbyhpOTE1KS0+ZnVs bF9wcGd0dF9iaXRzID0gNDg7CisKIAltb2NrX3VuY29yZV9pbml0KGk5MTUpOwogCWk5MTVfZ2Vt X2luaXRfX21tKGk5MTUpOwogCi0tIAoyLjE0LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=