From: Matthew Auld Subject: [PATCH v3 01/21] drm/i915/stolen: make the object creation interface consistent Date: Fri, 4 Oct 2019 18:04:32 +0100 Message-ID: <20191004170452.15410-2-matthew.auld@intel.com> References: <20191004170452.15410-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id E65506EBE2 for ; Fri, 4 Oct 2019 17:04:59 +0000 (UTC) In-Reply-To: <20191004170452.15410-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 b24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfZGlzcGxheS5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfZmJkZXYuYyAgIHwgIDQgKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX292ZXJsYXkuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1f c3RvbGVuLmMgICB8IDM2ICsrKysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9ndC9pbnRlbF9ndC5jICAgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9n dC9pbnRlbF9yYzYuYyAgICAgICAgICB8ICA4ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9n dC9pbnRlbF9yaW5nYnVmZmVyLmMgICB8ICAyICstCiA3IGZpbGVzIGNoYW5nZWQsIDMwIGluc2Vy dGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNWFjYzM5ZjMyZDBjLi5jMTU5NzVhNDEwYmMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCkBAIC0zMDY2LDcg KzMwNjYsNyBAQCBpbnRlbF9hbGxvY19pbml0aWFsX3BsYW5lX29iaihzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIAkJCQkJCQkgICAgIGJhc2VfYWxpZ25lZCwKIAkJCQkJCQkgICAgIGJhc2VfYWxp Z25lZCwKIAkJCQkJCQkgICAgIHNpemVfYWxpZ25lZCk7Ci0JaWYgKCFvYmopCisJaWYgKElTX0VS UihvYmopKQogCQlyZXR1cm4gZmFsc2U7CiAKIAlzd2l0Y2ggKHBsYW5lX2NvbmZpZy0+dGlsaW5n KSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2LmMKaW5kZXggOTdj ZGUwMTc2NzBhLi4zZDEwNjE0NzBlNzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2ZiZGV2LmMKQEAgLTE0MSwxMCArMTQxLDEwIEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9h bGxvYyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCS8qIElmIHRoZSBGQiBpcyB0b28g YmlnLCBqdXN0IGRvbid0IHVzZSBpdCBzaW5jZSBmYmRldiBpcyBub3QgdmVyeQogCSAqIGltcG9y dGFudCBhbmQgd2Ugc2hvdWxkIHByb2JhYmx5IHVzZSB0aGF0IHNwYWNlIHdpdGggRkJDIG9yIG90 aGVyCiAJICogZmVhdHVyZXMuICovCi0Jb2JqID0gTlVMTDsKKwlvYmogPSBFUlJfUFRSKC1FTk9E RVYpOwogCWlmIChzaXplICogMiA8IGRldl9wcml2LT5zdG9sZW5fdXNhYmxlX3NpemUpCiAJCW9i aiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRldl9wcml2LCBzaXplKTsKLQlpZiAo b2JqID09IE5VTEwpCisJaWYgKElTX0VSUihvYmopKQogCQlvYmogPSBpOTE1X2dlbV9vYmplY3Rf Y3JlYXRlX3NobWVtKGRldl9wcml2LCBzaXplKTsKIAlpZiAoSVNfRVJSKG9iaikpIHsKIAkJRFJN X0VSUk9SKCJmYWlsZWQgdG8gYWxsb2NhdGUgZnJhbWVidWZmZXJcbiIpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9vdmVybGF5LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX292ZXJsYXkuYwppbmRleCBkYWVhMTEyY2JiODcuLjIz NjBmMTlmOTY5NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRl bF9vdmVybGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9vdmVy bGF5LmMKQEAgLTEyOTEsNyArMTI5MSw3IEBAIHN0YXRpYyBpbnQgZ2V0X3JlZ2lzdGVycyhzdHJ1 Y3QgaW50ZWxfb3ZlcmxheSAqb3ZlcmxheSwgYm9vbCB1c2VfcGh5cykKIAlpbnQgZXJyOwogCiAJ b2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oaTkxNSwgUEFHRV9TSVpFKTsKLQlp ZiAob2JqID09IE5VTEwpCisJaWYgKElTX0VSUihvYmopKQogCQlvYmogPSBpOTE1X2dlbV9vYmpl Y3RfY3JlYXRlX2ludGVybmFsKGk5MTUsIFBBR0VfU0laRSk7CiAJaWYgKElTX0VSUihvYmopKQog CQlyZXR1cm4gUFRSX0VSUihvYmopOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv Z2VtL2k5MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2Vt X3N0b2xlbi5jCmluZGV4IGZhZDk4YTkyMWNkZS4uMmEzNDM1NWI3MzhmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fc3RvbGVuLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX3N0b2xlbi5jCkBAIC01ODUsMjggKzU4NSwzMiBAQCBp OTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJaW50IHJldDsKIAogCWlmICghZHJtX21tX2luaXRpYWxpemVkKCZkZXZfcHJpdi0+ bW0uc3RvbGVuKSkKLQkJcmV0dXJuIE5VTEw7CisJCXJldHVybiBFUlJfUFRSKC1FTk9ERVYpOwog CiAJaWYgKHNpemUgPT0gMCkKLQkJcmV0dXJuIE5VTEw7CisJCXJldHVybiBFUlJfUFRSKC1FSU5W QUwpOwogCiAJc3RvbGVuID0ga3phbGxvYyhzaXplb2YoKnN0b2xlbiksIEdGUF9LRVJORUwpOwog CWlmICghc3RvbGVuKQotCQlyZXR1cm4gTlVMTDsKKwkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7 CiAKIAlyZXQgPSBpOTE1X2dlbV9zdG9sZW5faW5zZXJ0X25vZGUoZGV2X3ByaXYsIHN0b2xlbiwg c2l6ZSwgNDA5Nik7Ci0JaWYgKHJldCkgewotCQlrZnJlZShzdG9sZW4pOwotCQlyZXR1cm4gTlVM TDsKLQl9CisJaWYgKHJldCkKKwkJZ290byBlcnJfZnJlZTsKIAogCW9iaiA9IF9pOTE1X2dlbV9v YmplY3RfY3JlYXRlX3N0b2xlbihkZXZfcHJpdiwgc3RvbGVuKTsKLQlpZiAob2JqKQotCQlyZXR1 cm4gb2JqOworCWlmIChvYmogPT0gTlVMTCkgeworCQlyZXQgPSAtRU5PTUVNOworCQlnb3RvIGVy cl9yZW1vdmU7CisJfQogCisJcmV0dXJuIG9iajsKKworZXJyX3JlbW92ZToKIAlpOTE1X2dlbV9z dG9sZW5fcmVtb3ZlX25vZGUoZGV2X3ByaXYsIHN0b2xlbik7CitlcnJfZnJlZToKIAlrZnJlZShz dG9sZW4pOwotCXJldHVybiBOVUxMOworCXJldHVybiBFUlJfUFRSKHJldCk7CiB9CiAKIHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICoKQEAgLTYyMiw3ICs2MjYsNyBAQCBpOTE1X2dlbV9vYmpl Y3RfY3JlYXRlX3N0b2xlbl9mb3JfcHJlYWxsb2NhdGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdgogCWludCByZXQ7CiAKIAlpZiAoIWRybV9tbV9pbml0aWFsaXplZCgmZGV2X3By aXYtPm1tLnN0b2xlbikpCi0JCXJldHVybiBOVUxMOworCQlyZXR1cm4gRVJSX1BUUigtRU5PREVW KTsKIAogCURSTV9ERUJVR19EUklWRVIoImNyZWF0aW5nIHByZWFsbG9jYXRlZCBzdG9sZW4gb2Jq ZWN0OiBzdG9sZW5fb2Zmc2V0PSVwYSwgZ3R0X29mZnNldD0lcGEsIHNpemU9JXBhXG4iLAogCQkJ ICZzdG9sZW5fb2Zmc2V0LCAmZ3R0X29mZnNldCwgJnNpemUpOwpAQCAtNjMxLDExICs2MzUsMTEg QEAgaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW5fZm9yX3ByZWFsbG9jYXRlZChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYKIAlpZiAoV0FSTl9PTihzaXplID09IDApIHx8CiAJ ICAgIFdBUk5fT04oIUlTX0FMSUdORUQoc2l6ZSwgSTkxNV9HVFRfUEFHRV9TSVpFKSkgfHwKIAkg ICAgV0FSTl9PTighSVNfQUxJR05FRChzdG9sZW5fb2Zmc2V0LCBJOTE1X0dUVF9NSU5fQUxJR05N RU5UKSkpCi0JCXJldHVybiBOVUxMOworCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFMKTsKIAogCXN0 b2xlbiA9IGt6YWxsb2Moc2l6ZW9mKCpzdG9sZW4pLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXN0b2xl bikKLQkJcmV0dXJuIE5VTEw7CisJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCiAJc3RvbGVu LT5zdGFydCA9IHN0b2xlbl9vZmZzZXQ7CiAJc3RvbGVuLT5zaXplID0gc2l6ZTsKQEAgLTY0NSw3 ICs2NDksNyBAQCBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbl9mb3JfcHJlYWxsb2NhdGVk KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdgogCWlmIChyZXQpIHsKIAkJRFJNX0RF QlVHX0RSSVZFUigiZmFpbGVkIHRvIGFsbG9jYXRlIHN0b2xlbiBzcGFjZVxuIik7CiAJCWtmcmVl KHN0b2xlbik7Ci0JCXJldHVybiBOVUxMOworCQlyZXR1cm4gRVJSX1BUUihyZXQpOwogCX0KIAog CW9iaiA9IF9pOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbihkZXZfcHJpdiwgc3RvbGVuKTsK QEAgLTY1Myw3ICs2NTcsNyBAQCBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbl9mb3JfcHJl YWxsb2NhdGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdgogCQlEUk1fREVCVUdf RFJJVkVSKCJmYWlsZWQgdG8gYWxsb2NhdGUgc3RvbGVuIG9iamVjdFxuIik7CiAJCWk5MTVfZ2Vt X3N0b2xlbl9yZW1vdmVfbm9kZShkZXZfcHJpdiwgc3RvbGVuKTsKIAkJa2ZyZWUoc3RvbGVuKTsK LQkJcmV0dXJuIE5VTEw7CisJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCX0KIAogCS8qIFNv bWUgb2JqZWN0cyBqdXN0IG5lZWQgcGh5c2ljYWwgbWVtIGZyb20gc3RvbGVuIHNwYWNlICovCkBA IC03MDYsNSArNzEwLDUgQEAgaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW5fZm9yX3ByZWFs bG9jYXRlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYKIAlpOTE1X2dlbV9vYmpl Y3RfdW5waW5fcGFnZXMob2JqKTsKIGVycjoKIAlpOTE1X2dlbV9vYmplY3RfcHV0KG9iaik7Ci0J cmV0dXJuIE5VTEw7CisJcmV0dXJuIEVSUl9QVFIocmV0KTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX2d0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9p bnRlbF9ndC5jCmluZGV4IDUzMjIwNzQxZTQ5ZS4uOGY0NGNmOGM3OWIyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9ndC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2d0L2ludGVsX2d0LmMKQEAgLTMzNCw3ICszMzQsNyBAQCBzdGF0aWMgaW50IGludGVsX2d0 X2luaXRfc2NyYXRjaChzdHJ1Y3QgaW50ZWxfZ3QgKmd0LCB1bnNpZ25lZCBpbnQgc2l6ZSkKIAlp bnQgcmV0OwogCiAJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oaTkxNSwgc2l6 ZSk7Ci0JaWYgKCFvYmopCisJaWYgKElTX0VSUihvYmopKQogCQlvYmogPSBpOTE1X2dlbV9vYmpl Y3RfY3JlYXRlX2ludGVybmFsKGk5MTUsIHNpemUpOwogCWlmIChJU19FUlIob2JqKSkgewogCQlE Uk1fRVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSBzY3JhdGNoIHBhZ2VcbiIpOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfcmM2LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9ndC9pbnRlbF9yYzYuYwppbmRleCBkNjE2N2RkNTkyZTkuLjcxMTg0YWE3Mjg5NiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfcmM2LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfcmM2LmMKQEAgLTI5OSw4ICsyOTksOCBAQCBzdGF0aWMg aW50IHZsdl9yYzZfaW5pdChzdHJ1Y3QgaW50ZWxfcmM2ICpyYzYpCiAJCQkJCQkJCSAgICAgIHBj YnJfb2Zmc2V0LAogCQkJCQkJCQkgICAgICBJOTE1X0dUVF9PRkZTRVRfTk9ORSwKIAkJCQkJCQkJ ICAgICAgcGN0eF9zaXplKTsKLQkJaWYgKCFwY3R4KQotCQkJcmV0dXJuIC1FTk9NRU07CisJCWlm IChJU19FUlIocGN0eCkpCisJCQlyZXR1cm4gUFRSX0VSUihwY3R4KTsKIAogCQlnb3RvIG91dDsK IAl9CkBAIC0zMTYsOSArMzE2LDkgQEAgc3RhdGljIGludCB2bHZfcmM2X2luaXQoc3RydWN0IGlu dGVsX3JjNiAqcmM2KQogCSAqIG1lbW9yeSwgb3IgYW55IG90aGVyIHJlbGV2YW50IHJhbmdlcy4K IAkgKi8KIAlwY3R4ID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oaTkxNSwgcGN0eF9z aXplKTsKLQlpZiAoIXBjdHgpIHsKKwlpZiAoSVNfRVJSKHBjdHgpKSB7CiAJCURSTV9ERUJVRygi bm90IGVub3VnaCBzdG9sZW4gc3BhY2UgZm9yIFBDVFgsIGRpc2FibGluZ1xuIik7Ci0JCXJldHVy biAtRU5PTUVNOworCQlyZXR1cm4gUFRSX0VSUihwY3R4KTsKIAl9CiAKIAlHRU1fQlVHX09OKHJh bmdlX292ZXJmbG93c190KHU2NCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0 L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3Jpbmdi dWZmZXIuYwppbmRleCBlYzMyOTk2MjU0YzAuLjMxMWZkYzBhMjFiYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2d0L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTI3NCw3ICsxMjc0LDcgQEAgc3Rh dGljIHN0cnVjdCBpOTE1X3ZtYSAqY3JlYXRlX3Jpbmdfdm1hKHN0cnVjdCBpOTE1X2dndHQgKmdn dHQsIGludCBzaXplKQogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwogCiAJb2JqID0gaTkxNV9nZW1f b2JqZWN0X2NyZWF0ZV9zdG9sZW4oaTkxNSwgc2l6ZSk7Ci0JaWYgKCFvYmopCisJaWYgKElTX0VS UihvYmopKQogCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX2ludGVybmFsKGk5MTUsIHNp emUpOwogCWlmIChJU19FUlIob2JqKSkKIAkJcmV0dXJuIEVSUl9DQVNUKG9iaik7Ci0tIAoyLjIw LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==