From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 13/17] drm/i915: support inserting 1G pages into the 48b PPGTT Date: Tue, 16 May 2017 09:29:44 +0100 Message-ID: <20170516082948.28090-14-matthew.auld@intel.com> References: <20170516082948.28090-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A7FCB6E2E8 for ; Tue, 16 May 2017 08:30:11 +0000 (UTC) In-Reply-To: <20170516082948.28090-1-matthew.auld@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 VG8gZW5hYmxlIDFHIHBhZ2VzIHdlIHNldCB0aGUgUFMgYml0IGluIHRoZSBQRFBFLCBha2EgUERQ RVs3XSB0bwppbmRpY2F0ZSBhIDFHIHBhZ2UsIGFuZCBub3QgYSBQRC4KClNpZ25lZC1vZmYtYnk6 IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5l biA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYyB8IDQ3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgIDIgKysKIDIgZmls ZXMgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMKaW5kZXggM2RhZGI1MDFkYWE2Li5lODFjNzhmZmJlYTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCkBAIC04NTQsNiArODU0LDUwIEBAIHN0YXRpYyBfX2Fsd2F5c19pbmxpbmUg c3RydWN0IGdlbjhfaW5zZXJ0X3B0ZSBnZW44X2luc2VydF9wdGUodTY0IHN0YXJ0KQogfQogCiBz dGF0aWMgX19hbHdheXNfaW5saW5lIGJvb2wKK2dlbjhfcHBndHRfaW5zZXJ0XzFHX3BkcGVfZW50 cmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCisJCQkJICBzdHJ1Y3QgaTkxNV9wYWdl X2RpcmVjdG9yeV9wb2ludGVyICpwZHAsCisJCQkJICBzdHJ1Y3Qgc2d0X2RtYSAqaXRlciwKKwkJ CQkgIHN0cnVjdCBnZW44X2luc2VydF9wdGUgKmlkeCwKKwkJCQkgIGVudW0gaTkxNV9jYWNoZV9s ZXZlbCBjYWNoZV9sZXZlbCkKK3sKKwljb25zdCBnZW44X3B0ZV90IHBkcGVfZW5jb2RlID0gZ2Vu OF9wdGVfZW5jb2RlKEdFTjhfUERQRV9QU18xRywKKwkJCQkJCSAgICAgICBjYWNoZV9sZXZlbCk7 CisJZ2VuOF9wdGVfdCAqdmFkZHI7CisJYm9vbCByZXQ7CisKKwlHRU1fQlVHX09OKGlkeC0+cHRl KTsKKwlHRU1fQlVHX09OKGlkeC0+cGRlKTsKKwlHRU1fQlVHX09OKGlkeC0+cGRwZSA+PSBpOTE1 X3BkcGVzX3Blcl9wZHAoJnBwZ3R0LT5iYXNlKSk7CisJdmFkZHIgPSBrbWFwX2F0b21pY19weChw ZHApOworCWRvIHsKKwkJdmFkZHJbaWR4LT5wZHBlXSA9IHBkcGVfZW5jb2RlIHwgaXRlci0+ZG1h OworCQlpdGVyLT5kbWEgKz0gSTkxNV9HVFRfUEFHRV9TSVpFXzFHOworCQlpZiAoaXRlci0+ZG1h ID49IGl0ZXItPm1heCkgeworCQkJaXRlci0+c2cgPSBfX3NnX25leHQoaXRlci0+c2cpOworCQkJ aWYgKCFpdGVyLT5zZykgeworCQkJCXJldCA9IGZhbHNlOworCQkJCWJyZWFrOworCQkJfQorCisJ CQlpdGVyLT5kbWEgPSBzZ19kbWFfYWRkcmVzcyhpdGVyLT5zZyk7CisJCQlpdGVyLT5tYXggPSBp dGVyLT5kbWEgKyBpdGVyLT5zZy0+bGVuZ3RoOworCQl9CisKKwkJaWYgKCsraWR4LT5wZHBlID09 IEdFTjhfUE1MNEVTX1BFUl9QTUw0KSB7CisJCQlpZHgtPnBkcGUgPSAwOworCQkJcmV0ID0gdHJ1 ZTsKKwkJCWJyZWFrOworCQl9CisKKwl9IHdoaWxlICgxKTsKKwlrdW5tYXBfYXRvbWljKHZhZGRy KTsKKworCW1hcmtfdGxic19kaXJ0eShwcGd0dCk7CisKKwlyZXR1cm4gcmV0OworfQorCitzdGF0 aWMgX19hbHdheXNfaW5saW5lIGJvb2wKIGdlbjhfcHBndHRfaW5zZXJ0XzJNX3BkZV9lbnRyaWVz KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAkJCQkgc3RydWN0IGk5MTVfcGFnZV9kaXJl Y3RvcnlfcG9pbnRlciAqcGRwLAogCQkJCSBzdHJ1Y3Qgc2d0X2RtYSAqaXRlciwKQEAgLTEwODEs NiArMTEyNSw5IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0XzRsdmwoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJY2FzZSBJOTE1X0dUVF9QQUdFX1NJWkVfMk06CiAJCWlu c2VydF9lbnRyaWVzID0gZ2VuOF9wcGd0dF9pbnNlcnRfMk1fcGRlX2VudHJpZXM7CiAJCWJyZWFr OworCWNhc2UgSTkxNV9HVFRfUEFHRV9TSVpFXzFHOgorCQlpbnNlcnRfZW50cmllcyA9IGdlbjhf cHBndHRfaW5zZXJ0XzFHX3BkcGVfZW50cmllczsKKwkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJTUlT U0lOR19DQVNFKHBhZ2Vfc2l6ZSk7CiAJCXJldHVybjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmgKaW5kZXggODQwZDA4YmU4ZmEzLi4xNTE3Y2ZkYmQ1Y2UgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5oCkBAIC0xNTIsNiArMTUyLDggQEAgdHlwZWRlZiB1NjQgZ2VuOF9wcGd0 dF9wbWw0ZV90OwogI2RlZmluZSBHRU44X1BERV9JUFNfNjRLIEJJVCgxMSkKICNkZWZpbmUgR0VO OF9QREVfUFNfMk0gICBCSVQoNykKIAorI2RlZmluZSBHRU44X1BEUEVfUFNfMUcgIEJJVCg3KQor CiBzdHJ1Y3Qgc2dfdGFibGU7CiAKIHN0cnVjdCBpbnRlbF9yb3RhdGlvbl9pbmZvIHsKLS0gCjIu OS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK