From: Junwei Zhang Subject: [PATCH 2/3] drm/amdgpu: allocate gart memory when it's required (v2) Date: Tue, 26 Jun 2018 16:35:15 +0800 Message-ID: <1530002116-7019-2-git-send-email-Jerry.Zhang@amd.com> References: <1530002116-7019-1-git-send-email-Jerry.Zhang@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1530002116-7019-1-git-send-email-Jerry.Zhang-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: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Junwei Zhang , michel.daenzer-5C7GfCeVMHo@public.gmane.org, christian.koenig-5C7GfCeVMHo@public.gmane.org SW5zdGVhZCBvZiBjYWxsaW5nIGdhcnQgbWVtb3J5IG9uIGV2ZXJ5IGJvIHBpbiwKYWxsb2NhdGVz IGl0IG9uIGRlbWFuZAoKdjI6IGZpeCBlcnJvciBoYW5kbGluZwoKU2lnbmVkLW9mZi1ieTogSnVu d2VpIFpoYW5nIDxKZXJyeS5aaGFuZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9hbWRrZmQuYyAgICAgICAgfCAgNiArKysrKysKIGRyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmRfZ3B1dm0uYyAgfCAgNiArKysrKysKIGRyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9iZW5jaG1hcmsuYyAgICAgfCAxNCArKysrKysrKysr KystLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rpc3BsYXkuYyAgICAgICB8 ICA2ICsrKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ZiLmMgICAgICAg ICAgICB8ICA4ICsrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2Jq ZWN0LmMgICAgICAgIHwgMTUgKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfdGVzdC5jICAgICAgICAgIHwgIDUgKysrKysKIGRyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgfCAxMyArKysrKysrKysrKy0tCiA4IGZp bGVzIGNoYW5nZWQsIDYzIGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmQuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmQuYwppbmRleCA5OGUzYmY4Li5lM2VkMDhk IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYW1ka2ZkLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2FtZGtmZC5jCkBAIC0yODAs NiArMjgwLDEyIEBAIGludCBhbGxvY19ndHRfbWVtKHN0cnVjdCBrZ2RfZGV2ICprZ2QsIHNpemVf dCBzaXplLAogCQlnb3RvIGFsbG9jYXRlX21lbV9waW5fYm9fZmFpbGVkOwogCX0KIAorCXIgPSBh bWRncHVfdHRtX2FsbG9jX2dhcnQoJmJvLT50Ym8pOworCWlmIChyKSB7CisJCWRldl9lcnIoYWRl di0+ZGV2LCAiJXAgYmluZCBmYWlsZWRcbiIsIGJvKTsKKwkJZ290byBhbGxvY2F0ZV9tZW1fa21h cF9ib19mYWlsZWQ7CisJfQorCiAJciA9IGFtZGdwdV9ib19rbWFwKGJvLCAmY3B1X3B0cl90bXAp OwogCWlmIChyKSB7CiAJCWRldl9lcnIoYWRldi0+ZGV2LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2FtZGtmZF9ncHV2bS5jIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X2FtZGtmZF9ncHV2bS5jCmluZGV4IDA3OWFmOGEuLjJjMGJjN2Mg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hbWRrZmRfZ3B1 dm0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYW1ka2ZkX2dwdXZt LmMKQEAgLTE1OTMsNiArMTU5MywxMiBAQCBpbnQgYW1kZ3B1X2FtZGtmZF9ncHV2bV9tYXBfZ3R0 X2JvX3RvX2tlcm5lbChzdHJ1Y3Qga2dkX2RldiAqa2dkLAogCQlnb3RvIHBpbl9mYWlsZWQ7CiAJ fQogCisJcmV0ID0gYW1kZ3B1X3R0bV9hbGxvY19nYXJ0KCZiby0+dGJvKTsKKwlpZiAocmV0KSB7 CisJCXByX2VycigiJXAgYmluZCBmYWlsZWRcbiIsIGJvKTsKKwkJZ290byBrbWFwX2ZhaWxlZDsK Kwl9CisKIAlyZXQgPSBhbWRncHVfYm9fa21hcChibywga3B0cik7CiAJaWYgKHJldCkgewogCQlw cl9lcnIoIkZhaWxlZCB0byBtYXAgYm8gdG8ga2VybmVsLiByZXQgJWRcbiIsIHJldCk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYmVuY2htYXJrLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYmVuY2htYXJrLmMKaW5kZXggY2I4OGQ3 ZS4uMzA3OWVhOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2JlbmNobWFyay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9iZW5j aG1hcmsuYwpAQCAtOTYsMTEgKzk2LDE2IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9iZW5jaG1hcmtf bW92ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdW5zaWduZWQgc2l6ZSwKIAlpZiAodW5s aWtlbHkociAhPSAwKSkKIAkJZ290byBvdXRfY2xlYW51cDsKIAlyID0gYW1kZ3B1X2JvX3Bpbihz b2JqLCBzZG9tYWluKTsKLQlzYWRkciA9IGFtZGdwdV9ib19ncHVfb2Zmc2V0KHNvYmopOworCWlm IChyKSB7CisJCWFtZGdwdV9ib191bnJlc2VydmUoc29iaik7CisJCWdvdG8gb3V0X2NsZWFudXA7 CisJfQorCXIgPSBhbWRncHVfdHRtX2FsbG9jX2dhcnQoJnNvYmotPnRibyk7CiAJYW1kZ3B1X2Jv X3VucmVzZXJ2ZShzb2JqKTsKIAlpZiAocikgewogCQlnb3RvIG91dF9jbGVhbnVwOwogCX0KKwlz YWRkciA9IGFtZGdwdV9ib19ncHVfb2Zmc2V0KHNvYmopOwogCWJwLmRvbWFpbiA9IGRkb21haW47 CiAJciA9IGFtZGdwdV9ib19jcmVhdGUoYWRldiwgJmJwLCAmZG9iaik7CiAJaWYgKHIpIHsKQEAg LTExMCwxMSArMTE1LDE2IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9iZW5jaG1hcmtfbW92ZShzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdW5zaWduZWQgc2l6ZSwKIAlpZiAodW5saWtlbHkociAh PSAwKSkKIAkJZ290byBvdXRfY2xlYW51cDsKIAlyID0gYW1kZ3B1X2JvX3Bpbihkb2JqLCBkZG9t YWluKTsKLQlkYWRkciA9IGFtZGdwdV9ib19ncHVfb2Zmc2V0KGRvYmopOworCWlmIChyKSB7CisJ CWFtZGdwdV9ib191bnJlc2VydmUoc29iaik7CisJCWdvdG8gb3V0X2NsZWFudXA7CisJfQorCXIg PSBhbWRncHVfdHRtX2FsbG9jX2dhcnQoJmRvYmotPnRibyk7CiAJYW1kZ3B1X2JvX3VucmVzZXJ2 ZShkb2JqKTsKIAlpZiAocikgewogCQlnb3RvIG91dF9jbGVhbnVwOwogCX0KKwlkYWRkciA9IGFt ZGdwdV9ib19ncHVfb2Zmc2V0KGRvYmopOwogCiAJaWYgKGFkZXYtPm1tYW4uYnVmZmVyX2Z1bmNz KSB7CiAJCXRpbWUgPSBhbWRncHVfYmVuY2htYXJrX2RvX21vdmUoYWRldiwgc2l6ZSwgc2FkZHIs IGRhZGRyLCBuKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGlzcGxheS5j CmluZGV4IDAzNmI2ZjcuLjdkNmEzNmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2Rpc3BsYXkuYwpAQCAtMTk0LDYgKzE5NCwxMiBAQCBpbnQgYW1kZ3B1X2Rpc3BsYXlf Y3J0Y19wYWdlX2ZsaXBfdGFyZ2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJZ290byB1bnJl c2VydmU7CiAJfQogCisJciA9IGFtZGdwdV90dG1fYWxsb2NfZ2FydCgmbmV3X2Fiby0+dGJvKTsK KwlpZiAodW5saWtlbHkociAhPSAwKSkgeworCQlEUk1fRVJST1IoIiVwIGJpbmQgZmFpbGVkXG4i LCBuZXdfYWJvKTsKKwkJZ290byB1bnBpbjsKKwl9CisKIAlyID0gcmVzZXJ2YXRpb25fb2JqZWN0 X2dldF9mZW5jZXNfcmN1KG5ld19hYm8tPnRiby5yZXN2LCAmd29yay0+ZXhjbCwKIAkJCQkJICAg ICAgJndvcmstPnNoYXJlZF9jb3VudCwKIAkJCQkJICAgICAgJndvcmstPnNoYXJlZCk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZmIuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9mYi5jCmluZGV4IDQ2MmI3YTEuLmNkNjhhMmUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9mYi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9mYi5jCkBAIC0xNzMsNiArMTczLDE0IEBA IHN0YXRpYyBpbnQgYW1kZ3B1ZmJfY3JlYXRlX3Bpbm5lZF9vYmplY3Qoc3RydWN0IGFtZGdwdV9m YmRldiAqcmZiZGV2LAogCQlhbWRncHVfYm9fdW5yZXNlcnZlKGFibyk7CiAJCWdvdG8gb3V0X3Vu cmVmOwogCX0KKworCXJldCA9IGFtZGdwdV90dG1fYWxsb2NfZ2FydCgmYWJvLT50Ym8pOworCWlm IChyZXQpIHsKKwkJYW1kZ3B1X2JvX3VucmVzZXJ2ZShhYm8pOworCQlkZXZfZXJyKGFkZXYtPmRl diwgIiVwIGJpbmQgZmFpbGVkXG4iLCBhYm8pOworCQlnb3RvIG91dF91bnJlZjsKKwl9CisKIAly ZXQgPSBhbWRncHVfYm9fa21hcChhYm8sIE5VTEwpOwogCWFtZGdwdV9ib191bnJlc2VydmUoYWJv KTsKIAlpZiAocmV0KSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfb2JqZWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0 LmMKaW5kZXggNzljZGJmMS4uN2Y3YzIyMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9vYmplY3QuYwpAQCAtMjU3LDYgKzI1NywxMyBAQCBpbnQgYW1kZ3B1X2JvX2NyZWF0 ZV9yZXNlcnZlZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJZGV2X2VycihhZGV2LT5k ZXYsICIoJWQpIGtlcm5lbCBibyBwaW4gZmFpbGVkXG4iLCByKTsKIAkJZ290byBlcnJvcl91bnJl c2VydmU7CiAJfQorCisJciA9IGFtZGdwdV90dG1fYWxsb2NfZ2FydCgmKCpib19wdHIpLT50Ym8p OworCWlmIChyKSB7CisJCWRldl9lcnIoYWRldi0+ZGV2LCAiJXAgYmluZCBmYWlsZWRcbiIsICpi b19wdHIpOworCQlnb3RvIGVycm9yX3VucGluOworCX0KKwogCWlmIChncHVfYWRkcikKIAkJKmdw dV9hZGRyID0gYW1kZ3B1X2JvX2dwdV9vZmZzZXQoKmJvX3B0cik7CiAKQEAgLTI3MCw2ICsyNzcs OCBAQCBpbnQgYW1kZ3B1X2JvX2NyZWF0ZV9yZXNlcnZlZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwKIAogCXJldHVybiAwOwogCitlcnJvcl91bnBpbjoKKwlhbWRncHVfYm9fdW5waW4oKmJv X3B0cik7CiBlcnJvcl91bnJlc2VydmU6CiAJYW1kZ3B1X2JvX3VucmVzZXJ2ZSgqYm9fcHRyKTsK IApAQCAtOTAzLDEyICs5MTIsNiBAQCBpbnQgYW1kZ3B1X2JvX3Bpbl9yZXN0cmljdGVkKHN0cnVj dCBhbWRncHVfYm8gKmJvLCB1MzIgZG9tYWluLAogCQlnb3RvIGVycm9yOwogCX0KIAotCXIgPSBh bWRncHVfdHRtX2FsbG9jX2dhcnQoJmJvLT50Ym8pOwotCWlmICh1bmxpa2VseShyKSkgewotCQlk ZXZfZXJyKGFkZXYtPmRldiwgIiVwIGJpbmQgZmFpbGVkXG4iLCBibyk7Ci0JCWdvdG8gZXJyb3I7 Ci0JfQotCiAJYm8tPnBpbl9jb3VudCA9IDE7CiAKIAlkb21haW4gPSBhbWRncHVfbWVtX3R5cGVf dG9fZG9tYWluKGJvLT50Ym8ubWVtLm1lbV90eXBlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90ZXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfdGVzdC5jCmluZGV4IDYyMmFmZmMuLmQ2ZWVlYTEgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90ZXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3Rlc3QuYwpAQCAtMTAyLDYgKzEwMiwxMSBAQCBzdGF0aWMgdm9p ZCBhbWRncHVfZG9fdGVzdF9tb3ZlcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJCURS TV9FUlJPUigiRmFpbGVkIHRvIHBpbiBHVFQgb2JqZWN0ICVkXG4iLCBpKTsKIAkJCWdvdG8gb3V0 X2xjbGVhbl91bnJlczsKIAkJfQorCQlyID0gYW1kZ3B1X3R0bV9hbGxvY19nYXJ0KCZndHRfb2Jq W2ldLT50Ym8pOworCQlpZiAocikgeworCQkJRFJNX0VSUk9SKCIlcCBiaW5kIGZhaWxlZFxuIiwg Z3R0X29ialtpXSk7CisJCQlnb3RvIG91dF9sY2xlYW5fdW5waW47CisJCX0KIAkJZ2FydF9hZGRy ID0gYW1kZ3B1X2JvX2dwdV9vZmZzZXQoZ3R0X29ialtpXSk7CiAKIAkJciA9IGFtZGdwdV9ib19r bWFwKGd0dF9vYmpbaV0sICZndHRfbWFwKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCmluZGV4IDMxNjUyYzFlLi5kNDMzNDI4IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMK QEAgLTMxMTAsMTMgKzMxMTAsMjIgQEAgc3RhdGljIGludCBkbV9wbGFuZV9oZWxwZXJfcHJlcGFy ZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJZG9tYWluID0gQU1ER1BVX0dFTV9ET01B SU5fVlJBTTsKIAogCXIgPSBhbWRncHVfYm9fcGluKHJibywgZG9tYWluKTsKLQlhbWRncHVfYm9f dW5yZXNlcnZlKHJibyk7Ci0KIAlpZiAodW5saWtlbHkociAhPSAwKSkgewogCQlpZiAociAhPSAt RVJFU1RBUlRTWVMpCiAJCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwaW4gZnJhbWVidWZmZXIgd2l0 aCBlcnJvciAlZFxuIiwgcik7CisJCWFtZGdwdV9ib191bnJlc2VydmUocmJvKTsKKwkJcmV0dXJu IHI7CisJfQorCisJciA9IGFtZGdwdV90dG1fYWxsb2NfZ2FydCgmcmJvLT50Ym8pOworCWlmICh1 bmxpa2VseShyICE9IDApKSB7CisJCWFtZGdwdV9ib191bnBpbihyYm8pOworCQlhbWRncHVfYm9f dW5yZXNlcnZlKHJibyk7CisJCURSTV9FUlJPUigiJXAgYmluZCBmYWlsZWRcbiIsIHJibyk7CiAJ CXJldHVybiByOwogCX0KKwlhbWRncHVfYm9fdW5yZXNlcnZlKHJibyk7CisKIAlhZmItPmFkZHJl c3MgPSBhbWRncHVfYm9fZ3B1X29mZnNldChyYm8pOwogCiAJYW1kZ3B1X2JvX3JlZihyYm8pOwot LSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=