From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 4/6] drm/amdgpu: handle multiple MM nodes in the VMs v2 Date: Tue, 27 Sep 2016 11:49:55 +0200 Message-ID: <1474969797-1882-5-git-send-email-deathsimple@vodafone.de> References: <1474969797-1882-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1474969797-1882-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhpcyBh bGxvd3MgdXMgdG8gbWFwIHNjYXR0ZXJlZCBWUkFNIEJPcyB0byB0aGUgVk1zLgoKdjI6IGZpeCBv ZmZzZXQgaGFuZGxpbmcsIHVzZSBwZm4gaW5zdGVhZCBvZiBvZmZzZXQsCiAgICBmaXggUEFHRV9T SVpFICE9IEFNREdQVV9HUFVfUEFHRV9TSVpFIGNhc2UKClNpZ25lZC1vZmYtYnk6IENocmlzdGlh biBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdm0uYyB8IDgxICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCmluZGV4IDIzNzllYjEuLjZlZDEx Y2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCkBAIC0xMDY5LDggKzEw NjksOCBAQCBlcnJvcl9mcmVlOgogICogQHBhZ2VzX2FkZHI6IERNQSBhZGRyZXNzZXMgdG8gdXNl IGZvciBtYXBwaW5nCiAgKiBAdm06IHJlcXVlc3RlZCB2bQogICogQG1hcHBpbmc6IG1hcHBlZCBy YW5nZSBhbmQgZmxhZ3MgdG8gdXNlIGZvciB0aGUgdXBkYXRlCi0gKiBAYWRkcjogYWRkciB0byBz ZXQgdGhlIGFyZWEgdG8KICAqIEBmbGFnczogSFcgZmxhZ3MgZm9yIHRoZSBtYXBwaW5nCisgKiBA bm9kZXM6IGFycmF5IG9mIGRybV9tbV9ub2RlcyB3aXRoIHRoZSBNQyBhZGRyZXNzZXMKICAqIEBm ZW5jZTogb3B0aW9uYWwgcmVzdWx0aW5nIGZlbmNlCiAgKgogICogU3BsaXQgdGhlIG1hcHBpbmcg aW50byBzbWFsbGVyIGNodW5rcyBzbyB0aGF0IGVhY2ggdXBkYXRlIGZpdHMKQEAgLTEwODMsMTIg KzEwODMsMTEgQEAgc3RhdGljIGludCBhbWRncHVfdm1fYm9fc3BsaXRfbWFwcGluZyhzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCQkgICAgICBkbWFfYWRkcl90ICpwYWdlc19hZGRyLAog CQkJCSAgICAgIHN0cnVjdCBhbWRncHVfdm0gKnZtLAogCQkJCSAgICAgIHN0cnVjdCBhbWRncHVf Ym9fdmFfbWFwcGluZyAqbWFwcGluZywKLQkJCQkgICAgICB1aW50MzJfdCBmbGFncywgdWludDY0 X3QgYWRkciwKKwkJCQkgICAgICB1aW50MzJfdCBmbGFncywKKwkJCQkgICAgICBzdHJ1Y3QgZHJt X21tX25vZGUgKm5vZGVzLAogCQkJCSAgICAgIHN0cnVjdCBmZW5jZSAqKmZlbmNlKQogewotCWNv bnN0IHVpbnQ2NF90IG1heF9zaXplID0gNjRVTEwgKiAxMDI0VUxMICogMTAyNFVMTCAvIEFNREdQ VV9HUFVfUEFHRV9TSVpFOwotCi0JdWludDY0X3Qgc3JjID0gMCwgc3RhcnQgPSBtYXBwaW5nLT5p dC5zdGFydDsKKwl1aW50NjRfdCBwZm4sIHNyYyA9IDAsIHN0YXJ0ID0gbWFwcGluZy0+aXQuc3Rh cnQ7CiAJaW50IHI7CiAKIAkvKiBub3JtYWxseSxib192YS0+ZmxhZ3Mgb25seSBjb250aWFucyBS RUFEQUJMRSBhbmQgV0lSVEVBQkxFIGJpdCBnbyBoZXJlCkBAIC0xMTAxLDIzICsxMTAwLDQwIEBA IHN0YXRpYyBpbnQgYW1kZ3B1X3ZtX2JvX3NwbGl0X21hcHBpbmcoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCiAKIAl0cmFjZV9hbWRncHVfdm1fYm9fdXBkYXRlKG1hcHBpbmcpOwogCi0JaWYg KHBhZ2VzX2FkZHIpIHsKLQkJaWYgKGZsYWdzID09IGd0dF9mbGFncykKLQkJCXNyYyA9IGFkZXYt PmdhcnQudGFibGVfYWRkciArIChhZGRyID4+IDEyKSAqIDg7Ci0JCWFkZHIgPSAwOworCXBmbiA9 IG1hcHBpbmctPm9mZnNldCA+PiBQQUdFX1NISUZUOworCWlmIChub2RlcykgeworCQl3aGlsZSAo cGZuID49IG5vZGVzLT5zaXplKSB7CisJCQlwZm4gLT0gbm9kZXMtPnNpemU7CisJCQkrK25vZGVz OworCQl9CiAJfQotCWFkZHIgKz0gbWFwcGluZy0+b2Zmc2V0OwogCi0JaWYgKCFwYWdlc19hZGRy IHx8IHNyYykKLQkJcmV0dXJuIGFtZGdwdV92bV9ib191cGRhdGVfbWFwcGluZyhhZGV2LCBleGNs dXNpdmUsCi0JCQkJCQkgICBzcmMsIHBhZ2VzX2FkZHIsIHZtLAotCQkJCQkJICAgc3RhcnQsIG1h cHBpbmctPml0Lmxhc3QsCi0JCQkJCQkgICBmbGFncywgYWRkciwgZmVuY2UpOworCWRvIHsKKwkJ dWludDY0X3QgbWF4X2VudHJpZXM7CisJCXVpbnQ2NF90IGFkZHIsIGxhc3Q7CiAKLQl3aGlsZSAo c3RhcnQgIT0gbWFwcGluZy0+aXQubGFzdCArIDEpIHsKLQkJdWludDY0X3QgbGFzdDsKKwkJaWYg KG5vZGVzKSB7CisJCQlhZGRyID0gbm9kZXMtPnN0YXJ0IDw8IFBBR0VfU0hJRlQ7CisJCQltYXhf ZW50cmllcyA9IChub2Rlcy0+c2l6ZSAtIHBmbikgKgorCQkJCShQQUdFX1NJWkUgLyBBTURHUFVf R1BVX1BBR0VfU0laRSk7CisJCX0gZWxzZSB7CisJCQlhZGRyID0gMDsKKwkJCW1heF9lbnRyaWVz ID0gUzY0X01BWDsKKwkJfQogCi0JCWxhc3QgPSBtaW4oKHVpbnQ2NF90KW1hcHBpbmctPml0Lmxh c3QsIHN0YXJ0ICsgbWF4X3NpemUgLSAxKTsKKwkJaWYgKHBhZ2VzX2FkZHIpIHsKKwkJCWlmIChm bGFncyA9PSBndHRfZmxhZ3MpCisJCQkJc3JjID0gYWRldi0+Z2FydC50YWJsZV9hZGRyICsKKwkJ CQkJKGFkZHIgPj4gQU1ER1BVX0dQVV9QQUdFX1NISUZUKSAqIDg7CisJCQllbHNlCisJCQkJbWF4 X2VudHJpZXMgPSBtaW4obWF4X2VudHJpZXMsIDE2dWxsICogMTAyNHVsbCk7CisJCQlhZGRyID0g MDsKKwkJfSBlbHNlIGlmIChmbGFncyAmIEFNREdQVV9QVEVfVkFMSUQpIHsKKwkJCWFkZHIgKz0g YWRldi0+dm1fbWFuYWdlci52cmFtX2Jhc2Vfb2Zmc2V0OworCQl9CisJCWFkZHIgKz0gcGZuIDw8 IFBBR0VfU0hJRlQ7CisKKwkJbGFzdCA9IG1pbigodWludDY0X3QpbWFwcGluZy0+aXQubGFzdCwg c3RhcnQgKyBtYXhfZW50cmllcyAtIDEpOwogCQlyID0gYW1kZ3B1X3ZtX2JvX3VwZGF0ZV9tYXBw aW5nKGFkZXYsIGV4Y2x1c2l2ZSwKIAkJCQkJCXNyYywgcGFnZXNfYWRkciwgdm0sCiAJCQkJCQlz dGFydCwgbGFzdCwgZmxhZ3MsIGFkZHIsCkBAIC0xMTI1LDkgKzExNDEsMTQgQEAgc3RhdGljIGlu dCBhbWRncHVfdm1fYm9fc3BsaXRfbWFwcGluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwK IAkJaWYgKHIpCiAJCQlyZXR1cm4gcjsKIAorCQlwZm4gKz0gbGFzdCAtIHN0YXJ0ICsgMTsKKwkJ aWYgKG5vZGVzICYmIG5vZGVzLT5zaXplID09IHBmbikgeworCQkJcGZuID0gMDsKKwkJCSsrbm9k ZXM7CisJCX0KIAkJc3RhcnQgPSBsYXN0ICsgMTsKLQkJYWRkciArPSBtYXhfc2l6ZSAqIEFNREdQ VV9HUFVfUEFHRV9TSVpFOwotCX0KKworCX0gd2hpbGUgKHVubGlrZWx5KHN0YXJ0ICE9IG1hcHBp bmctPml0Lmxhc3QgKyAxKSk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTExNTEsMzQgKzExNzIsMjQg QEAgaW50IGFtZGdwdV92bV9ib191cGRhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJ ZG1hX2FkZHJfdCAqcGFnZXNfYWRkciA9IE5VTEw7CiAJdWludDMyX3QgZ3R0X2ZsYWdzLCBmbGFn czsKIAlzdHJ1Y3QgdHRtX21lbV9yZWcgKm1lbTsKKwlzdHJ1Y3QgZHJtX21tX25vZGUgKm5vZGVz OwogCXN0cnVjdCBmZW5jZSAqZXhjbHVzaXZlOwotCXVpbnQ2NF90IGFkZHI7CiAJaW50IHI7CiAK IAlpZiAoY2xlYXIpIHsKIAkJbWVtID0gTlVMTDsKLQkJYWRkciA9IDA7CisJCW5vZGVzID0gTlVM TDsKIAkJZXhjbHVzaXZlID0gTlVMTDsKIAl9IGVsc2UgewogCQlzdHJ1Y3QgdHRtX2RtYV90dCAq dHRtOwogCiAJCW1lbSA9ICZib192YS0+Ym8tPnRiby5tZW07Ci0JCWFkZHIgPSAodTY0KW1lbS0+ c3RhcnQgPDwgUEFHRV9TSElGVDsKLQkJc3dpdGNoIChtZW0tPm1lbV90eXBlKSB7Ci0JCWNhc2Ug VFRNX1BMX1RUOgorCQlub2RlcyA9IG1lbS0+bW1fbm9kZTsKKwkJaWYgKG1lbS0+bWVtX3R5cGUg PT0gVFRNX1BMX1RUKSB7CiAJCQl0dG0gPSBjb250YWluZXJfb2YoYm9fdmEtPmJvLT50Ym8udHRt LCBzdHJ1Y3QKIAkJCQkJICAgdHRtX2RtYV90dCwgdHRtKTsKIAkJCXBhZ2VzX2FkZHIgPSB0dG0t PmRtYV9hZGRyZXNzOwotCQkJYnJlYWs7Ci0KLQkJY2FzZSBUVE1fUExfVlJBTToKLQkJCWFkZHIg Kz0gYWRldi0+dm1fbWFuYWdlci52cmFtX2Jhc2Vfb2Zmc2V0OwotCQkJYnJlYWs7Ci0KLQkJZGVm YXVsdDoKLQkJCWJyZWFrOwogCQl9Ci0KIAkJZXhjbHVzaXZlID0gcmVzZXJ2YXRpb25fb2JqZWN0 X2dldF9leGNsKGJvX3ZhLT5iby0+dGJvLnJlc3YpOwogCX0KIApAQCAtMTE5NCw3ICsxMjA1LDcg QEAgaW50IGFtZGdwdV92bV9ib191cGRhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJ bGlzdF9mb3JfZWFjaF9lbnRyeShtYXBwaW5nLCAmYm9fdmEtPmludmFsaWRzLCBsaXN0KSB7CiAJ CXIgPSBhbWRncHVfdm1fYm9fc3BsaXRfbWFwcGluZyhhZGV2LCBleGNsdXNpdmUsCiAJCQkJCSAg ICAgICBndHRfZmxhZ3MsIHBhZ2VzX2FkZHIsIHZtLAotCQkJCQkgICAgICAgbWFwcGluZywgZmxh Z3MsIGFkZHIsCisJCQkJCSAgICAgICBtYXBwaW5nLCBmbGFncywgbm9kZXMsCiAJCQkJCSAgICAg ICAmYm9fdmEtPmxhc3RfcHRfdXBkYXRlKTsKIAkJaWYgKHIpCiAJCQlyZXR1cm4gcjsKLS0gCjIu NS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQt Z2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK