From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 13/15] drm/i915: support inserting 1G pages in the ppgtt Date: Mon, 6 Mar 2017 23:54:12 +0000 Message-ID: <20170306235414.23407-14-matthew.auld@intel.com> References: <20170306235414.23407-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id B390D6E595 for ; Mon, 6 Mar 2017 23:54:30 +0000 (UTC) In-Reply-To: <20170306235414.23407-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 U2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNDUgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKykK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGY3MWE2MzIwYWUxYi4uZWNjNjNi YzFmY2MxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtODQ4LDYgKzg0OCw0 OCBAQCBzdGF0aWMgX19hbHdheXNfaW5saW5lIHN0cnVjdCBnZW44X2luc2VydF9wdGUgZ2VuOF9p bnNlcnRfcHRlKHU2NCBzdGFydCkKIH0KIAogc3RhdGljIF9fYWx3YXlzX2lubGluZSBib29sCitn ZW44X3BwZ3R0X2luc2VydF8xR19wZHBlX2VudHJpZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0LAorCQkJCSAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwLAorCQkJ CSAgc3RydWN0IHNndF9kbWEgKml0ZXIsCisJCQkJICBzdHJ1Y3QgZ2VuOF9pbnNlcnRfcHRlICpp ZHgsCisJCQkJICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwpCit7CisJY29uc3Qg Z2VuOF9wdGVfdCBwZHBlX2VuY29kZSA9IGdlbjhfcHRlX2VuY29kZShHRU44X1BEUEVfUFNfMUcs CisJCQkJCQkgICAgICAgY2FjaGVfbGV2ZWwpOworCWdlbjhfcHRlX3QgKnZhZGRyOworCWJvb2wg cmV0OworCisJR0VNX0JVR19PTihpZHgtPnB0ZSk7CisJR0VNX0JVR19PTihpZHgtPnBkZSk7CisJ R0VNX0JVR19PTihpZHgtPnBkcGUgPj0gaTkxNV9wZHBlc19wZXJfcGRwKCZwcGd0dC0+YmFzZSkp OworCXZhZGRyID0ga21hcF9hdG9taWNfcHgocGRwKTsKKwlkbyB7CisJCXZhZGRyW2lkeC0+cGRw ZV0gPSBwZHBlX2VuY29kZSB8IGl0ZXItPmRtYTsKKwkJaXRlci0+ZG1hICs9IEk5MTVfR1RUX1BB R0VfU0laRV8xRzsKKwkJaWYgKGl0ZXItPmRtYSA+PSBpdGVyLT5tYXgpIHsKKwkJCWl0ZXItPnNn ID0gX19zZ19uZXh0KGl0ZXItPnNnKTsKKwkJCWlmICghaXRlci0+c2cpIHsKKwkJCQlyZXQgPSBm YWxzZTsKKwkJCQlicmVhazsKKwkJCX0KKworCQkJaXRlci0+ZG1hID0gc2dfZG1hX2FkZHJlc3Mo aXRlci0+c2cpOworCQkJaXRlci0+bWF4ID0gaXRlci0+ZG1hICsgaXRlci0+c2ctPmxlbmd0aDsK KwkJfQorCisJCWlmICgrK2lkeC0+cGRwZSA9PSBHRU44X1BNTDRFU19QRVJfUE1MNCkgeworCQkJ aWR4LT5wZHBlID0gMDsKKwkJCXJldCA9IHRydWU7CisJCQlicmVhazsKKwkJfQorCisJfSB3aGls ZSAoMSk7CisJa3VubWFwX2F0b21pYyh2YWRkcik7CisKKwlyZXR1cm4gcmV0OworfQorCitzdGF0 aWMgX19hbHdheXNfaW5saW5lIGJvb2wKIGdlbjhfcHBndHRfaW5zZXJ0XzJNX3BkZV9lbnRyaWVz KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAkJCQkgc3RydWN0IGk5MTVfcGFnZV9kaXJl Y3RvcnlfcG9pbnRlciAqcGRwLAogCQkJCSBzdHJ1Y3Qgc2d0X2RtYSAqaXRlciwKQEAgLTEwNzAs NiArMTExMiw5IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0XzRsdmwoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJY2FzZSBJOTE1X0dUVF9QQUdFX1NJWkVfMk06CiAJCWlu c2VydF9lbnRyaWVzID0gZ2VuOF9wcGd0dF9pbnNlcnRfMk1fcGRlX2VudHJpZXM7CiAJCWJyZWFr OworCWNhc2UgSTkxNV9HVFRfUEFHRV9TSVpFXzFHOgorCQlpbnNlcnRfZW50cmllcyA9IGdlbjhf cHBndHRfaW5zZXJ0XzFHX3BkcGVfZW50cmllczsKKwkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJTUlT U0lOR19DQVNFKHBhZ2Vfc2l6ZSk7CiAJCXJldHVybjsKLS0gCjIuOS4zCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK