From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH v2 01/22] drm/i915/stolen: make the object creation interface consistent Date: Thu, 3 Oct 2019 20:24:23 +0100 Message-ID: <20191003192444.10113-2-matthew.auld@intel.com> References: <20191003192444.10113-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E66A6E1B8 for ; Thu, 3 Oct 2019 19:24:50 +0000 (UTC) In-Reply-To: <20191003192444.10113-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 RnJvbTogQ1EgVGFuZyA8Y3EudGFuZ0BpbnRlbC5jb20+CgpPdXIgb3RoZXIgYmFja2VuZHMgcmV0 dXJuIGFuIGFjdHVhbCBlcnJvciB2YWx1ZSB1cG9uIGZhaWx1cmUuIERvIHRoZQpzYW1lIGZvciBz dG9sZW4gb2JqZWN0cywgd2hpY2ggY3VycmVudGx5IGp1c3QgcmV0dXJuIE5VTEwgb24gZmFpbHVy ZS4KClNpZ25lZC1vZmYtYnk6IENRIFRhbmcgPGNxLnRhbmdAaW50ZWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxz b24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX2Rpc3BsYXkuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2ZiZGV2LmMgICB8ICA0ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9vdmVybGF5LmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVf Z2VtX3N0b2xlbi5jICAgfCAzNiArKysrKysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvZ3QvaW50ZWxfZ3QuYyAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvZ3QvaW50ZWxfcmM2LmMgICAgICAgICAgfCAgNCArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2d0L2ludGVsX3JpbmdidWZmZXIuYyAgIHwgIDIgKy0KIDcgZmlsZXMgY2hhbmdlZCwgMjggaW5z ZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNw bGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjM2FjNWE1YzUxODUuLjNhN2UzMjRmYWIyNiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTMwNzEs NyArMzA3MSw3IEBAIGludGVsX2FsbG9jX2luaXRpYWxfcGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9j cnRjICpjcnRjLAogCQkJCQkJCSAgICAgYmFzZV9hbGlnbmVkLAogCQkJCQkJCSAgICAgc2l6ZV9h bGlnbmVkKTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpZiAoIW9iaikK KwlpZiAoSVNfRVJSKG9iaikpCiAJCXJldHVybiBmYWxzZTsKIAogCXN3aXRjaCAocGxhbmVfY29u ZmlnLT50aWxpbmcpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZmJkZXYu YwppbmRleCA2ODMzODY2OWYwNTQuLjhlMzFmMjU0YjBkOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfZmJkZXYuYwpAQCAtMTQxLDEwICsxNDEsMTAgQEAgc3RhdGljIGlu dCBpbnRlbGZiX2FsbG9jKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJLyogSWYgdGhl IEZCIGlzIHRvbyBiaWcsIGp1c3QgZG9uJ3QgdXNlIGl0IHNpbmNlIGZiZGV2IGlzIG5vdCB2ZXJ5 CiAJICogaW1wb3J0YW50IGFuZCB3ZSBzaG91bGQgcHJvYmFibHkgdXNlIHRoYXQgc3BhY2Ugd2l0 aCBGQkMgb3Igb3RoZXIKIAkgKiBmZWF0dXJlcy4gKi8KLQlvYmogPSBOVUxMOworCW9iaiA9IEVS Ul9QVFIoLUVOT0RFVik7CiAJaWYgKHNpemUgKiAyIDwgZGV2X3ByaXYtPnN0b2xlbl91c2FibGVf c2l6ZSkKIAkJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oZGV2X3ByaXYsIHNp emUpOwotCWlmIChvYmogPT0gTlVMTCkKKwlpZiAoSVNfRVJSKG9iaikpCiAJCW9iaiA9IGk5MTVf Z2VtX29iamVjdF9jcmVhdGVfc2htZW0oZGV2X3ByaXYsIHNpemUpOwogCWlmIChJU19FUlIob2Jq KSkgewogCQlEUk1fRVJST1IoImZhaWxlZCB0byBhbGxvY2F0ZSBmcmFtZWJ1ZmZlclxuIik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX292ZXJsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfb3ZlcmxheS5jCmluZGV4IDVlZmVm OWJhYmFkYi4uZmI0ZTIwNDdlZmRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX292ZXJsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX292ZXJsYXkuYwpAQCAtMTMwNiw3ICsxMzA2LDcgQEAgc3RhdGljIGludCBnZXRfcmVn aXN0ZXJzKHN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5LCBib29sIHVzZV9waHlzKQogCW11 dGV4X2xvY2soJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCiAJb2JqID0gaTkxNV9nZW1fb2Jq ZWN0X2NyZWF0ZV9zdG9sZW4oaTkxNSwgUEFHRV9TSVpFKTsKLQlpZiAob2JqID09IE5VTEwpCisJ aWYgKElTX0VSUihvYmopKQogCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX2ludGVybmFs KGk5MTUsIFBBR0VfU0laRSk7CiAJaWYgKElTX0VSUihvYmopKSB7CiAJCWVyciA9IFBUUl9FUlIo b2JqKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9zdG9s ZW4uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9zdG9sZW4uYwppbmRleCBi ZmJjM2UzZGFmOTIuLjNkZDI5NWJiNjFmNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZ2VtL2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9p OTE1X2dlbV9zdG9sZW4uYwpAQCAtNTg1LDI4ICs1ODUsMzIgQEAgaTkxNV9nZW1fb2JqZWN0X2Ny ZWF0ZV9zdG9sZW4oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWludCByZXQ7 CiAKIAlpZiAoIWRybV9tbV9pbml0aWFsaXplZCgmZGV2X3ByaXYtPm1tLnN0b2xlbikpCi0JCXJl dHVybiBOVUxMOworCQlyZXR1cm4gRVJSX1BUUigtRU5PREVWKTsKIAogCWlmIChzaXplID09IDAp Ci0JCXJldHVybiBOVUxMOworCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFMKTsKIAogCXN0b2xlbiA9 IGt6YWxsb2Moc2l6ZW9mKCpzdG9sZW4pLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXN0b2xlbikKLQkJ cmV0dXJuIE5VTEw7CisJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCiAJcmV0ID0gaTkxNV9n ZW1fc3RvbGVuX2luc2VydF9ub2RlKGRldl9wcml2LCBzdG9sZW4sIHNpemUsIDQwOTYpOwotCWlm IChyZXQpIHsKLQkJa2ZyZWUoc3RvbGVuKTsKLQkJcmV0dXJuIE5VTEw7Ci0JfQorCWlmIChyZXQp CisJCWdvdG8gZXJyX2ZyZWU7CiAKIAlvYmogPSBfaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9s ZW4oZGV2X3ByaXYsIHN0b2xlbik7Ci0JaWYgKG9iaikKLQkJcmV0dXJuIG9iajsKKwlpZiAob2Jq ID09IE5VTEwpIHsKKwkJcmV0ID0gLUVOT01FTTsKKwkJZ290byBlcnJfcmVtb3ZlOworCX0KIAor CXJldHVybiBvYmo7CisKK2Vycl9yZW1vdmU6CiAJaTkxNV9nZW1fc3RvbGVuX3JlbW92ZV9ub2Rl KGRldl9wcml2LCBzdG9sZW4pOworZXJyX2ZyZWU6CiAJa2ZyZWUoc3RvbGVuKTsKLQlyZXR1cm4g TlVMTDsKKwlyZXR1cm4gRVJSX1BUUihyZXQpOwogfQogCiBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqCkBAIC02MjIsNyArNjI2LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW5f Zm9yX3ByZWFsbG9jYXRlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYKIAlpbnQg cmV0OwogCiAJaWYgKCFkcm1fbW1faW5pdGlhbGl6ZWQoJmRldl9wcml2LT5tbS5zdG9sZW4pKQot CQlyZXR1cm4gTlVMTDsKKwkJcmV0dXJuIEVSUl9QVFIoLUVOT0RFVik7CiAKIAlsb2NrZGVwX2Fz c2VydF9oZWxkKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKQEAgLTYzMywxMSArNjM3 LDExIEBAIGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuX2Zvcl9wcmVhbGxvY2F0ZWQoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2CiAJaWYgKFdBUk5fT04oc2l6ZSA9PSAwKSB8 fAogCSAgICBXQVJOX09OKCFJU19BTElHTkVEKHNpemUsIEk5MTVfR1RUX1BBR0VfU0laRSkpIHx8 CiAJICAgIFdBUk5fT04oIUlTX0FMSUdORUQoc3RvbGVuX29mZnNldCwgSTkxNV9HVFRfTUlOX0FM SUdOTUVOVCkpKQotCQlyZXR1cm4gTlVMTDsKKwkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7CiAK IAlzdG9sZW4gPSBremFsbG9jKHNpemVvZigqc3RvbGVuKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFz dG9sZW4pCi0JCXJldHVybiBOVUxMOworCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKIAogCXN0 b2xlbi0+c3RhcnQgPSBzdG9sZW5fb2Zmc2V0OwogCXN0b2xlbi0+c2l6ZSA9IHNpemU7CkBAIC02 NDcsNyArNjUxLDcgQEAgaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW5fZm9yX3ByZWFsbG9j YXRlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYKIAlpZiAocmV0KSB7CiAJCURS TV9ERUJVR19EUklWRVIoImZhaWxlZCB0byBhbGxvY2F0ZSBzdG9sZW4gc3BhY2VcbiIpOwogCQlr ZnJlZShzdG9sZW4pOwotCQlyZXR1cm4gTlVMTDsKKwkJcmV0dXJuIEVSUl9QVFIocmV0KTsKIAl9 CiAKIAlvYmogPSBfaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oZGV2X3ByaXYsIHN0b2xl bik7CkBAIC02NTUsNyArNjU5LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW5fZm9y X3ByZWFsbG9jYXRlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYKIAkJRFJNX0RF QlVHX0RSSVZFUigiZmFpbGVkIHRvIGFsbG9jYXRlIHN0b2xlbiBvYmplY3RcbiIpOwogCQlpOTE1 X2dlbV9zdG9sZW5fcmVtb3ZlX25vZGUoZGV2X3ByaXYsIHN0b2xlbik7CiAJCWtmcmVlKHN0b2xl bik7Ci0JCXJldHVybiBOVUxMOworCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKIAl9CiAKIAkv KiBTb21lIG9iamVjdHMganVzdCBuZWVkIHBoeXNpY2FsIG1lbSBmcm9tIHN0b2xlbiBzcGFjZSAq LwpAQCAtNzA0LDUgKzcwOCw1IEBAIGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuX2Zvcl9w cmVhbGxvY2F0ZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2CiAJaTkxNV9nZW1f b2JqZWN0X3VucGluX3BhZ2VzKG9iaik7CiBlcnI6CiAJaTkxNV9nZW1fb2JqZWN0X3B1dChvYmop OwotCXJldHVybiBOVUxMOworCXJldHVybiBFUlJfUFRSKHJldCk7CiB9CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9ndC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv Z3QvaW50ZWxfZ3QuYwppbmRleCAwZTU5MDllZTA2NTcuLmI0NWFjNWM2NDNkZSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfZ3QuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9ndC9pbnRlbF9ndC5jCkBAIC0zMzEsNyArMzMxLDcgQEAgc3RhdGljIGludCBpbnRl bF9ndF9pbml0X3NjcmF0Y2goc3RydWN0IGludGVsX2d0ICpndCwgdW5zaWduZWQgaW50IHNpemUp CiAJaW50IHJldDsKIAogCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGk5MTUs IHNpemUpOwotCWlmICghb2JqKQorCWlmIChJU19FUlIob2JqKSkKIAkJb2JqID0gaTkxNV9nZW1f b2JqZWN0X2NyZWF0ZV9pbnRlcm5hbChpOTE1LCBzaXplKTsKIAlpZiAoSVNfRVJSKG9iaikpIHsK IAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gYWxsb2NhdGUgc2NyYXRjaCBwYWdlXG4iKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3JjNi5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZ3QvaW50ZWxfcmM2LmMKaW5kZXggZDYxNjdkZDU5MmU5Li5kY2YxODlmMjY2MjQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3JjNi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3JjNi5jCkBAIC0yOTksNyArMjk5LDcgQEAgc3Rh dGljIGludCB2bHZfcmM2X2luaXQoc3RydWN0IGludGVsX3JjNiAqcmM2KQogCQkJCQkJCQkgICAg ICBwY2JyX29mZnNldCwKIAkJCQkJCQkJICAgICAgSTkxNV9HVFRfT0ZGU0VUX05PTkUsCiAJCQkJ CQkJCSAgICAgIHBjdHhfc2l6ZSk7Ci0JCWlmICghcGN0eCkKKwkJaWYgKElTX0VSUihwY3R4KSkK IAkJCXJldHVybiAtRU5PTUVNOwogCiAJCWdvdG8gb3V0OwpAQCAtMzE2LDcgKzMxNiw3IEBAIHN0 YXRpYyBpbnQgdmx2X3JjNl9pbml0KHN0cnVjdCBpbnRlbF9yYzYgKnJjNikKIAkgKiBtZW1vcnks IG9yIGFueSBvdGhlciByZWxldmFudCByYW5nZXMuCiAJICovCiAJcGN0eCA9IGk5MTVfZ2VtX29i amVjdF9jcmVhdGVfc3RvbGVuKGk5MTUsIHBjdHhfc2l6ZSk7Ci0JaWYgKCFwY3R4KSB7CisJaWYg KElTX0VSUihwY3R4KSkgewogCQlEUk1fREVCVUcoIm5vdCBlbm91Z2ggc3RvbGVuIHNwYWNlIGZv ciBQQ1RYLCBkaXNhYmxpbmdcbiIpOwogCQlyZXR1cm4gLUVOT01FTTsKIAl9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9ndC9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggMDc0N2I4YzlmNzY4Li5lMjIw YzA5YzZmMzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3Jpbmdi dWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9yaW5nYnVmZmVyLmMK QEAgLTEyNzQsNyArMTI3NCw3IEBAIHN0YXRpYyBzdHJ1Y3QgaTkxNV92bWEgKmNyZWF0ZV9yaW5n X3ZtYShzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0LCBpbnQgc2l6ZSkKIAlzdHJ1Y3QgaTkxNV92bWEg KnZtYTsKIAogCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGk5MTUsIHNpemUp OwotCWlmICghb2JqKQorCWlmIChJU19FUlIob2JqKSkKIAkJb2JqID0gaTkxNV9nZW1fb2JqZWN0 X2NyZWF0ZV9pbnRlcm5hbChpOTE1LCBzaXplKTsKIAlpZiAoSVNfRVJSKG9iaikpCiAJCXJldHVy biBFUlJfQ0FTVChvYmopOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZng=