From: Jordan Crouse Subject: [PATCH 08/16] drm/msm: Pass the MMU domain index in struct msm_file_private Date: Fri, 18 May 2018 15:34:52 -0600 Message-ID: <20180518213500.31595-9-jcrouse@codeaurora.org> References: <20180518213500.31595-1-jcrouse@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180518213500.31595-1-jcrouse@codeaurora.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: freedreno@lists.freedesktop.org Cc: jean-philippe.brucker@arm.com, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, tfiga@chromium.org, iommu@lists.linux-foundation.org, vivek.gautam@codeaurora.org, linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org UGFzcyB0aGUgaW5kZXggb2YgdGhlIE1NVSBkb21haW4gaW4gc3RydWN0IG1zbV9maWxlX3ByaXZh dGUgaW5zdGVhZApvZiBhc3N1bWluZyBncHUtPmlkIHRocm91Z2hvdXQgdGhlIHN1Ym1pdCBwYXRo LiBUaGlzIGNsZWFycyB0aGUgd2F5CnRvIGNoYW5nZSBjdHgtPmFzcGFjZSB0byBhIHBlci1pbnN0 YW5jZSBwYWdldGFibGUuCgpTaWduZWQtb2ZmLWJ5OiBKb3JkYW4gQ3JvdXNlIDxqY3JvdXNlQGNv ZGVhdXJvcmEub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5jICAgICAgICB8 IDE2ICsrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5oICAgICAg ICB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2dlbS5oICAgICAgICB8ICAxICsKIGRy aXZlcnMvZ3B1L2RybS9tc20vbXNtX2dlbV9zdWJtaXQuYyB8IDExICsrKysrKy0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vbXNtL21zbV9ncHUuYyAgICAgICAgfCAgNSArKy0tLQogNSBmaWxlcyBjaGFu Z2VkLCAxNCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5j CmluZGV4IDMwY2Q1MTRkOGY3Yy4uMmI2NjM0MzVhM2Y3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vbXNtL21zbV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuYwpA QCAtNTAyLDYgKzUwMiw3IEBAIHN0YXRpYyB2b2lkIGxvYWRfZ3B1KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAKIHN0YXRpYyBpbnQgY29udGV4dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIHsKKwlzdHJ1Y3QgbXNtX2RybV9wcml2YXRlICpwcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgbXNtX2ZpbGVfcHJpdmF0ZSAqY3R4OwogCiAJ Y3R4ID0ga3phbGxvYyhzaXplb2YoKmN0eCksIEdGUF9LRVJORUwpOwpAQCAtNTEwLDYgKzUxMSw3 IEBAIHN0YXRpYyBpbnQgY29udGV4dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVj dCBkcm1fZmlsZSAqZmlsZSkKIAogCW1zbV9zdWJtaXRxdWV1ZV9pbml0KGRldiwgY3R4KTsKIAor CWN0eC0+YXNwYWNlID0gcHJpdi0+Z3B1LT5hc3BhY2U7CiAJZmlsZS0+ZHJpdmVyX3ByaXYgPSBj dHg7CiAKIAlyZXR1cm4gMDsKQEAgLTY4MywxNyArNjg1LDYgQEAgc3RhdGljIGludCBtc21faW9j dGxfZ2VtX2NwdV9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJcmV0 dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBtc21faW9jdGxfZ2VtX2luZm9faW92YShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAotCQlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgdWludDY0X3Qg KmlvdmEpCi17Ci0Jc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7Ci0KLQlpZiAoIXByaXYtPmdwdSkKLQkJcmV0dXJuIC1FSU5WQUw7Ci0KLQlyZXR1cm4gbXNt X2dlbV9nZXRfaW92YShvYmosIHByaXYtPmdwdS0+YXNwYWNlLCBpb3ZhKTsKLX0KLQogc3RhdGlj IGludCBtc21faW9jdGxfZ2VtX2luZm8oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAkJc3RydWN0IGRybV9maWxlICpmaWxlKQogewpAQCAtNzA5LDkgKzcwMCwxMCBAQCBzdGF0 aWMgaW50IG1zbV9pb2N0bF9nZW1faW5mbyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLAogCQlyZXR1cm4gLUVOT0VOVDsKIAogCWlmIChhcmdzLT5mbGFncyAmIE1TTV9JTkZPX0lP VkEpIHsKKwkJc3RydWN0IG1zbV9maWxlX3ByaXZhdGUgKmN0eCA9IGZpbGUtPmRyaXZlcl9wcml2 OwogCQl1aW50NjRfdCBpb3ZhOwogCi0JCXJldCA9IG1zbV9pb2N0bF9nZW1faW5mb19pb3ZhKGRl diwgb2JqLCAmaW92YSk7CisJCXJldCA9IG1zbV9nZW1fZ2V0X2lvdmEob2JqLCBjdHgtPmFzcGFj ZSwgJmlvdmEpOwogCQlpZiAoIXJldCkKIAkJCWFyZ3MtPm9mZnNldCA9IGlvdmE7CiAJfSBlbHNl IHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL21zbS9tc21fZHJ2LmgKaW5kZXggNDhlZDViOWE4NTgwLi44OTdiMDgxMzU5MjcgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9tc20vbXNtX2Rydi5oCkBAIC01OCw2ICs1OCw3IEBAIHN0cnVjdCBtc21fZmlsZV9wcml2 YXRlIHsKIAlyd2xvY2tfdCBxdWV1ZWxvY2s7CiAJc3RydWN0IGxpc3RfaGVhZCBzdWJtaXRxdWV1 ZXM7CiAJaW50IHF1ZXVlaWQ7CisJc3RydWN0IG1zbV9nZW1fYWRkcmVzc19zcGFjZSAqYXNwYWNl OwogfTsKIAogZW51bSBtc21fbWRwX3BsYW5lX3Byb3BlcnR5IHsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9tc20vbXNtX2dlbS5oIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ2VtLmgK aW5kZXggYzVkOWJkM2U0N2E4Li5mZThiM2FhN2Q3NmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9tc20vbXNtX2dlbS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2dlbS5oCkBA IC0xMzgsNiArMTM4LDcgQEAgdm9pZCBtc21fZ2VtX3Z1bm1hcChzdHJ1Y3QgZHJtX2dlbV9vYmpl Y3QgKm9iaiwgZW51bSBtc21fZ2VtX2xvY2sgc3ViY2xhc3MpOwogc3RydWN0IG1zbV9nZW1fc3Vi bWl0IHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2OwogCXN0cnVjdCBtc21fZ3B1ICpncHU7CisJ c3RydWN0IG1zbV9nZW1fYWRkcmVzc19zcGFjZSAqYXNwYWNlOwogCXN0cnVjdCBsaXN0X2hlYWQg bm9kZTsgICAvKiBub2RlIGluIHJpbmcgc3VibWl0IGxpc3QgKi8KIAlzdHJ1Y3QgbGlzdF9oZWFk IGJvX2xpc3Q7CiAJc3RydWN0IHd3X2FjcXVpcmVfY3R4IHRpY2tldDsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9tc20vbXNtX2dlbV9zdWJtaXQuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20v bXNtX2dlbV9zdWJtaXQuYwppbmRleCA3YmQ4M2UwYWZhOTcuLmQ1ZGZmY2JhOTkxOSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ2VtX3N1Ym1pdC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9tc20vbXNtX2dlbV9zdWJtaXQuYwpAQCAtMzEsOCArMzEsOCBAQAogI2RlZmluZSBC T19QSU5ORUQgICAweDIwMDAKIAogc3RhdGljIHN0cnVjdCBtc21fZ2VtX3N1Ym1pdCAqc3VibWl0 X2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQlzdHJ1Y3QgbXNtX2dwdSAqZ3B1LCBz dHJ1Y3QgbXNtX2dwdV9zdWJtaXRxdWV1ZSAqcXVldWUsCi0JCXVpbnQzMl90IG5yX2JvcywgdWlu dDMyX3QgbnJfY21kcykKKwkJc3RydWN0IG1zbV9ncHUgKmdwdSwgc3RydWN0IG1zbV9nZW1fYWRk cmVzc19zcGFjZSAqYXNwYWNlLAorCQlzdHJ1Y3QgbXNtX2dwdV9zdWJtaXRxdWV1ZSAqcXVldWUs IHVpbnQzMl90IG5yX2JvcywgdWludDMyX3QgbnJfY21kcykKIHsKIAlzdHJ1Y3QgbXNtX2dlbV9z dWJtaXQgKnN1Ym1pdDsKIAl1aW50NjRfdCBzeiA9IHNpemVvZigqc3VibWl0KSArICgodTY0KW5y X2JvcyAqIHNpemVvZihzdWJtaXQtPmJvc1swXSkpICsKQEAgLTQ2LDYgKzQ2LDcgQEAgc3RhdGlj IHN0cnVjdCBtc21fZ2VtX3N1Ym1pdCAqc3VibWl0X2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQlyZXR1cm4gTlVMTDsKIAogCXN1Ym1pdC0+ZGV2ID0gZGV2OworCXN1Ym1pdC0+YXNw YWNlID0gYXNwYWNlOwogCXN1Ym1pdC0+Z3B1ID0gZ3B1OwogCXN1Ym1pdC0+ZmVuY2UgPSBOVUxM OwogCXN1Ym1pdC0+cGlkID0gZ2V0X3BpZCh0YXNrX3BpZChjdXJyZW50KSk7CkBAIC0xNjcsNyAr MTY4LDcgQEAgc3RhdGljIHZvaWQgc3VibWl0X3VubG9ja191bnBpbl9ibyhzdHJ1Y3QgbXNtX2dl bV9zdWJtaXQgKnN1Ym1pdCwKIAlzdHJ1Y3QgbXNtX2dlbV9vYmplY3QgKm1zbV9vYmogPSBzdWJt aXQtPmJvc1tpXS5vYmo7CiAKIAlpZiAoc3VibWl0LT5ib3NbaV0uZmxhZ3MgJiBCT19QSU5ORUQp Ci0JCW1zbV9nZW1fcHV0X2lvdmEoJm1zbV9vYmotPmJhc2UsIHN1Ym1pdC0+Z3B1LT5hc3BhY2Up OworCQltc21fZ2VtX3B1dF9pb3ZhKCZtc21fb2JqLT5iYXNlLCBzdWJtaXQtPmFzcGFjZSk7CiAK IAlpZiAoc3VibWl0LT5ib3NbaV0uZmxhZ3MgJiBCT19MT0NLRUQpCiAJCXd3X211dGV4X3VubG9j aygmbXNtX29iai0+cmVzdi0+bG9jayk7CkBAIC0yNzAsNyArMjcxLDcgQEAgc3RhdGljIGludCBz dWJtaXRfcGluX29iamVjdHMoc3RydWN0IG1zbV9nZW1fc3VibWl0ICpzdWJtaXQpCiAKIAkJLyog aWYgbG9ja2luZyBzdWNjZWVkZWQsIHBpbiBibzogKi8KIAkJcmV0ID0gbXNtX2dlbV9nZXRfaW92 YSgmbXNtX29iai0+YmFzZSwKLQkJCQlzdWJtaXQtPmdwdS0+YXNwYWNlLCAmaW92YSk7CisJCQkJ c3VibWl0LT5hc3BhY2UsICZpb3ZhKTsKIAogCQlpZiAocmV0KQogCQkJYnJlYWs7CkBAIC00NzEs NyArNDcyLDcgQEAgaW50IG1zbV9pb2N0bF9nZW1fc3VibWl0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHZvaWQgKmRhdGEsCiAJCX0KIAl9CiAKLQlzdWJtaXQgPSBzdWJtaXRfY3JlYXRlKGRldiwg Z3B1LCBxdWV1ZSwgYXJncy0+bnJfYm9zLCBhcmdzLT5ucl9jbWRzKTsKKwlzdWJtaXQgPSBzdWJt aXRfY3JlYXRlKGRldiwgZ3B1LCBjdHgtPmFzcGFjZSwgcXVldWUsIGFyZ3MtPm5yX2JvcywgYXJn cy0+bnJfY21kcyk7CiAJaWYgKCFzdWJtaXQpIHsKIAkJcmV0ID0gLUVOT01FTTsKIAkJZ290byBv dXRfdW5sb2NrOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmMgYi9k cml2ZXJzL2dwdS9kcm0vbXNtL21zbV9ncHUuYwppbmRleCAxYzA5YWNmYjQwMjguLjJmNDViZWEw NDIyMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmMKQEAgLTU1MSw3ICs1NTEsNyBAQCBzdGF0aWMgdm9p ZCByZXRpcmVfc3VibWl0KHN0cnVjdCBtc21fZ3B1ICpncHUsIHN0cnVjdCBtc21fZ2VtX3N1Ym1p dCAqc3VibWl0KQogCQlzdHJ1Y3QgbXNtX2dlbV9vYmplY3QgKm1zbV9vYmogPSBzdWJtaXQtPmJv c1tpXS5vYmo7CiAJCS8qIG1vdmUgdG8gaW5hY3RpdmU6ICovCiAJCW1zbV9nZW1fbW92ZV90b19p bmFjdGl2ZSgmbXNtX29iai0+YmFzZSk7Ci0JCW1zbV9nZW1fcHV0X2lvdmEoJm1zbV9vYmotPmJh c2UsIGdwdS0+YXNwYWNlKTsKKwkJbXNtX2dlbV9wdXRfaW92YSgmbXNtX29iai0+YmFzZSwgc3Vi bWl0LT5hc3BhY2UpOwogCQlkcm1fZ2VtX29iamVjdF9wdXQoJm1zbV9vYmotPmJhc2UpOwogCX0K IApAQCAtNjM1LDggKzYzNSw3IEBAIHZvaWQgbXNtX2dwdV9zdWJtaXQoc3RydWN0IG1zbV9ncHUg KmdwdSwgc3RydWN0IG1zbV9nZW1fc3VibWl0ICpzdWJtaXQsCiAKIAkJLyogc3VibWl0IHRha2Vz IGEgcmVmZXJlbmNlIHRvIHRoZSBibyBhbmQgaW92YSB1bnRpbCByZXRpcmVkOiAqLwogCQlkcm1f Z2VtX29iamVjdF9nZXQoJm1zbV9vYmotPmJhc2UpOwotCQltc21fZ2VtX2dldF9pb3ZhKCZtc21f b2JqLT5iYXNlLAotCQkJCXN1Ym1pdC0+Z3B1LT5hc3BhY2UsICZpb3ZhKTsKKwkJbXNtX2dlbV9n ZXRfaW92YSgmbXNtX29iai0+YmFzZSwgc3VibWl0LT5hc3BhY2UsICZpb3ZhKTsKIAogCQlpZiAo c3VibWl0LT5ib3NbaV0uZmxhZ3MgJiBNU01fU1VCTUlUX0JPX1dSSVRFKQogCQkJbXNtX2dlbV9t b3ZlX3RvX2FjdGl2ZSgmbXNtX29iai0+YmFzZSwgZ3B1LCB0cnVlLCBzdWJtaXQtPmZlbmNlKTsK LS0gCjIuMTcuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg==