From: Chunming Zhou Subject: [PATCH] drm/amdgpu: only enable swiotlb alloc when need Date: Wed, 7 Feb 2018 19:04:45 +0800 Message-ID: <20180207110445.14077-1-david1.zhou@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 Cc: Chunming Zhou , christian.koenig-5C7GfCeVMHo@public.gmane.org Z2V0IHRoZSBtYXggaW8gbWFwcGluZyBhZGRyZXNzIG9mIHN5c3RlbSBtZW1vcnkgdG8gc2VlIGlm IGl0IGlzIG92ZXIKb3VyIGNhcmQgYWNjZXNzaW5nIHJhbmdlLgoKQ2hhbmdlLUlkOiBJYmMzOGRi ZDM0YTIwYWY1YjRhNGIxZWQxNTRjMTRlMWM1OGFhNGM1NQpTaWduZWQtb2ZmLWJ5OiBDaHVubWlu ZyBaaG91IDxkYXZpZDEuemhvdUBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdS5oICAgICAgICB8ICAzICsrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2RldmljZS5jIHwgMTQgKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV90dG0uYyAgICB8ICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ21jX3Y2XzAuYyAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv Z21jX3Y3XzAuYyAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y4 XzAuYyAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYyAg ICAgIHwgIDEgKwogNyBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggMjU3NDI0ZGQ4YTUyLi4z NGE2ODE0ZTk0ZjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC0xNDM3LDYg KzE0MzcsNyBAQCBzdHJ1Y3QgYW1kZ3B1X2RldmljZSB7CiAJY29uc3Qgc3RydWN0IGFtZGdwdV9h c2ljX2Z1bmNzCSphc2ljX2Z1bmNzOwogCWJvb2wJCQkJc2h1dGRvd247CiAJYm9vbAkJCQluZWVk X2RtYTMyOworCWJvb2wJCQkJbmVlZF9zd2lvdGxiOwogCWJvb2wJCQkJYWNjZWxfd29ya2luZzsK IAlzdHJ1Y3Qgd29ya19zdHJ1Y3QJCXJlc2V0X3dvcms7CiAJc3RydWN0IG5vdGlmaWVyX2Jsb2Nr CQlhY3BpX25iOwpAQCAtMTYyOSw2ICsxNjMwLDggQEAgc3RydWN0IGFtZGdwdV9kZXZpY2Ugewog CXVuc2lnbmVkIGxvbmcgbGFzdF9tbV9pbmRleDsKIAlib29sICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGluX2dwdV9yZXNldDsKIAlzdHJ1Y3QgbXV0ZXggIGxvY2tfcmVzZXQ7CisKKwl1NjQJ CQkJc3lzbWVtX21heF9pbzsKIH07CiAKIHN0YXRpYyBpbmxpbmUgc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFtZGdwdV90dG1fYWRldihzdHJ1Y3QgdHRtX2JvX2RldmljZSAqYmRldikKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwppbmRleCA4NTA0NTNlODk3ZjkuLmM0 YmNhNjJlZWZmMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2Uu YwpAQCAtMTc0Miw2ICsxNzQyLDE5IEBAIGJvb2wgYW1kZ3B1X2RldmljZV9oYXNfZGNfc3VwcG9y dChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlyZXR1cm4gYW1kZ3B1X2RldmljZV9hc2lj X2hhc19kY19zdXBwb3J0KGFkZXYtPmFzaWNfdHlwZSk7CiB9CiAKK3N0YXRpYyB2b2lkIGFtZGdw dV9kZXZpY2VfZ2V0X21heF9pb19vZl9zeXNtZW0oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp Cit7CisJc3RydWN0IHJlc291cmNlICp0bXA7CisKKwlmb3IgKHRtcCA9IGlvbWVtX3Jlc291cmNl LmNoaWxkOyB0bXA7IHRtcCA9IHRtcC0+c2libGluZykgeworCQlpZiAodG1wLT5mbGFncyA9PSAo SU9SRVNPVVJDRV9TWVNURU1fUkFNIHwgSU9SRVNPVVJDRV9CVVNZKSkKKwkJCWFkZXYtPnN5c21l bV9tYXhfaW8gPSBtYXgoYWRldi0+c3lzbWVtX21heF9pbywKKwkJCQkJCSAgdG1wLT5lbmQpOwor CX0KKwlEUk1fSU5GTygiU3lzdGVtIFJhbSBtYXggaW8gYWRkcmVzcyBpcyAweCVsbHhcbiIsIGFk ZXYtPnN5c21lbV9tYXhfaW8pOworfQorCisKIC8qKgogICogYW1kZ3B1X2RldmljZV9pbml0IC0g aW5pdGlhbGl6ZSB0aGUgZHJpdmVyCiAgKgpAQCAtMTc5NSw2ICsxODA4LDcgQEAgaW50IGFtZGdw dV9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlhZGV2LT5nY19jYWNf d3JlZyA9ICZhbWRncHVfaW52YWxpZF93cmVnOwogCWFkZXYtPmF1ZGlvX2VuZHB0X3JyZWcgPSAm YW1kZ3B1X2Jsb2NrX2ludmFsaWRfcnJlZzsKIAlhZGV2LT5hdWRpb19lbmRwdF93cmVnID0gJmFt ZGdwdV9ibG9ja19pbnZhbGlkX3dyZWc7CisJYW1kZ3B1X2RldmljZV9nZXRfbWF4X2lvX29mX3N5 c21lbShhZGV2KTsKIAogCURSTV9JTkZPKCJpbml0aWFsaXppbmcga2VybmVsIG1vZGVzZXR0aW5n ICglcyAweCUwNFg6MHglMDRYIDB4JTA0WDoweCUwNFggMHglMDJYKS5cbiIsCiAJCSBhbWRncHVf YXNpY19uYW1lW2FkZXYtPmFzaWNfdHlwZV0sIHBkZXYtPnZlbmRvciwgcGRldi0+ZGV2aWNlLApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCmluZGV4IDk1Zjk5MDE0MGYyYS4u YTAyMWRlOTYyOWFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfdHRtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCkBA IC0xMDE4LDcgKzEwMTgsNyBAQCBzdGF0aWMgaW50IGFtZGdwdV90dG1fdHRfcG9wdWxhdGUoc3Ry dWN0IHR0bV90dCAqdHRtLAogCX0KIAogI2lmZGVmIENPTkZJR19TV0lPVExCCi0JaWYgKHN3aW90 bGJfbnJfdGJsKCkpIHsKKwlpZiAoYWRldi0+bmVlZF9zd2lvdGxiICYmIHN3aW90bGJfbnJfdGJs KCkpIHsKIAkJcmV0dXJuIHR0bV9kbWFfcG9wdWxhdGUoJmd0dC0+dHRtLCBhZGV2LT5kZXYsIGN0 eCk7CiAJfQogI2VuZGlmCkBAIC0xMDQ1LDcgKzEwNDUsNyBAQCBzdGF0aWMgdm9pZCBhbWRncHVf dHRtX3R0X3VucG9wdWxhdGUoc3RydWN0IHR0bV90dCAqdHRtKQogCWFkZXYgPSBhbWRncHVfdHRt X2FkZXYodHRtLT5iZGV2KTsKIAogI2lmZGVmIENPTkZJR19TV0lPVExCCi0JaWYgKHN3aW90bGJf bnJfdGJsKCkpIHsKKwlpZiAoYWRldi0+bmVlZF9zd2lvdGxiICYmIHN3aW90bGJfbnJfdGJsKCkp IHsKIAkJdHRtX2RtYV91bnBvcHVsYXRlKCZndHQtPnR0bSwgYWRldi0+ZGV2KTsKIAkJcmV0dXJu OwogCX0KQEAgLTIwMDcsNyArMjAwNyw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3R0bV9kZWJ1Z2Zz X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJY291bnQgPSBBUlJBWV9TSVpFKGFt ZGdwdV90dG1fZGVidWdmc19saXN0KTsKIAogI2lmZGVmIENPTkZJR19TV0lPVExCCi0JaWYgKCFz d2lvdGxiX25yX3RibCgpKQorCWlmICghKGFkZXYtPm5lZWRfc3dpb3RsYiAmJiBzd2lvdGxiX25y X3RibCgpKSkKIAkJLS1jb3VudDsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21j X3Y2XzAuYwppbmRleCA1ZWFjYzA4MTliNjYuLjU4OGM5MDAwNzVkYSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y2XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nbWNfdjZfMC5jCkBAIC04NTUsNiArODU1LDcgQEAgc3RhdGljIGludCBnbWNf djZfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAogCWFkZXYtPm5lZWRfZG1hMzIgPSBmYWxzZTsK IAlkbWFfYml0cyA9IGFkZXYtPm5lZWRfZG1hMzIgPyAzMiA6IDQwOworCWFkZXYtPm5lZWRfc3dp b3RsYiA9IGFkZXYtPnN5c21lbV9tYXhfaW8gPiAoMSA8PCBkbWFfYml0cyk7CiAJciA9IHBjaV9z ZXRfZG1hX21hc2soYWRldi0+cGRldiwgRE1BX0JJVF9NQVNLKGRtYV9iaXRzKSk7CiAJaWYgKHIp IHsKIAkJYWRldi0+bmVlZF9kbWEzMiA9IHRydWU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21j X3Y3XzAuYwppbmRleCBjZTdmNDg0Zjg2ZjkuLjE3MjNkMjE1MWYwYiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y3XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nbWNfdjdfMC5jCkBAIC0xMDAzLDYgKzEwMDMsNyBAQCBzdGF0aWMgaW50IGdt Y192N18wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCSAqLwogCWFkZXYtPm5lZWRfZG1hMzIgPSBm YWxzZTsKIAlkbWFfYml0cyA9IGFkZXYtPm5lZWRfZG1hMzIgPyAzMiA6IDQwOworCWFkZXYtPm5l ZWRfc3dpb3RsYiA9IGFkZXYtPnN5c21lbV9tYXhfaW8gPiAoMSA8PCBkbWFfYml0cyk7CiAJciA9 IHBjaV9zZXRfZG1hX21hc2soYWRldi0+cGRldiwgRE1BX0JJVF9NQVNLKGRtYV9iaXRzKSk7CiAJ aWYgKHIpIHsKIAkJYWRldi0+bmVlZF9kbWEzMiA9IHRydWU7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZ21jX3Y4XzAuYwppbmRleCBmNTNmMzkzNmZkNGYuLjFmMjA5ZjkyYTJmZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9nbWNfdjhfMC5jCkBAIC0xMTAxLDYgKzExMDEsNyBAQCBzdGF0aWMg aW50IGdtY192OF8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCSAqLwogCWFkZXYtPm5lZWRfZG1h MzIgPSBmYWxzZTsKIAlkbWFfYml0cyA9IGFkZXYtPm5lZWRfZG1hMzIgPyAzMiA6IDQwOworCWFk ZXYtPm5lZWRfc3dpb3RsYiA9IGFkZXYtPnN5c21lbV9tYXhfaW8gPiAoKHU2NCkxIDw8IGRtYV9i aXRzKTsKIAlyID0gcGNpX3NldF9kbWFfbWFzayhhZGV2LT5wZGV2LCBETUFfQklUX01BU0soZG1h X2JpdHMpKTsKIAlpZiAocikgewogCQlhZGV2LT5uZWVkX2RtYTMyID0gdHJ1ZTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5jCmluZGV4IDJjNjA5ODFkMmVlYy4uZGE3YWI0NmM0Y2Ji IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMKQEAgLTg3OSw2ICs4NzksNyBA QCBzdGF0aWMgaW50IGdtY192OV8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCSAqLwogCWFkZXYt Pm5lZWRfZG1hMzIgPSBmYWxzZTsKIAlkbWFfYml0cyA9IGFkZXYtPm5lZWRfZG1hMzIgPyAzMiA6 IDQ0OworCWFkZXYtPm5lZWRfc3dpb3RsYiA9IGFkZXYtPnN5c21lbV9tYXhfaW8gPiAoMSA8PCBk bWFfYml0cyk7CiAJciA9IHBjaV9zZXRfZG1hX21hc2soYWRldi0+cGRldiwgRE1BX0JJVF9NQVNL KGRtYV9iaXRzKSk7CiAJaWYgKHIpIHsKIAkJYWRldi0+bmVlZF9kbWEzMiA9IHRydWU7Ci0tIAoy LjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFt ZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=