From: Rob Clark Subject: [PATCH 4/6] drm/msm: refactor how we handle vram carveout buffers Date: Tue, 13 Jun 2017 14:49:46 -0400 Message-ID: <20170613184948.8278-5-robdclark@gmail.com> References: <20170613184948.8278-1-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170613184948.8278-1-robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Rob Clark , Jordan Crouse , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Archit Taneja List-Id: dri-devel@lists.freedesktop.org UHVsbCBzb21lIG9mIHRoZSBsb2dpYyBvdXQgaW50byBtc21fZ2VtX25ldygpIChzaW5jZSB3ZSBk b24ndCBuZWVkIHRvCmNhcmUgYWJvdXQgdGhlIGltcG9ydGVkLWJvIGNhc2UpLCBhbmQgZG9uJ3Qg ZGVmZXIgYWxsb2NhdGluZyBwYWdlcy4gIFRoZQpsYXR0ZXIgaXMgZ2VuZXJhbGx5IGEgZ29vZCBp ZGVhLCBzaW5jZSBpZiB3ZSBhcmUgdXNpbmcgVlJBTSBjYXJ2ZW91dCB0bwphbGxvY2F0ZSBjb250 aWd1b3VzIGJ1ZmZlcnMgKGllLiBubyBJT01NVSksIHRoZSBhbGxvY2F0aW9uIGlzIG1vcmUKbGlr ZWx5IHRvIGZhaWwuICBTbyBmYWlsaW5nIGF0IGFsbG9jYXRpb24gdGltZSBpcyBhIG1vcmUgc2Fu ZSBvcHRpb24uClBsdXMgdGhpcyBzaW1wbGlmaWVzIHRoaW5ncyBpbiB0aGUgbmV4dCBwYXRjaC4K ClNpZ25lZC1vZmYtYnk6IFJvYiBDbGFyayA8cm9iZGNsYXJrQGdtYWlsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vbXNtL21zbV9nZW0uYyB8IDQ4ICsrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAyMSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9nZW0uYyBi L2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2dlbS5jCmluZGV4IDJmNDcwYTYuLjc1NDQzMmMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9tc20vbXNtX2dlbS5jCkBAIC0zMjQsMTIgKzMyNCw4IEBAIGludCBtc21fZ2VtX2dldF9p b3ZhX2xvY2tlZChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKIAkJaWYgKElTX0VSUihwYWdl cykpCiAJCQlyZXR1cm4gUFRSX0VSUihwYWdlcyk7CiAKLQkJaWYgKGlvbW11X3ByZXNlbnQoJnBs YXRmb3JtX2J1c190eXBlKSkgewotCQkJcmV0ID0gbXNtX2dlbV9tYXBfdm1hKHByaXYtPmFzcGFj ZVtpZF0sICZtc21fb2JqLT5kb21haW5baWRdLAotCQkJCQltc21fb2JqLT5zZ3QsIG9iai0+c2l6 ZSA+PiBQQUdFX1NISUZUKTsKLQkJfSBlbHNlIHsKLQkJCW1zbV9vYmotPmRvbWFpbltpZF0uaW92 YSA9IHBoeXNhZGRyKG9iaik7Ci0JCX0KKwkJcmV0ID0gbXNtX2dlbV9tYXBfdm1hKHByaXYtPmFz cGFjZVtpZF0sICZtc21fb2JqLT5kb21haW5baWRdLAorCQkJCW1zbV9vYmotPnNndCwgb2JqLT5z aXplID4+IFBBR0VfU0hJRlQpOwogCX0KIAogCWlmICghcmV0KQpAQCAtNzY1LDcgKzc2MSw2IEBA IHN0YXRpYyBpbnQgbXNtX2dlbV9uZXdfaW1wbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogewog CXN0cnVjdCBtc21fZHJtX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVj dCBtc21fZ2VtX29iamVjdCAqbXNtX29iajsKLQlib29sIHVzZV92cmFtID0gZmFsc2U7CiAKIAlz d2l0Y2ggKGZsYWdzICYgTVNNX0JPX0NBQ0hFX01BU0spIHsKIAljYXNlIE1TTV9CT19VTkNBQ0hF RDoKQEAgLTc3OCwyMSArNzczLDEwIEBAIHN0YXRpYyBpbnQgbXNtX2dlbV9uZXdfaW1wbChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlpZiAoIWlvbW11 X3ByZXNlbnQoJnBsYXRmb3JtX2J1c190eXBlKSkKLQkJdXNlX3ZyYW0gPSB0cnVlOwotCWVsc2Ug aWYgKChmbGFncyAmIE1TTV9CT19TVE9MRU4pICYmIHByaXYtPnZyYW0uc2l6ZSkKLQkJdXNlX3Zy YW0gPSB0cnVlOwotCi0JaWYgKFdBUk5fT04odXNlX3ZyYW0gJiYgIXByaXYtPnZyYW0uc2l6ZSkp Ci0JCXJldHVybiAtRUlOVkFMOwotCiAJbXNtX29iaiA9IGt6YWxsb2Moc2l6ZW9mKCptc21fb2Jq KSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFtc21fb2JqKQogCQlyZXR1cm4gLUVOT01FTTsKIAotCWlm ICh1c2VfdnJhbSkKLQkJbXNtX29iai0+dnJhbV9ub2RlID0gJm1zbV9vYmotPmRvbWFpblswXS5u b2RlOwotCiAJbXNtX29iai0+ZmxhZ3MgPSBmbGFnczsKIAltc21fb2JqLT5tYWR2ID0gTVNNX01B RFZfV0lMTE5FRUQ7CiAKQEAgLTgxNCwxMyArNzk4LDIzIEBAIHN0YXRpYyBpbnQgbXNtX2dlbV9u ZXdfaW1wbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogc3RydWN0IGRybV9nZW1fb2JqZWN0ICpt c21fZ2VtX25ldyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQl1aW50MzJfdCBzaXplLCB1aW50 MzJfdCBmbGFncykKIHsKKwlzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiA9IE5VTEw7CisJYm9vbCB1c2Vf dnJhbSA9IGZhbHNlOwogCWludCByZXQ7CiAKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmRl di0+c3RydWN0X211dGV4KSk7CiAKIAlzaXplID0gUEFHRV9BTElHTihzaXplKTsKIAorCWlmICgh aW9tbXVfcHJlc2VudCgmcGxhdGZvcm1fYnVzX3R5cGUpKQorCQl1c2VfdnJhbSA9IHRydWU7CisJ ZWxzZSBpZiAoKGZsYWdzICYgTVNNX0JPX1NUT0xFTikgJiYgcHJpdi0+dnJhbS5zaXplKQorCQl1 c2VfdnJhbSA9IHRydWU7CisKKwlpZiAoV0FSTl9PTih1c2VfdnJhbSAmJiAhcHJpdi0+dnJhbS5z aXplKSkKKwkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7CisKIAkvKiBEaXNhbGxvdyB6ZXJvIHNp emVkIG9iamVjdHMgYXMgdGhleSBtYWtlIHRoZSB1bmRlcmx5aW5nCiAJICogaW5mcmFzdHJ1Y3R1 cmUgZ3J1bXB5CiAJICovCkBAIC04MzEsMTIgKzgyNSwyNCBAQCBzdHJ1Y3QgZHJtX2dlbV9vYmpl Y3QgKm1zbV9nZW1fbmV3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKHJldCkKIAkJZ290 byBmYWlsOwogCi0JaWYgKHVzZV9wYWdlcyhvYmopKSB7CisJaWYgKHVzZV92cmFtKSB7CisJCXN0 cnVjdCBtc21fZ2VtX29iamVjdCAqbXNtX29iaiA9IHRvX21zbV9ibyhvYmopOworCQlzdHJ1Y3Qg cGFnZSAqKnBhZ2VzOworCisJCW1zbV9vYmotPnZyYW1fbm9kZSA9ICZtc21fb2JqLT5kb21haW5b MF0ubm9kZTsKKwkJZHJtX2dlbV9wcml2YXRlX29iamVjdF9pbml0KGRldiwgb2JqLCBzaXplKTsK KworCQltc21fb2JqLT5wYWdlcyA9IGdldF9wYWdlcyhvYmopOworCQlwYWdlcyA9IGdldF9wYWdl cyhvYmopOworCQlpZiAoSVNfRVJSKHBhZ2VzKSkgeworCQkJcmV0ID0gUFRSX0VSUihwYWdlcyk7 CisJCQlnb3RvIGZhaWw7CisJCX0KKwkJbXNtX29iai0+ZG9tYWluWzBdLmlvdmEgPSBwaHlzYWRk cihvYmopOworCX0gZWxzZSB7CiAJCXJldCA9IGRybV9nZW1fb2JqZWN0X2luaXQoZGV2LCBvYmos IHNpemUpOwogCQlpZiAocmV0KQogCQkJZ290byBmYWlsOwotCX0gZWxzZSB7Ci0JCWRybV9nZW1f cHJpdmF0ZV9vYmplY3RfaW5pdChkZXYsIG9iaiwgc2l6ZSk7CiAJfQogCiAJcmV0dXJuIG9iajsK LS0gCjIuOS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVlZHJlbm8K