From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthew Auld <matthew.auld@intel.com>
Subject: [PATCH 10/19] drm/i915: support 1G pages for the 48b
	PPGTT
Date: Wed, 21 Jun 2017 21:33:36 +0100
Message-ID: <20170621203345.26320-11-matthew.auld@intel.com>
References: <20170621203345.26320-1-matthew.auld@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTPS id E39F36E58B
 for <intel-gfx@lists.freedesktop.org>; Wed, 21 Jun 2017 20:33:59 +0000 (UTC)
In-Reply-To: <20170621203345.26320-1-matthew.auld@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

U3VwcG9ydCBpbnNlcnRpbmcgMUcgZ3R0IHBhZ2VzIGludG8gdGhlIDQ4YiBQUEdUVC4KClNpZ25l
ZC1vZmYtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KQ2M6IEpvb25h
cyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDcyICsrKysrKysrKysrKysrKysrKysrKysr
KysrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgIDIg
KysKIDIgZmlsZXMgY2hhbmdlZCwgNzAgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGRlNjcwODRkNWZjZi4uNmZlMTBlZTdk
Y2E4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtOTIyLDYgKzkyMiw2NSBA
QCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF8zbHZsKHN0cnVjdCBpOTE1X2FkZHJlc3Nf
c3BhY2UgKnZtLAogCQkJCSAgICAgIGNhY2hlX2xldmVsKTsKIH0KIAorc3RhdGljIHZvaWQgZ2Vu
OF9wcGd0dF9pbnNlcnRfaHVnZV9lbnRyaWVzKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAorCQkJCQkg
ICBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICoqcGRwcywKKwkJCQkJICAgc3Ry
dWN0IHNndF9kbWEgKml0ZXIsCisJCQkJCSAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9s
ZXZlbCkKK3sKKwljb25zdCBnZW44X3B0ZV90IHB0ZV9lbmNvZGUgPSBnZW44X3B0ZV9lbmNvZGUo
MCwgY2FjaGVfbGV2ZWwpOworCXU2NCBzdGFydCA9IHZtYS0+bm9kZS5zdGFydDsKKworCWRvIHsK
KwkJc3RydWN0IGdlbjhfaW5zZXJ0X3B0ZSBpZHggPSBnZW44X2luc2VydF9wdGUoc3RhcnQpOwor
CQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAgPSBwZHBzW2lkeC5wbWw0
ZV07CisJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZCA9IHBkcC0+cGFnZV9kaXJlY3Rv
cnlbaWR4LnBkcGVdOworCQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICpwdCA9IHBkLT5wYWdlX3Rh
YmxlW2lkeC5wZGVdOworCQlkbWFfYWRkcl90IHJlbSA9IGl0ZXItPm1heCAtIGl0ZXItPmRtYTsK
KwkJdW5zaWduZWQgaW50IHBhZ2Vfc2l6ZTsKKwkJZ2VuOF9wdGVfdCBlbmNvZGUgPSBwdGVfZW5j
b2RlOworCQlnZW44X3B0ZV90ICp2YWRkcjsKKwkJdTE2IGluZGV4LCBtYXg7CisKKwkJaWYgKHVu
bGlrZWx5KHZtYS0+cGFnZV9zaXplcy5zZyAmIEk5MTVfR1RUX1BBR0VfU0laRV8xRykgJiYKKwkJ
ICAgIElTX0FMSUdORUQoaXRlci0+ZG1hLCBJOTE1X0dUVF9QQUdFX1NJWkVfMUcpICYmCisJCSAg
ICByZW0gPj0gSTkxNV9HVFRfUEFHRV9TSVpFXzFHICYmICEoaWR4LnB0ZSB8IGlkeC5wZGUpKSB7
CisJCQl2YWRkciA9IGttYXBfYXRvbWljX3B4KHBkcCk7CisJCQlpbmRleCA9IGlkeC5wZHBlOwor
CQkJbWF4ID0gR0VOOF9QTUw0RVNfUEVSX1BNTDQ7CisJCQlwYWdlX3NpemUgPSBJOTE1X0dUVF9Q
QUdFX1NJWkVfMUc7CisJCQllbmNvZGUgfD0gR0VOOF9QRFBFX1BTXzFHOworCQl9IGVsc2Ugewor
CQkJdmFkZHIgPSBrbWFwX2F0b21pY19weChwdCk7CisJCQlpbmRleCA9IGlkeC5wdGU7CisJCQlt
YXggPSBHRU44X1BURVM7CisJCQlwYWdlX3NpemUgPSBJOTE1X0dUVF9QQUdFX1NJWkU7CisJCX0K
KworCQlkbyB7CisJCQl2YWRkcltpbmRleCsrXSA9IGVuY29kZSB8IGl0ZXItPmRtYTsKKworCQkJ
c3RhcnQgKz0gcGFnZV9zaXplOworCQkJaXRlci0+ZG1hICs9IHBhZ2Vfc2l6ZTsKKwkJCWlmIChp
dGVyLT5kbWEgPj0gaXRlci0+bWF4KSB7CisJCQkJaXRlci0+c2cgPSBfX3NnX25leHQoaXRlci0+
c2cpOworCQkJCWlmICghaXRlci0+c2cpCisJCQkJCWJyZWFrOworCisJCQkJaXRlci0+ZG1hID0g
c2dfZG1hX2FkZHJlc3MoaXRlci0+c2cpOworCQkJCWl0ZXItPm1heCA9IGl0ZXItPmRtYSArIGl0
ZXItPnNnLT5sZW5ndGg7CisKKwkJCQlpZiAodW5saWtlbHkoIUlTX0FMSUdORUQoaXRlci0+ZG1h
LCBwYWdlX3NpemUpKSkKKwkJCQkJYnJlYWs7CisJCQl9CisJCQlyZW0gPSBpdGVyLT5tYXggLSBp
dGVyLT5kbWE7CisKKwkJfSB3aGlsZSAocmVtID49IHBhZ2Vfc2l6ZSAmJiBpbmRleCA8IG1heCk7
CisKKwkJa3VubWFwX2F0b21pYyh2YWRkcik7CisKKwl9IHdoaWxlIChpdGVyLT5zZyk7Cit9CisK
IHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0XzRsdmwoc3RydWN0IGk5MTVfYWRkcmVzc19z
cGFjZSAqdm0sCiAJCQkJICAgc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJCQkJICAgZW51bSBpOTE1
X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLApAQCAtOTM0LDExICs5OTMsMTYgQEAgc3RhdGljIHZv
aWQgZ2VuOF9wcGd0dF9pbnNlcnRfNGx2bChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwK
IAkJLm1heCA9IGl0ZXIuZG1hICsgaXRlci5zZy0+bGVuZ3RoLAogCX07CiAJc3RydWN0IGk5MTVf
cGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqKnBkcHMgPSBwcGd0dC0+cG1sNC5wZHBzOwotCXN0cnVj
dCBnZW44X2luc2VydF9wdGUgaWR4ID0gZ2VuOF9pbnNlcnRfcHRlKHZtYS0+bm9kZS5zdGFydCk7
CiAKLQl3aGlsZSAoZ2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXMocHBndHQsIHBkcHNbaWR4
LnBtbDRlKytdLCAmaXRlciwKLQkJCQkJICAgICAmaWR4LCBjYWNoZV9sZXZlbCkpCi0JCUdFTV9C
VUdfT04oaWR4LnBtbDRlID49IEdFTjhfUE1MNEVTX1BFUl9QTUw0KTsKKwlpZiAodm1hLT5wYWdl
X3NpemVzLnNnID4gSTkxNV9HVFRfUEFHRV9TSVpFKSB7CisJCWdlbjhfcHBndHRfaW5zZXJ0X2h1
Z2VfZW50cmllcyh2bWEsIHBkcHMsICZpdGVyLCBjYWNoZV9sZXZlbCk7CisJfSBlbHNlIHsKKwkJ
c3RydWN0IGdlbjhfaW5zZXJ0X3B0ZSBpZHggPSBnZW44X2luc2VydF9wdGUodm1hLT5ub2RlLnN0
YXJ0KTsKKworCQl3aGlsZSAoZ2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXMocHBndHQsIHBk
cHNbaWR4LnBtbDRlKytdLAorCQkJCQkJICAgICAmaXRlciwgJmlkeCwgY2FjaGVfbGV2ZWwpKQor
CQkJR0VNX0JVR19PTihpZHgucG1sNGUgPj0gR0VOOF9QTUw0RVNfUEVSX1BNTDQpOworCX0KIH0K
IAogc3RhdGljIHZvaWQgZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nf
c3BhY2UgKnZtLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0
LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCA0YzJmN2Q3YzFl
N2QuLjBkMzFiNDZjZGUwMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
ZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTE0
OSw2ICsxNDksOCBAQCB0eXBlZGVmIHU2NCBnZW44X3BwZ3R0X3BtbDRlX3Q7CiAjZGVmaW5lIEdF
TjhfUFBBVF9FTExDX09WRVJSSURFCQkoMDw8MikKICNkZWZpbmUgR0VOOF9QUEFUKGksIHgpCQkJ
KCh1NjQpKHgpIDw8ICgoaSkgKiA4KSkKIAorI2RlZmluZSBHRU44X1BEUEVfUFNfMUcgIEJJVCg3
KQorCiBzdHJ1Y3Qgc2dfdGFibGU7CiAKIHN0cnVjdCBpbnRlbF9yb3RhdGlvbl9pbmZvIHsKLS0g
CjIuOS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ
bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0
cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK