From: Rob Clark Subject: [PATCH 5/6] drm/msm: support for an arbitrary number of address spaces Date: Tue, 13 Jun 2017 14:49:47 -0400 Message-ID: <20170613184948.8278-6-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 SXQgbWVhbnMgd2UgaGF2ZSB0byBkbyBhIGxpc3QgdHJhdmVyc2FsIHdoZXJlIHdlIG9uY2UgaGFk IGFuIGluZGV4IGludG8KYSB0YWJsZS4gIEJ1dCB0aGUgbGlzdCB3aWxsIG5vcm1hbGx5IGhhdmUg b25lIG9yIHR3byBlbnRyaWVzLgoKU2lnbmVkLW9mZi1ieTogUm9iIENsYXJrIDxyb2JkY2xhcmtA Z21haWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2dlbS5jIHwgMTM4ICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21z bS9tc21fZ2VtLmggfCAgIDQgKy0KIDIgZmlsZXMgY2hhbmdlZCwgOTkgaW5zZXJ0aW9ucygrKSwg NDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9nZW0uYwppbmRleCA3NTQ0MzJjLi40MTAzNjhm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9nZW0uYworKysgYi9kcml2ZXJz L2dwdS9kcm0vbXNtL21zbV9nZW0uYwpAQCAtMjgzLDIxICsyODMsNTkgQEAgdWludDY0X3QgbXNt X2dlbV9tbWFwX29mZnNldChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAlyZXR1cm4gb2Zm c2V0OwogfQogCitzdGF0aWMgc3RydWN0IG1zbV9nZW1fdm1hICphZGRfdm1hKHN0cnVjdCBkcm1f Z2VtX29iamVjdCAqb2JqLAorCQlzdHJ1Y3QgbXNtX2dlbV9hZGRyZXNzX3NwYWNlICphc3BhY2Up Cit7CisJc3RydWN0IG1zbV9nZW1fb2JqZWN0ICptc21fb2JqID0gdG9fbXNtX2JvKG9iaik7CisJ c3RydWN0IG1zbV9nZW1fdm1hICp2bWE7CisKKwl2bWEgPSBremFsbG9jKHNpemVvZigqdm1hKSwg R0ZQX0tFUk5FTCk7CisJaWYgKCF2bWEpCisJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOworCisJ dm1hLT5hc3BhY2UgPSBhc3BhY2U7CisKKwlsaXN0X2FkZF90YWlsKCZ2bWEtPmxpc3QsICZtc21f b2JqLT52bWFzKTsKKworCXJldHVybiB2bWE7Cit9CisKK3N0YXRpYyBzdHJ1Y3QgbXNtX2dlbV92 bWEgKmxvb2t1cF92bWEoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosCisJCXN0cnVjdCBtc21f Z2VtX2FkZHJlc3Nfc3BhY2UgKmFzcGFjZSkKK3sKKwlzdHJ1Y3QgbXNtX2dlbV9vYmplY3QgKm1z bV9vYmogPSB0b19tc21fYm8ob2JqKTsKKwlzdHJ1Y3QgbXNtX2dlbV92bWEgKnZtYTsKKworCVdB Uk5fT04oIW11dGV4X2lzX2xvY2tlZCgmb2JqLT5kZXYtPnN0cnVjdF9tdXRleCkpOworCisJbGlz dF9mb3JfZWFjaF9lbnRyeSh2bWEsICZtc21fb2JqLT52bWFzLCBsaXN0KSB7CisJCWlmICh2bWEt PmFzcGFjZSA9PSBhc3BhY2UpCisJCQlyZXR1cm4gdm1hOworCX0KKworCXJldHVybiBOVUxMOwor fQorCitzdGF0aWMgdm9pZCBkZWxfdm1hKHN0cnVjdCBtc21fZ2VtX3ZtYSAqdm1hKQoreworCWlm ICghdm1hKQorCQlyZXR1cm47CisKKwlsaXN0X2RlbCgmdm1hLT5saXN0KTsKKwlrZnJlZSh2bWEp OworfQorCiBzdGF0aWMgdm9pZAogcHV0X2lvdmEoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmop CiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG9iai0+ZGV2OwotCXN0cnVjdCBtc21fZHJt X3ByaXZhdGUgKnByaXYgPSBvYmotPmRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IG1zbV9nZW1f b2JqZWN0ICptc21fb2JqID0gdG9fbXNtX2JvKG9iaik7Ci0JaW50IGlkOworCXN0cnVjdCBtc21f Z2VtX3ZtYSAqdm1hLCAqdG1wOwogCi0JV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZkZXYtPnN0 cnVjdF9tdXRleCkpOworCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmb2JqLT5kZXYtPnN0cnVj dF9tdXRleCkpOwogCi0JZm9yIChpZCA9IDA7IGlkIDwgQVJSQVlfU0laRShtc21fb2JqLT5kb21h aW4pOyBpZCsrKSB7Ci0JCWlmICghcHJpdi0+YXNwYWNlW2lkXSkKLQkJCWNvbnRpbnVlOwotCQlt c21fZ2VtX3VubWFwX3ZtYShwcml2LT5hc3BhY2VbaWRdLAotCQkJCSZtc21fb2JqLT5kb21haW5b aWRdLCBtc21fb2JqLT5zZ3QpOworCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZSh2bWEsIHRtcCwg Jm1zbV9vYmotPnZtYXMsIGxpc3QpIHsKKwkJbXNtX2dlbV91bm1hcF92bWEodm1hLT5hc3BhY2Us IHZtYSwgbXNtX29iai0+c2d0KTsKKwkJZGVsX3ZtYSh2bWEpOwogCX0KIH0KIApAQCAtMzEyLDI0 ICszNTAsMzcgQEAgaW50IG1zbV9nZW1fZ2V0X2lvdmFfbG9ja2VkKHN0cnVjdCBkcm1fZ2VtX29i amVjdCAqb2JqLAogCQlzdHJ1Y3QgbXNtX2dlbV9hZGRyZXNzX3NwYWNlICphc3BhY2UsIHVpbnQ2 NF90ICppb3ZhKQogewogCXN0cnVjdCBtc21fZ2VtX29iamVjdCAqbXNtX29iaiA9IHRvX21zbV9i byhvYmopOwotCWludCBpZCA9IGFzcGFjZSA/IGFzcGFjZS0+aWQgOiAwOworCXN0cnVjdCBtc21f Z2VtX3ZtYSAqdm1hOwogCWludCByZXQgPSAwOwogCiAJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2Vk KCZvYmotPmRldi0+c3RydWN0X211dGV4KSk7CiAKLQlpZiAoIW1zbV9vYmotPmRvbWFpbltpZF0u aW92YSkgewotCQlzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2ID0gb2JqLT5kZXYtPmRldl9w cml2YXRlOwotCQlzdHJ1Y3QgcGFnZSAqKnBhZ2VzID0gZ2V0X3BhZ2VzKG9iaik7CisJdm1hID0g bG9va3VwX3ZtYShvYmosIGFzcGFjZSk7CiAKLQkJaWYgKElTX0VSUihwYWdlcykpCi0JCQlyZXR1 cm4gUFRSX0VSUihwYWdlcyk7CisJaWYgKCF2bWEpIHsKKwkJc3RydWN0IHBhZ2UgKipwYWdlczsK KworCQl2bWEgPSBhZGRfdm1hKG9iaiwgYXNwYWNlKTsKKwkJaWYgKElTX0VSUih2bWEpKQorCQkJ cmV0dXJuIFBUUl9FUlIodm1hKTsKKworCQlwYWdlcyA9IGdldF9wYWdlcyhvYmopOworCQlpZiAo SVNfRVJSKHBhZ2VzKSkgeworCQkJcmV0ID0gUFRSX0VSUihwYWdlcyk7CisJCQlnb3RvIGZhaWw7 CisJCX0KIAotCQlyZXQgPSBtc21fZ2VtX21hcF92bWEocHJpdi0+YXNwYWNlW2lkXSwgJm1zbV9v YmotPmRvbWFpbltpZF0sCi0JCQkJbXNtX29iai0+c2d0LCBvYmotPnNpemUgPj4gUEFHRV9TSElG VCk7CisJCXJldCA9IG1zbV9nZW1fbWFwX3ZtYShhc3BhY2UsIHZtYSwgbXNtX29iai0+c2d0LAor CQkJCW9iai0+c2l6ZSA+PiBQQUdFX1NISUZUKTsKKwkJaWYgKHJldCkKKwkJCWdvdG8gZmFpbDsK IAl9CiAKLQlpZiAoIXJldCkKLQkJKmlvdmEgPSBtc21fb2JqLT5kb21haW5baWRdLmlvdmE7CisJ KmlvdmEgPSB2bWEtPmlvdmE7CisJcmV0dXJuIDA7CisKK2ZhaWw6CisJZGVsX3ZtYSh2bWEpOwog CiAJcmV0dXJuIHJldDsKIH0KQEAgLTMzOCwyMiArMzg5LDEyIEBAIGludCBtc21fZ2VtX2dldF9p b3ZhX2xvY2tlZChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwKIGludCBtc21fZ2VtX2dldF9p b3ZhKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLAogCQlzdHJ1Y3QgbXNtX2dlbV9hZGRyZXNz X3NwYWNlICphc3BhY2UsIHVpbnQ2NF90ICppb3ZhKQogewotCXN0cnVjdCBtc21fZ2VtX29iamVj dCAqbXNtX29iaiA9IHRvX21zbV9ibyhvYmopOwotCWludCBpZCA9IGFzcGFjZSA/IGFzcGFjZS0+ aWQgOiAwOwogCWludCByZXQ7CiAKLQkvKiB0aGlzIGlzIHNhZmUgcmlnaHQgbm93IGJlY2F1c2Ug d2UgZG9uJ3QgdW5tYXAgdW50aWwgdGhlCi0JICogYm8gaXMgZGVsZXRlZDoKLQkgKi8KLQlpZiAo bXNtX29iai0+ZG9tYWluW2lkXS5pb3ZhKSB7Ci0JCW1pZ2h0X2xvY2soJm9iai0+ZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwotCQkqaW92YSA9IG1zbV9vYmotPmRvbWFpbltpZF0uaW92YTsKLQkJcmV0dXJu IDA7Ci0JfQotCiAJbXV0ZXhfbG9jaygmb2JqLT5kZXYtPnN0cnVjdF9tdXRleCk7CiAJcmV0ID0g bXNtX2dlbV9nZXRfaW92YV9sb2NrZWQob2JqLCBhc3BhY2UsIGlvdmEpOwogCW11dGV4X3VubG9j aygmb2JqLT5kZXYtPnN0cnVjdF9tdXRleCk7CisKIAlyZXR1cm4gcmV0OwogfQogCkBAIC0zNjMs MTAgKzQwNCwxNCBAQCBpbnQgbXNtX2dlbV9nZXRfaW92YShzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg Km9iaiwKIHVpbnQ2NF90IG1zbV9nZW1faW92YShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwK IAkJc3RydWN0IG1zbV9nZW1fYWRkcmVzc19zcGFjZSAqYXNwYWNlKQogewotCXN0cnVjdCBtc21f Z2VtX29iamVjdCAqbXNtX29iaiA9IHRvX21zbV9ibyhvYmopOwotCWludCBpZCA9IGFzcGFjZSA/ IGFzcGFjZS0+aWQgOiAwOwotCVdBUk5fT04oIW1zbV9vYmotPmRvbWFpbltpZF0uaW92YSk7Ci0J cmV0dXJuIG1zbV9vYmotPmRvbWFpbltpZF0uaW92YTsKKwlzdHJ1Y3QgbXNtX2dlbV92bWEgKnZt YTsKKworCW11dGV4X2xvY2soJm9iai0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCXZtYSA9IGxvb2t1 cF92bWEob2JqLCBhc3BhY2UpOworCW11dGV4X3VubG9jaygmb2JqLT5kZXYtPnN0cnVjdF9tdXRl eCk7CisJV0FSTl9PTighdm1hKTsKKworCXJldHVybiB2bWEgPyB2bWEtPmlvdmEgOiAwOwogfQog CiB2b2lkIG1zbV9nZW1fcHV0X2lvdmEoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosCkBAIC02 MjQsMTEgKzY2OSwxMCBAQCB2b2lkIG1zbV9nZW1fZGVzY3JpYmUoc3RydWN0IGRybV9nZW1fb2Jq ZWN0ICpvYmosIHN0cnVjdCBzZXFfZmlsZSAqbSkKIAlzdHJ1Y3QgbXNtX2dlbV9vYmplY3QgKm1z bV9vYmogPSB0b19tc21fYm8ob2JqKTsKIAlzdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0ICpyb2Jq ID0gbXNtX29iai0+cmVzdjsKIAlzdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0X2xpc3QgKmZvYmo7 Ci0Jc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdiA9IG9iai0+ZGV2LT5kZXZfcHJpdmF0ZTsK IAlzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZTsKKwlzdHJ1Y3QgbXNtX2dlbV92bWEgKnZtYTsKIAl1 aW50NjRfdCBvZmYgPSBkcm1fdm1hX25vZGVfc3RhcnQoJm9iai0+dm1hX25vZGUpOwogCWNvbnN0 IGNoYXIgKm1hZHY7Ci0JdW5zaWduZWQgaWQ7CiAKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQo Jm9iai0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIApAQCAtNjUwLDggKzY5NCw5IEBAIHZvaWQgbXNt X2dlbV9kZXNjcmliZShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IHNlcV9maWxl ICptKQogCQkJb2JqLT5uYW1lLCBrcmVmX3JlYWQoJm9iai0+cmVmY291bnQpLAogCQkJb2ZmLCBt c21fb2JqLT52YWRkcik7CiAKLQlmb3IgKGlkID0gMDsgaWQgPCBwcml2LT5udW1fYXNwYWNlczsg aWQrKykKLQkJc2VxX3ByaW50ZihtLCAiICUwOGxseCIsIG1zbV9vYmotPmRvbWFpbltpZF0uaW92 YSk7CisJLyogRklYTUU6IHdlIG5lZWQgdG8gcHJpbnQgdGhlIGFkZHJlc3Mgc3BhY2UgaGVyZSB0 b28gKi8KKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgJm1zbV9vYmotPnZtYXMsIGxpc3QpCisJ CXNlcV9wcmludGYobSwgIiAlMDhsbHgiLCB2bWEtPmlvdmEpOwogCiAJc2VxX3ByaW50ZihtLCAi ICV6dSVzXG4iLCBvYmotPnNpemUsIG1hZHYpOwogCkBAIC03ODgsNiArODMzLDggQEAgc3RhdGlj IGludCBtc21fZ2VtX25ld19pbXBsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJfQogCiAJSU5J VF9MSVNUX0hFQUQoJm1zbV9vYmotPnN1Ym1pdF9lbnRyeSk7CisJSU5JVF9MSVNUX0hFQUQoJm1z bV9vYmotPnZtYXMpOworCiAJbGlzdF9hZGRfdGFpbCgmbXNtX29iai0+bW1fbGlzdCwgJnByaXYt PmluYWN0aXZlX2xpc3QpOwogCiAJKm9iaiA9ICZtc21fb2JqLT5iYXNlOwpAQCAtODI2LDE5ICs4 NzMsMjYgQEAgc3RydWN0IGRybV9nZW1fb2JqZWN0ICptc21fZ2VtX25ldyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQlnb3RvIGZhaWw7CiAKIAlpZiAodXNlX3ZyYW0pIHsKLQkJc3RydWN0IG1z bV9nZW1fb2JqZWN0ICptc21fb2JqID0gdG9fbXNtX2JvKG9iaik7CisJCXN0cnVjdCBtc21fZ2Vt X3ZtYSAqdm1hOwogCQlzdHJ1Y3QgcGFnZSAqKnBhZ2VzOwogCi0JCW1zbV9vYmotPnZyYW1fbm9k ZSA9ICZtc21fb2JqLT5kb21haW5bMF0ubm9kZTsKKwkJdm1hID0gYWRkX3ZtYShvYmosIE5VTEwp OworCQlpZiAoSVNfRVJSKHZtYSkpIHsKKwkJCXJldCA9IFBUUl9FUlIodm1hKTsKKwkJCWdvdG8g ZmFpbDsKKwkJfQorCisJCXRvX21zbV9ibyhvYmopLT52cmFtX25vZGUgPSAmdm1hLT5ub2RlOwor CiAJCWRybV9nZW1fcHJpdmF0ZV9vYmplY3RfaW5pdChkZXYsIG9iaiwgc2l6ZSk7CiAKLQkJbXNt X29iai0+cGFnZXMgPSBnZXRfcGFnZXMob2JqKTsKIAkJcGFnZXMgPSBnZXRfcGFnZXMob2JqKTsK IAkJaWYgKElTX0VSUihwYWdlcykpIHsKIAkJCXJldCA9IFBUUl9FUlIocGFnZXMpOwogCQkJZ290 byBmYWlsOwogCQl9Ci0JCW1zbV9vYmotPmRvbWFpblswXS5pb3ZhID0gcGh5c2FkZHIob2JqKTsK KworCQl2bWEtPmlvdmEgPSBwaHlzYWRkcihvYmopOwogCX0gZWxzZSB7CiAJCXJldCA9IGRybV9n ZW1fb2JqZWN0X2luaXQoZGV2LCBvYmosIHNpemUpOwogCQlpZiAocmV0KQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ2VtLmggYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9n ZW0uaAppbmRleCA0YjRiMzUyLi5mZjQ2OGRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v bXNtL21zbV9nZW0uaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9nZW0uaApAQCAtMzks NiArMzksOCBAQCBzdHJ1Y3QgbXNtX2dlbV9hZGRyZXNzX3NwYWNlIHsKIHN0cnVjdCBtc21fZ2Vt X3ZtYSB7CiAJc3RydWN0IGRybV9tbV9ub2RlIG5vZGU7CiAJdWludDY0X3QgaW92YTsKKwlzdHJ1 Y3QgbXNtX2dlbV9hZGRyZXNzX3NwYWNlICphc3BhY2U7CisJc3RydWN0IGxpc3RfaGVhZCBsaXN0 OyAgICAvKiBub2RlIGluIG1zbV9nZW1fb2JqZWN0Ojp2bWFzICovCiB9OwogCiBzdHJ1Y3QgbXNt X2dlbV9vYmplY3QgewpAQCAtNzgsNyArODAsNyBAQCBzdHJ1Y3QgbXNtX2dlbV9vYmplY3Qgewog CXN0cnVjdCBzZ190YWJsZSAqc2d0OwogCXZvaWQgKnZhZGRyOwogCi0Jc3RydWN0IG1zbV9nZW1f dm1hIGRvbWFpbltOVU1fRE9NQUlOU107CisJc3RydWN0IGxpc3RfaGVhZCB2bWFzOyAgICAvKiBs aXN0IG9mIG1zbV9nZW1fdm1hICovCiAKIAkvKiBub3JtYWxseSAocmVzdiA9PSAmX3Jlc3YpIGV4 Y2VwdCBmb3IgaW1wb3J0ZWQgYm8ncyAqLwogCXN0cnVjdCByZXNlcnZhdGlvbl9vYmplY3QgKnJl c3Y7Ci0tIAoyLjkuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KRnJlZWRyZW5vIG1haWxpbmcgbGlzdApGcmVlZHJlbm9AbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWRy ZW5vCg==