From: Chunming Zhou Subject: [PATCH 2/3] drm/amdgpu: only enable swiotlb alloc when need v2 Date: Thu, 8 Feb 2018 16:32:37 +0800 Message-ID: <20180208083238.8291-2-david1.zhou@amd.com> References: <20180208083238.8291-1-david1.zhou@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180208083238.8291-1-david1.zhou-5C7GfCeVMHo@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: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Chunming Zhou , christian.koenig-5C7GfCeVMHo@public.gmane.org Z2V0IHRoZSBtYXggaW8gbWFwcGluZyBhZGRyZXNzIG9mIHN5c3RlbSBtZW1vcnkgdG8gc2VlIGlm IGl0IGlzIG92ZXIKb3VyIGNhcmQgYWNjZXNzaW5nIHJhbmdlLgp2MjogbW92ZSBjaGVja2luZyBs YXRlcgoKQ2hhbmdlLUlkOiBJYmMzOGRiZDM0YTIwYWY1YjRhNGIxZWQxNTRjMTRlMWM1OGFhNGM1 NQpTaWduZWQtb2ZmLWJ5OiBDaHVubWluZyBaaG91IDxkYXZpZDEuemhvdUBhbWQuY29tPgpSZXZp ZXdlZC1ieTogTW9uayBMaXUgPG1vbmsubGl1QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1LmggICAgIHwgMSArCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfdHRtLmMgfCA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21j X3Y2XzAuYyAgIHwgMiArKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y3XzAuYyAg IHwgMiArKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYyAgIHwgMyArKysK IGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMgICB8IDIgKysKIDYgZmlsZXMg Y2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdS5oCmluZGV4IDI1NzQyNGRkOGE1Mi4uNjI3YTA2MTg1MzY4IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMTQzNyw2ICsxNDM3LDcgQEAgc3RydWN0IGFt ZGdwdV9kZXZpY2UgewogCWNvbnN0IHN0cnVjdCBhbWRncHVfYXNpY19mdW5jcwkqYXNpY19mdW5j czsKIAlib29sCQkJCXNodXRkb3duOwogCWJvb2wJCQkJbmVlZF9kbWEzMjsKKwlib29sCQkJCW5l ZWRfc3dpb3RsYjsKIAlib29sCQkJCWFjY2VsX3dvcmtpbmc7CiAJc3RydWN0IHdvcmtfc3RydWN0 CQlyZXNldF93b3JrOwogCXN0cnVjdCBub3RpZmllcl9ibG9jawkJYWNwaV9uYjsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYwppbmRleCA5NWY5OTAxNDBmMmEuLmEwMjFkZTk2 MjlhZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYwpAQCAtMTAxOCw3 ICsxMDE4LDcgQEAgc3RhdGljIGludCBhbWRncHVfdHRtX3R0X3BvcHVsYXRlKHN0cnVjdCB0dG1f dHQgKnR0bSwKIAl9CiAKICNpZmRlZiBDT05GSUdfU1dJT1RMQgotCWlmIChzd2lvdGxiX25yX3Ri bCgpKSB7CisJaWYgKGFkZXYtPm5lZWRfc3dpb3RsYiAmJiBzd2lvdGxiX25yX3RibCgpKSB7CiAJ CXJldHVybiB0dG1fZG1hX3BvcHVsYXRlKCZndHQtPnR0bSwgYWRldi0+ZGV2LCBjdHgpOwogCX0K ICNlbmRpZgpAQCAtMTA0NSw3ICsxMDQ1LDcgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X3R0bV90dF91 bnBvcHVsYXRlKHN0cnVjdCB0dG1fdHQgKnR0bSkKIAlhZGV2ID0gYW1kZ3B1X3R0bV9hZGV2KHR0 bS0+YmRldik7CiAKICNpZmRlZiBDT05GSUdfU1dJT1RMQgotCWlmIChzd2lvdGxiX25yX3RibCgp KSB7CisJaWYgKGFkZXYtPm5lZWRfc3dpb3RsYiAmJiBzd2lvdGxiX25yX3RibCgpKSB7CiAJCXR0 bV9kbWFfdW5wb3B1bGF0ZSgmZ3R0LT50dG0sIGFkZXYtPmRldik7CiAJCXJldHVybjsKIAl9CkBA IC0yMDA3LDcgKzIwMDcsNyBAQCBzdGF0aWMgaW50IGFtZGdwdV90dG1fZGVidWdmc19pbml0KHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWNvdW50ID0gQVJSQVlfU0laRShhbWRncHVfdHRt X2RlYnVnZnNfbGlzdCk7CiAKICNpZmRlZiBDT05GSUdfU1dJT1RMQgotCWlmICghc3dpb3RsYl9u cl90YmwoKSkKKwlpZiAoIShhZGV2LT5uZWVkX3N3aW90bGIgJiYgc3dpb3RsYl9ucl90YmwoKSkp CiAJCS0tY291bnQ7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ21jX3Y2XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMK aW5kZXggNWVhY2MwODE5YjY2Li4xOTQ1ZmU4NDIxODggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZ21jX3Y2XzAuYwpAQCAtMjIsNiArMjIsNyBAQAogICovCiAjaW5jbHVkZSA8bGludXgvZmly bXdhcmUuaD4KICNpbmNsdWRlIDxkcm0vZHJtUC5oPgorI2luY2x1ZGUgPGRybS9kcm1fY2FjaGUu aD4KICNpbmNsdWRlICJhbWRncHUuaCIKICNpbmNsdWRlICJnbWNfdjZfMC5oIgogI2luY2x1ZGUg ImFtZGdwdV91Y29kZS5oIgpAQCAtODY2LDYgKzg2Nyw3IEBAIHN0YXRpYyBpbnQgZ21jX3Y2XzBf c3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJCXBjaV9zZXRfY29uc2lzdGVudF9kbWFfbWFzayhhZGV2 LT5wZGV2LCBETUFfQklUX01BU0soMzIpKTsKIAkJZGV2X3dhcm4oYWRldi0+ZGV2LCAiYW1kZ3B1 OiBObyBjb2hlcmVudCBETUEgYXZhaWxhYmxlLlxuIik7CiAJfQorCWFkZXYtPm5lZWRfc3dpb3Rs YiA9IGRybV9nZXRfbWF4X2lvbWVtKCkgPiAoKHU2NCkxIDw8IGRtYV9iaXRzKTsKIAogCXIgPSBn bWNfdjZfMF9pbml0X21pY3JvY29kZShhZGV2KTsKIAlpZiAocikgewpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y3XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2dtY192N18wLmMKaW5kZXggY2U3ZjQ4NGY4NmY5Li43NjFkZWYwNGY5M2YgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192N18wLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y3XzAuYwpAQCAtMjIsNiArMjIsNyBAQAogICovCiAj aW5jbHVkZSA8bGludXgvZmlybXdhcmUuaD4KICNpbmNsdWRlIDxkcm0vZHJtUC5oPgorI2luY2x1 ZGUgPGRybS9kcm1fY2FjaGUuaD4KICNpbmNsdWRlICJhbWRncHUuaCIKICNpbmNsdWRlICJjaWtk LmgiCiAjaW5jbHVkZSAiY2lrLmgiCkBAIC0xMDE0LDYgKzEwMTUsNyBAQCBzdGF0aWMgaW50IGdt Y192N18wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCQlwY2lfc2V0X2NvbnNpc3RlbnRfZG1hX21h c2soYWRldi0+cGRldiwgRE1BX0JJVF9NQVNLKDMyKSk7CiAJCXByX3dhcm4oImFtZGdwdTogTm8g Y29oZXJlbnQgRE1BIGF2YWlsYWJsZVxuIik7CiAJfQorCWFkZXYtPm5lZWRfc3dpb3RsYiA9IGRy bV9nZXRfbWF4X2lvbWVtKCkgPiAoKHU2NCkxIDw8IGRtYV9iaXRzKTsKIAogCXIgPSBnbWNfdjdf MF9pbml0X21pY3JvY29kZShhZGV2KTsKIAlpZiAocikgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2dtY192OF8wLmMKaW5kZXggZjUzZjM5MzZmZDRmLi4yNDg5YmU3YWQ2MmIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OF8wLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYwpAQCAtMjIsNiArMjIsNyBAQAogICovCiAjaW5jbHVk ZSA8bGludXgvZmlybXdhcmUuaD4KICNpbmNsdWRlIDxkcm0vZHJtUC5oPgorI2luY2x1ZGUgPGRy bS9kcm1fY2FjaGUuaD4KICNpbmNsdWRlICJhbWRncHUuaCIKICNpbmNsdWRlICJnbWNfdjhfMC5o IgogI2luY2x1ZGUgImFtZGdwdV91Y29kZS5oIgpAQCAtMTEwMSw2ICsxMTAyLDcgQEAgc3RhdGlj IGludCBnbWNfdjhfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAkgKi8KIAlhZGV2LT5uZWVkX2Rt YTMyID0gZmFsc2U7CiAJZG1hX2JpdHMgPSBhZGV2LT5uZWVkX2RtYTMyID8gMzIgOiA0MDsKKwlh ZGV2LT5uZWVkX3N3aW90bGIgPSBkcm1fZ2V0X21heF9pb21lbSgpID4gKCh1NjQpMSA8PCBkbWFf Yml0cyk7CiAJciA9IHBjaV9zZXRfZG1hX21hc2soYWRldi0+cGRldiwgRE1BX0JJVF9NQVNLKGRt YV9iaXRzKSk7CiAJaWYgKHIpIHsKIAkJYWRldi0+bmVlZF9kbWEzMiA9IHRydWU7CkBAIC0xMTEy LDYgKzExMTQsNyBAQCBzdGF0aWMgaW50IGdtY192OF8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQog CQlwY2lfc2V0X2NvbnNpc3RlbnRfZG1hX21hc2soYWRldi0+cGRldiwgRE1BX0JJVF9NQVNLKDMy KSk7CiAJCXByX3dhcm4oImFtZGdwdTogTm8gY29oZXJlbnQgRE1BIGF2YWlsYWJsZVxuIik7CiAJ fQorCWFkZXYtPm5lZWRfc3dpb3RsYiA9IGRybV9nZXRfbWF4X2lvbWVtKCkgPiAoKHU2NCkxIDw8 IGRtYV9iaXRzKTsKIAogCXIgPSBnbWNfdjhfMF9pbml0X21pY3JvY29kZShhZGV2KTsKIAlpZiAo cikgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMKaW5kZXggMmM2MDk4MWQyZWVj Li4wZjRhOWE4NTc1YTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dt Y192OV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYwpAQCAt MjEsNiArMjEsNyBAQAogICoKICAqLwogI2luY2x1ZGUgPGxpbnV4L2Zpcm13YXJlLmg+CisjaW5j bHVkZSA8ZHJtL2RybV9jYWNoZS5oPgogI2luY2x1ZGUgImFtZGdwdS5oIgogI2luY2x1ZGUgImdt Y192OV8wLmgiCiAjaW5jbHVkZSAiYW1kZ3B1X2F0b21maXJtd2FyZS5oIgpAQCAtODkwLDYgKzg5 MSw3IEBAIHN0YXRpYyBpbnQgZ21jX3Y5XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJCXBjaV9z ZXRfY29uc2lzdGVudF9kbWFfbWFzayhhZGV2LT5wZGV2LCBETUFfQklUX01BU0soMzIpKTsKIAkJ cHJpbnRrKEtFUk5fV0FSTklORyAiYW1kZ3B1OiBObyBjb2hlcmVudCBETUEgYXZhaWxhYmxlLlxu Iik7CiAJfQorCWFkZXYtPm5lZWRfc3dpb3RsYiA9IGRybV9nZXRfbWF4X2lvbWVtKCkgPiAoKHU2 NCkxIDw8IGRtYV9iaXRzKTsKIAogCXIgPSBnbWNfdjlfMF9tY19pbml0KGFkZXYpOwogCWlmIChy KQotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK