From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthew Auld <matthew.auld@intel.com>
Subject: [PATCH 07/15] drm/i915: pass mm.gtt_page_sizes to ppgtt
	insert_entries
Date: Wed, 31 May 2017 19:52:02 +0100
Message-ID: <20170531185210.29189-8-matthew.auld@intel.com>
References: <20170531185210.29189-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 mga04.intel.com (mga04.intel.com [192.55.52.120])
 by gabe.freedesktop.org (Postfix) with ESMTPS id D57656E2E2
 for <intel-gfx@lists.freedesktop.org>; Wed, 31 May 2017 18:52:21 +0000 (UTC)
In-Reply-To: <20170531185210.29189-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

SW4gcHJlcGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgaHVnZS1wYWdlcyBmb3IgdGhlIHBwZ3R0LCB3
ZSBuZWVkIHRvIGtub3cKdGhlIGRldGFpbHMgb2YgbW0ucGFnZV9zaXplcyBhdCBpbnNlcnRpb24g
dGltZSwgc3VjaCB0aGF0IHdlIGNhbiB3ZSBjYW4KZWFzaWx5IGRldGVybWluZSB0aGUgcGFnZSBz
aXplcyB3ZSBhcmUgYWxsb3dlZCB0byB1c2UuICBUaGlzIGlzCmVzcGVjaWFsbHkgdHJ1ZSBmb3Ig
NjRLIHdoZXJlIHdlIGNhbid0IGp1c3QgYXJiaXRyYXJpbHkgdXNlIGl0LCBzaW5jZSB3ZQpyZXF1
aXJlIGFsaWduaW5nL3BhZGRpbmcgdGhlIHZtIHNwYWNlIHRvIDJNLCB3aGljaCBzb21ldGltZXMg
d2UgY2FuJ3QKZW5mb3JjZS4KClNpZ25lZC1vZmYtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5h
dWxkQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4
LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgICAg
ICAgICAgfCAyNCArKysrKysrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtX2d0dC5oICAgICAgICAgICB8ICAzICsrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv
c2VsZnRlc3RzL2k5MTVfZ2VtX2d0dC5jIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9z
ZWxmdGVzdHMvbW9ja19ndHQuYyAgICAgfCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDIyIGluc2Vy
dGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpp
bmRleCAwYzEwMDhhMmJiZGEuLjkzNTY1NjgwMmYwOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
ZW1fZ3R0LmMKQEAgLTIwOCw3ICsyMDgsOCBAQCBzdGF0aWMgaW50IHBwZ3R0X2JpbmRfdm1hKHN0
cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQlwdGVfZmxhZ3MgfD0gUFRFX1JFQURfT05MWTsKIAogCXZt
YS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIHZtYS0+cGFnZXMsIHZtYS0+bm9kZS5zdGFy
dCwKLQkJCQljYWNoZV9sZXZlbCwgcHRlX2ZsYWdzKTsKKwkJCQkmdm1hLT5vYmotPm1tLnBhZ2Vf
c2l6ZXMsIGNhY2hlX2xldmVsLAorCQkJCXB0ZV9mbGFncyk7CiAKIAlyZXR1cm4gMDsKIH0KQEAg
LTkwOSw2ICs5MTAsNyBAQCBnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllcyhzdHJ1Y3QgaTkx
NV9od19wcGd0dCAqcHBndHQsCiBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF8zbHZsKHN0
cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCSAgIHN0cnVjdCBzZ190YWJsZSAqcGFn
ZXMsCiAJCQkJICAgdTY0IHN0YXJ0LAorCQkJCSAgIHN0cnVjdCBpOTE1X3BhZ2Vfc2l6ZXMgKnBh
Z2Vfc2l6ZXMsCiAJCQkJICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAogCQkJ
CSAgIHUzMiB1bnVzZWQpCiB7CkBAIC05MjcsNiArOTI5LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9w
cGd0dF9pbnNlcnRfM2x2bChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHN0YXRpYyB2
b2lkIGdlbjhfcHBndHRfaW5zZXJ0XzRsdmwoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s
CiAJCQkJICAgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKIAkJCQkgICB1NjQgc3RhcnQsCisJCQkJ
ICAgc3RydWN0IGk5MTVfcGFnZV9zaXplcyAqcGFnZV9zaXplcywKIAkJCQkgICBlbnVtIGk5MTVf
Y2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCiAJCQkJICAgdTMyIHVudXNlZCkKIHsKQEAgLTE2MjMs
NiArMTYyNiw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5
MTVfYWRkcmVzc19zcGFjZSAqdm0sCiBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2luc2VydF9lbnRy
aWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCSAgICAgIHN0cnVjdCBzZ190
YWJsZSAqcGFnZXMsCiAJCQkJICAgICAgdTY0IHN0YXJ0LAorCQkJCSAgICAgIHN0cnVjdCBpOTE1
X3BhZ2Vfc2l6ZXMgKnBhZ2Vfc2l6ZXMsCiAJCQkJICAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVs
IGNhY2hlX2xldmVsLAogCQkJCSAgICAgIHUzMiBmbGFncykKIHsKQEAgLTIwOTIsNiArMjA5Niw3
IEBAIHN0YXRpYyB2b2lkIGdlbjhfZ2d0dF9pbnNlcnRfcGFnZShzdHJ1Y3QgaTkxNV9hZGRyZXNz
X3NwYWNlICp2bSwKIHN0YXRpYyB2b2lkIGdlbjhfZ2d0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3Qg
aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgIHN0cnVjdCBzZ190YWJsZSAqc3QsCiAJ
CQkJICAgICB1NjQgc3RhcnQsCisJCQkJICAgICBzdHJ1Y3QgaTkxNV9wYWdlX3NpemVzICpwYWdl
X3NpemVzLAogCQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsLAogCQkJCSAgICAg
dTMyIHVudXNlZCkKIHsKQEAgLTIxMzksNiArMjE0NCw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfZ2d0
dF9pbnNlcnRfcGFnZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHN0YXRpYyB2b2lk
IGdlbjZfZ2d0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwK
IAkJCQkgICAgIHN0cnVjdCBzZ190YWJsZSAqc3QsCiAJCQkJICAgICB1NjQgc3RhcnQsCisJCQkJ
ICAgICBzdHJ1Y3QgaTkxNV9wYWdlX3NpemVzICpwYWdlX3NpemVzLAogCQkJCSAgICAgZW51bSBp
OTE1X2NhY2hlX2xldmVsIGxldmVsLAogCQkJCSAgICAgdTMyIGZsYWdzKQogewpAQCAtMjIzOCw3
ICsyMjQ0LDcgQEAgc3RhdGljIGludCBieHRfdnRkX2dndHRfaW5zZXJ0X2VudHJpZXNfX2NiKHZv
aWQgKl9hcmcpCiB7CiAJc3RydWN0IGluc2VydF9lbnRyaWVzICphcmcgPSBfYXJnOwogCi0JZ2Vu
OF9nZ3R0X2luc2VydF9lbnRyaWVzKGFyZy0+dm0sIGFyZy0+c3QsIGFyZy0+c3RhcnQsIGFyZy0+
bGV2ZWwsIDApOworCWdlbjhfZ2d0dF9pbnNlcnRfZW50cmllcyhhcmctPnZtLCBhcmctPnN0LCBh
cmctPnN0YXJ0LCAwLCBhcmctPmxldmVsLCAwKTsKIAlieHRfdnRkX2dndHRfd2EoYXJnLT52bSk7
CiAKIAlyZXR1cm4gMDsKQEAgLTIyNDcsNiArMjI1Myw3IEBAIHN0YXRpYyBpbnQgYnh0X3Z0ZF9n
Z3R0X2luc2VydF9lbnRyaWVzX19jYih2b2lkICpfYXJnKQogc3RhdGljIHZvaWQgYnh0X3Z0ZF9n
Z3R0X2luc2VydF9lbnRyaWVzX19CS0woc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJ
CQkJCSAgICAgc3RydWN0IHNnX3RhYmxlICpzdCwKIAkJCQkJICAgICB1NjQgc3RhcnQsCisJCQkJ
CSAgICAgc3RydWN0IGk5MTVfcGFnZV9zaXplcyAqcGFnZV9zaXplcywKIAkJCQkJICAgICBlbnVt
IGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsCiAJCQkJCSAgICAgdTMyIHVudXNlZCkKIHsKQEAgLTIz
MTgsNiArMjMyNSw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2d0dF9pbnNlcnRfcGFnZShzdHJ1Y3Qg
aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHN0YXRpYyB2b2lkIGk5MTVfZ2d0dF9pbnNlcnRfZW50
cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgIHN0cnVjdCBzZ190
YWJsZSAqcGFnZXMsCiAJCQkJICAgICB1NjQgc3RhcnQsCisJCQkJICAgICBzdHJ1Y3QgaTkxNV9w
YWdlX3NpemVzICpwYWdlX3NpemVzLAogCQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNh
Y2hlX2xldmVsLAogCQkJCSAgICAgdTMyIHVudXNlZCkKIHsKQEAgLTIzNTMsNyArMjM2MSw3IEBA
IHN0YXRpYyBpbnQgZ2d0dF9iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAkJcHRlX2Zs
YWdzIHw9IFBURV9SRUFEX09OTFk7CiAKIAlpbnRlbF9ydW50aW1lX3BtX2dldChpOTE1KTsKLQl2
bWEtPnZtLT5pbnNlcnRfZW50cmllcyh2bWEtPnZtLCB2bWEtPnBhZ2VzLCB2bWEtPm5vZGUuc3Rh
cnQsCisJdm1hLT52bS0+aW5zZXJ0X2VudHJpZXModm1hLT52bSwgdm1hLT5wYWdlcywgdm1hLT5u
b2RlLnN0YXJ0LCAwLAogCQkJCWNhY2hlX2xldmVsLCBwdGVfZmxhZ3MpOwogCWludGVsX3J1bnRp
bWVfcG1fcHV0KGk5MTUpOwogCkBAIC0yNDA3LDE2ICsyNDE1LDE2IEBAIHN0YXRpYyBpbnQgYWxp
YXNpbmdfZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQkJCWdvdG8gZXJyX3Bh
Z2VzOwogCQl9CiAKLQkJYXBwZ3R0LT5iYXNlLmluc2VydF9lbnRyaWVzKCZhcHBndHQtPmJhc2Us
Ci0JCQkJCSAgICB2bWEtPnBhZ2VzLCB2bWEtPm5vZGUuc3RhcnQsCisJCWFwcGd0dC0+YmFzZS5p
bnNlcnRfZW50cmllcygmYXBwZ3R0LT5iYXNlLCB2bWEtPnBhZ2VzLAorCQkJCQkgICAgdm1hLT5u
b2RlLnN0YXJ0LAorCQkJCQkgICAgJnZtYS0+b2JqLT5tbS5wYWdlX3NpemVzLAogCQkJCQkgICAg
Y2FjaGVfbGV2ZWwsIHB0ZV9mbGFncyk7CiAJfQogCiAJaWYgKGZsYWdzICYgSTkxNV9WTUFfR0xP
QkFMX0JJTkQpIHsKIAkJaW50ZWxfcnVudGltZV9wbV9nZXQoaTkxNSk7Ci0JCXZtYS0+dm0tPmlu
c2VydF9lbnRyaWVzKHZtYS0+dm0sCi0JCQkJCXZtYS0+cGFnZXMsIHZtYS0+bm9kZS5zdGFydCwK
LQkJCQkJY2FjaGVfbGV2ZWwsIHB0ZV9mbGFncyk7CisJCXZtYS0+dm0tPmluc2VydF9lbnRyaWVz
KHZtYS0+dm0sIHZtYS0+cGFnZXMsIHZtYS0+bm9kZS5zdGFydCwKKwkJCQkJMCwgY2FjaGVfbGV2
ZWwsIHB0ZV9mbGFncyk7CiAJCWludGVsX3J1bnRpbWVfcG1fcHV0KGk5MTUpOwogCX0KIApkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCBmOGRiMjMxYzI4YWEuLmQ0NTcyOWI5ZGEw
YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTIwNiw2ICsyMDYsOCBAQCBl
bnVtIGk5MTVfY2FjaGVfbGV2ZWw7CiAKIHN0cnVjdCBpOTE1X3ZtYTsKIAorc3RydWN0IGk5MTVf
cGFnZV9zaXplczsKKwogc3RydWN0IGk5MTVfcGFnZV9kbWEgewogCXN0cnVjdCBwYWdlICpwYWdl
OwogCXVuaW9uIHsKQEAgLTMyMCw2ICszMjIsNyBAQCBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl
IHsKIAl2b2lkICgqaW5zZXJ0X2VudHJpZXMpKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt
LAogCQkJICAgICAgIHN0cnVjdCBzZ190YWJsZSAqc3QsCiAJCQkgICAgICAgdTY0IHN0YXJ0LAor
CQkJICAgICAgIHN0cnVjdCBpOTE1X3BhZ2Vfc2l6ZXMgKnBhZ2Vfc2l6ZXMsCiAJCQkgICAgICAg
ZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAogCQkJICAgICAgIHUzMiBmbGFncyk7
CiAJdm9pZCAoKmNsZWFudXApKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKTsKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9ndHQuYyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9ndHQuYwppbmRleCA1MDcxMGUz
ZjFjYWEuLjgxYzBkNmI4N2U2OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2Vs
ZnRlc3RzL2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0
cy9pOTE1X2dlbV9ndHQuYwpAQCAtMjU2LDcgKzI1Niw4IEBAIHN0YXRpYyBpbnQgbG93bGV2ZWxf
aG9sZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKIAkJCQlicmVhazsKIAogCQkJdm0t
Pmluc2VydF9lbnRyaWVzKHZtLCBvYmotPm1tLnBhZ2VzLCBhZGRyLAotCQkJCQkgICBJOTE1X0NB
Q0hFX05PTkUsIDApOworCQkJCQkgICAmb2JqLT5tbS5wYWdlX3NpemVzLCBJOTE1X0NBQ0hFX05P
TkUsCisJCQkJCSAgIDApOwogCQl9CiAJCWNvdW50ID0gbjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9zZWxmdGVzdHMvbW9ja19ndHQuYwppbmRleCBhNjEzMDljN2NiM2UuLjRkNTk0ZWFmMGI1MyAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ3R0LmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ3R0LmMKQEAgLTM1LDYgKzM1
LDcgQEAgc3RhdGljIHZvaWQgbW9ja19pbnNlcnRfcGFnZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw
YWNlICp2bSwKIHN0YXRpYyB2b2lkIG1vY2tfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRk
cmVzc19zcGFjZSAqdm0sCiAJCQkJc3RydWN0IHNnX3RhYmxlICpzdCwKIAkJCQl1NjQgc3RhcnQs
CisJCQkJc3RydWN0IGk5MTVfcGFnZV9zaXplcyAqcGFnZV9zaXplcywKIAkJCQllbnVtIGk5MTVf
Y2FjaGVfbGV2ZWwgbGV2ZWwsIHUzMiBmbGFncykKIHsKIH0KLS0gCjIuOS40CgpfX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs
aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz
a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK