From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [RFC PATCH 39/42] drm/i915: treat stolen as a region Date: Thu, 14 Feb 2019 14:57:37 +0000 Message-ID: <20190214145740.14521-40-matthew.auld@intel.com> References: <20190214145740.14521-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id C92166E934 for ; Thu, 14 Feb 2019 14:58:32 +0000 (UTC) In-Reply-To: <20190214145740.14521-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 Q29udmVydCBzdG9sZW4gbWVtb3J5IG92ZXIgdG8gYSByZWdpb24gb2JqZWN0LiBTdGlsbCBsZWF2 ZXMgb3BlbiB0aGUKcXVlc3Rpb24gd2l0aCB3aGF0IHRvIGRvIHdpdGggcHJlLWFsbG9jYXRlZCBv YmplY3RzLi4uCgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRl bC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5j b20+CkNjOiBBYmRpZWwgSmFudWxndWUgPGFiZGllbC5qYW51bGd1ZUBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgIDMgKy0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgICAgICB8IDE0ICstLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyAgICAgfCA2NiArKysrKysrKysr KysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tZW1vcnlfcmVnaW9uLmMg fCAgMiArLQogNCBmaWxlcyBjaGFuZ2VkLCA2MiBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyM2YwNGU1YTRiNzYuLjQ2ZmQ1ZmQ2NDIz MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMTk0LDggKzMxOTQsNyBAQCBpbnQgaTkx NV9nZW1fc3RvbGVuX2luc2VydF9ub2RlX2luX3JhbmdlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJCQkJIHU2NCBlbmQpOwogdm9pZCBpOTE1X2dlbV9zdG9sZW5fcmVtb3Zl X25vZGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSBzdHJ1Y3QgZHJt X21tX25vZGUgKm5vZGUpOwotaW50IGk5MTVfZ2VtX2luaXRfc3RvbGVuKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7Ci12b2lkIGk5MTVfZ2VtX2NsZWFudXBfc3RvbGVuKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CitzdHJ1Y3QgaW50ZWxfbWVtb3J5X3JlZ2lv biAqaTkxNV9nZW1fc2V0dXBfc3RvbGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsK IHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICoKIGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3Rv bGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgIHJlc291cmNl X3NpemVfdCBzaXplKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggODRiMmZh NTYwOGZiLi5mNWQ1OTVjNzAwZjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBA IC0yODAyLDggKzI4MDIsNiBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9jbGVhbnVwX21lbW9yeV9y ZWdpb25zKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewogCWludCBpOwogCi0JaTkx NV9nZW1fY2xlYW51cF9zdG9sZW4oaTkxNSk7Ci0KIAlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0la RShpOTE1LT5yZWdpb25zKTsgKytpKQl7CiAJCXN0cnVjdCBpbnRlbF9tZW1vcnlfcmVnaW9uICpy ZWdpb24gPSBpOTE1LT5yZWdpb25zW2ldOwogCkBAIC0yODE5LDE1ICsyODE3LDYgQEAgc3RhdGlj IGludCBpOTE1X2dlbV9pbml0X21lbW9yeV9yZWdpb25zKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICppOTE1KQogCS8qIEFsbCBwbGF0Zm9ybXMgY3VycmVudGx5IGhhdmUgc3lzdGVtIG1lbW9yeSAq LwogCUdFTV9CVUdfT04oIUhBU19SRUdJT04oaTkxNSwgUkVHSU9OX1NNRU0pKTsKIAotCS8qCi0J ICogSW5pdGlhbGlzZSBzdG9sZW4gZWFybHkgc28gdGhhdCB3ZSBtYXkgcmVzZXJ2ZSBwcmVhbGxv Y2F0ZWQKLQkgKiBvYmplY3RzIGZvciB0aGUgQklPUyB0byBLTVMgdHJhbnNpdGlvbi4KLQkgKi8K LQkvKiBYWFg6IHN0b2xlbiB3aWxsIGJlY29tZSBhIHJlZ2lvbiBhdCBzb21lIHBvaW50ICovCi0J ZXJyID0gaTkxNV9nZW1faW5pdF9zdG9sZW4oaTkxNSk7Ci0JaWYgKGVycikKLQkJcmV0dXJuIGVy cjsKLQogCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGludGVsX3JlZ2lvbl9tYXApOyBpKysp IHsKIAkJc3RydWN0IGludGVsX21lbW9yeV9yZWdpb24gKm1lbSA9IE5VTEw7CiAJCXUzMiB0eXBl OwpAQCAtMjg0MCw2ICsyODI5LDkgQEAgc3RhdGljIGludCBpOTE1X2dlbV9pbml0X21lbW9yeV9y ZWdpb25zKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCQljYXNlIElOVEVMX1NNRU06 CiAJCQltZW0gPSBpOTE1X2dlbV9zZXR1cF9zbWVtKGk5MTUpOwogCQkJYnJlYWs7CisJCWNhc2Ug SU5URUxfU1RPTEVOOgorCQkJbWVtID0gaTkxNV9nZW1fc2V0dXBfc3RvbGVuKGk5MTUpOworCQkJ YnJlYWs7CiAJCX0KIAogCQlpZiAoSVNfRVJSKG1lbSkpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fc3RvbGVuLmMKaW5kZXggNzRhOTY2MTQ3OWNhLi42ZWY5NGEzMmVkZjkgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCkBAIC0xNjYsNyArMTY2LDcgQEAgc3RhdGlj IGludCBpOTE1X2FkanVzdF9zdG9sZW4oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogCXJldHVybiAwOwogfQogCi12b2lkIGk5MTVfZ2VtX2NsZWFudXBfc3RvbGVuKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGk5MTVfZ2VtX2NsZWFudXBf c3RvbGVuKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlpZiAoIWRybV9t bV9pbml0aWFsaXplZCgmZGV2X3ByaXYtPm1tLnN0b2xlbikpCiAJCXJldHVybjsKQEAgLTM3MSw3 ICszNzEsNyBAQCBzdGF0aWMgdm9pZCBpY2xfZ2V0X3N0b2xlbl9yZXNlcnZlZChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJfQogfQogCi1pbnQgaTkxNV9nZW1faW5pdF9zdG9s ZW4oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIGludCBpOTE1X2dl bV9pbml0X3N0b2xlbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJcmVz b3VyY2Vfc2l6ZV90IHJlc2VydmVkX2Jhc2UsIHN0b2xlbl90b3A7CiAJcmVzb3VyY2Vfc2l6ZV90 IHJlc2VydmVkX3RvdGFsLCByZXNlcnZlZF9zaXplOwpAQCAtNTUwLDYgKzU1MCw5IEBAIGk5MTVf Z2VtX29iamVjdF9yZWxlYXNlX3N0b2xlbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq KQogCiAJaTkxNV9nZW1fc3RvbGVuX3JlbW92ZV9ub2RlKGRldl9wcml2LCBzdG9sZW4pOwogCWtm cmVlKHN0b2xlbik7CisKKwlpZiAob2JqLT5tZW1vcnlfcmVnaW9uKQorCQlpOTE1X2dlbV9vYmpl Y3RfcmVsZWFzZV9tZW1vcnlfcmVnaW9uKG9iaik7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdF9vcHMgaTkxNV9nZW1fb2JqZWN0X3N0b2xlbl9vcHMgPSB7CkBA IC01NTksOCArNTYyLDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 X29wcyBpOTE1X2dlbV9vYmplY3Rfc3RvbGVuX29wcyA9IHsKIH07CiAKIHN0YXRpYyBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqCi1faTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJICAgICAgIHN0cnVjdCBkcm1fbW1f bm9kZSAqc3RvbGVuKQorX19pOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJc3RydWN0IGRybV9tbV9ub2RlICpzdG9sZW4p CiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAl1bnNpZ25lZCBpbnQgY2Fj aGVfbGV2ZWw7CkBAIC01ODcsMTAgKzU5MCwxMiBAQCBfaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9z dG9sZW4oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJldHVybiBOVUxMOwog fQogCi1zdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqCi1pOTE1X2dlbV9vYmplY3RfY3JlYXRl X3N0b2xlbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICAgICByZXNv dXJjZV9zaXplX3Qgc2l6ZSkKK3N0YXRpYyBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqCitf aTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oc3RydWN0IGludGVsX21lbW9yeV9yZWdpb24g Km1lbSwKKwkJCSAgICAgICByZXNvdXJjZV9zaXplX3Qgc2l6ZSwKKwkJCSAgICAgICB1bnNpZ25l ZCBpbnQgZmxhZ3MpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gbWVt LT5pOTE1OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJc3RydWN0IGRybV9t bV9ub2RlICpzdG9sZW47CiAJaW50IHJldDsKQEAgLTYxMSw3ICs2MTYsNyBAQCBpOTE1X2dlbV9v YmplY3RfY3JlYXRlX3N0b2xlbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ CXJldHVybiBOVUxMOwogCX0KIAotCW9iaiA9IF9pOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xl bihkZXZfcHJpdiwgc3RvbGVuKTsKKwlvYmogPSBfX2k5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3Rv bGVuKGRldl9wcml2LCBzdG9sZW4pOwogCWlmIChvYmopCiAJCXJldHVybiBvYmo7CiAKQEAgLTYy MCw2ICs2MjUsNDkgQEAgaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJldHVybiBOVUxMOwogfQogCitzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqCitpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgICByZXNvdXJjZV9zaXplX3Qgc2l6ZSkK K3sKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOworCisJb2JqID0gaTkxNV9nZW1f b2JqZWN0X2NyZWF0ZV9yZWdpb24oZGV2X3ByaXYtPnJlZ2lvbnNbSU5URUxfTUVNT1JZX1NUT0xF Tl0sCisJCQkJCSAgICBzaXplLCBJOTE1X0JPX0FMTE9DX0NPTlRJR1VPVVMpOworCWlmIChJU19F UlIob2JqKSkKKwkJcmV0dXJuIE5VTEw7CisKKwlyZXR1cm4gb2JqOworfQorCitzdGF0aWMgaW50 IGk5MTVfbWVtb3J5X3JlZ2lvbl9pbml0X3N0b2xlbihzdHJ1Y3QgaW50ZWxfbWVtb3J5X3JlZ2lv biAqbWVtKQoreworCS8qCisJICogSW5pdGlhbGlzZSBzdG9sZW4gZWFybHkgc28gdGhhdCB3ZSBt YXkgcmVzZXJ2ZSBwcmVhbGxvY2F0ZWQKKwkgKiBvYmplY3RzIGZvciB0aGUgQklPUyB0byBLTVMg dHJhbnNpdGlvbi4KKwkgKi8KKwlyZXR1cm4gaTkxNV9nZW1faW5pdF9zdG9sZW4obWVtLT5pOTE1 KTsKK30KKworc3RhdGljIHZvaWQgaTkxNV9tZW1vcnlfcmVnaW9uX3JlbGVhc2Vfc3RvbGVuKHN0 cnVjdCBpbnRlbF9tZW1vcnlfcmVnaW9uICptZW0pCit7CisJaTkxNV9nZW1fY2xlYW51cF9zdG9s ZW4obWVtLT5pOTE1KTsKK30KKworc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9tZW1vcnlfcmVn aW9uX29wcyBpOTE1X3JlZ2lvbl9zdG9sZW5fb3BzID0geworCS5pbml0ID0gaTkxNV9tZW1vcnlf cmVnaW9uX2luaXRfc3RvbGVuLAorCS5yZWxlYXNlID0gaTkxNV9tZW1vcnlfcmVnaW9uX3JlbGVh c2Vfc3RvbGVuLAorCS5vYmplY3RfY3JlYXRlID0gX2k5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3Rv bGVuLAorfTsKKworc3RydWN0IGludGVsX21lbW9yeV9yZWdpb24gKmk5MTVfZ2VtX3NldHVwX3N0 b2xlbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKK3sKKwlyZXR1cm4gaW50ZWxfbWVt b3J5X3JlZ2lvbl9jcmVhdGUoaTkxNSwKKwkJCQkJICBpbnRlbF9ncmFwaGljc19zdG9sZW5fcmVz LnN0YXJ0LAorCQkJCQkgIHJlc291cmNlX3NpemUoJmludGVsX2dyYXBoaWNzX3N0b2xlbl9yZXMp LAorCQkJCQkgIEk5MTVfR1RUX1BBR0VfU0laRV80SywgMCwKKwkJCQkJICAmaTkxNV9yZWdpb25f c3RvbGVuX29wcyk7Cit9CisKIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICoKIGk5MTVfZ2Vt X29iamVjdF9jcmVhdGVfc3RvbGVuX2Zvcl9wcmVhbGxvY2F0ZWQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQkJCQkgICAgICAgcmVzb3VyY2Vfc2l6ZV90IHN0b2xlbl9vZmZz ZXQsCkBAIC02NjEsNyArNzA5LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW5fZm9y X3ByZWFsbG9jYXRlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYKIAkJcmV0dXJu IE5VTEw7CiAJfQogCi0Jb2JqID0gX2k5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRldl9w cml2LCBzdG9sZW4pOworCW9iaiA9IF9faTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oZGV2 X3ByaXYsIHN0b2xlbik7CiAJaWYgKG9iaiA9PSBOVUxMKSB7CiAJCURSTV9ERUJVR19EUklWRVIo ImZhaWxlZCB0byBhbGxvY2F0ZSBzdG9sZW4gb2JqZWN0XG4iKTsKIAkJaTkxNV9nZW1fc3RvbGVu X3JlbW92ZV9ub2RlKGRldl9wcml2LCBzdG9sZW4pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbWVtb3J5X3JlZ2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbWVtb3J5X3JlZ2lvbi5jCmluZGV4IDE3YWY1YjRmMGExYS4uY2JkZjY2ZmRhZTRlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tZW1vcnlfcmVnaW9uLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbWVtb3J5X3JlZ2lvbi5jCkBAIC0yMTEsNyArMjEx LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9yZWdpb24oc3RydWN0IGludGVsX21lbW9yeV9y ZWdpb24gKm1lbSwKIAkJcmV0dXJuIEVSUl9QVFIoLUUyQklHKTsKIAogCW9iaiA9IG1lbS0+b3Bz LT5vYmplY3RfY3JlYXRlKG1lbSwgc2l6ZSwgZmxhZ3MpOwotCWlmIChJU19FUlIob2JqKSkKKwlp ZiAoSVNfRVJSX09SX05VTEwob2JqKSkKIAkJcmV0dXJuIG9iajsKIAogCUlOSVRfTElTVF9IRUFE KCZvYmotPmJsb2Nrcyk7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeA==