From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 5/5] drm/amdgpu: rework page directory filling v2 Date: Mon, 28 Aug 2017 20:50:44 +0200 Message-ID: <1503946244-1535-5-git-send-email-deathsimple@vodafone.de> References: <1503946244-1535-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: <1503946244-1535-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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKS2VlcCB0 cmFjayBvZmYgcmVsb2NhdGVkIFBEcy9QVHMgaW5zdGVhZCBvZiB3YWxraW5nIGFuZCBjaGVja2lu ZyBhbGwgUERzLgoKdjI6IGZpeCByb290IFBEIGhhbmRsaW5nCgpTaWduZWQtb2ZmLWJ5OiBDaHJp c3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ClJldmlld2VkLWJ5OiBBbGV4 IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+ICh2MSkKLS0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYyB8IDg5ICsrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5oIHwgIDMg KysKIDIgZmlsZXMgY2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwppbmRleCA1OTJjM2U3Li40Y2RmYjcw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwpAQCAtMTk2LDcgKzE5Niw3 IEBAIGludCBhbWRncHVfdm1fdmFsaWRhdGVfcHRfYm9zKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LCBzdHJ1Y3QgYW1kZ3B1X3ZtICp2bSwKIAkJfQogCiAJCXNwaW5fbG9jaygmdm0tPnN0YXR1 c19sb2NrKTsKLQkJbGlzdF9kZWxfaW5pdCgmYm9fYmFzZS0+dm1fc3RhdHVzKTsKKwkJbGlzdF9t b3ZlKCZib19iYXNlLT52bV9zdGF0dXMsICZ2bS0+cmVsb2NhdGVkKTsKIAl9CiAJc3Bpbl91bmxv Y2soJnZtLT5zdGF0dXNfbG9jayk7CiAKQEAgLTMxMyw4ICszMTMsMTAgQEAgc3RhdGljIGludCBh bWRncHVfdm1fYWxsb2NfbGV2ZWxzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJZW50 cnktPmJhc2Uudm0gPSB2bTsKIAkJCWVudHJ5LT5iYXNlLmJvID0gcHQ7CiAJCQlsaXN0X2FkZF90 YWlsKCZlbnRyeS0+YmFzZS5ib19saXN0LCAmcHQtPnZhKTsKLQkJCUlOSVRfTElTVF9IRUFEKCZl bnRyeS0+YmFzZS52bV9zdGF0dXMpOwotCQkJZW50cnktPmFkZHIgPSAwOworCQkJc3Bpbl9sb2Nr KCZ2bS0+c3RhdHVzX2xvY2spOworCQkJbGlzdF9hZGQoJmVudHJ5LT5iYXNlLnZtX3N0YXR1cywg JnZtLT5yZWxvY2F0ZWQpOworCQkJc3Bpbl91bmxvY2soJnZtLT5zdGF0dXNfbG9jayk7CisJCQll bnRyeS0+YWRkciA9IH4wVUxMOwogCQl9CiAKIAkJaWYgKGxldmVsIDwgYWRldi0+dm1fbWFuYWdl ci5udW1fbGV2ZWwpIHsKQEAgLTk5OSwxOCArMTAwMSwxNyBAQCBzdGF0aWMgaW50IGFtZGdwdV92 bV93YWl0X3BkKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBzdHJ1Y3QgYW1kZ3B1X3ZtICp2 bSwKICAqLwogc3RhdGljIGludCBhbWRncHVfdm1fdXBkYXRlX2xldmVsKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LAogCQkJCSAgc3RydWN0IGFtZGdwdV92bSAqdm0sCi0JCQkJICBzdHJ1Y3Qg YW1kZ3B1X3ZtX3B0ICpwYXJlbnQsCi0JCQkJICB1bnNpZ25lZCBsZXZlbCkKKwkJCQkgIHN0cnVj dCBhbWRncHVfdm1fcHQgKnBhcmVudCkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICpzaGFkb3c7CiAJ c3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gTlVMTDsKIAl1aW50NjRfdCBwZF9hZGRyLCBzaGFk b3dfYWRkciA9IDA7Ci0JdWludDMyX3QgaW5jciA9IGFtZGdwdV92bV9ib19zaXplKGFkZXYsIGxl dmVsICsgMSk7CiAJdWludDY0X3QgbGFzdF9wZGUgPSB+MCwgbGFzdF9wdCA9IH4wLCBsYXN0X3No YWRvdyA9IH4wOwogCXVuc2lnbmVkIGNvdW50ID0gMCwgcHRfaWR4LCBuZHcgPSAwOwogCXN0cnVj dCBhbWRncHVfam9iICpqb2I7CiAJc3RydWN0IGFtZGdwdV9wdGVfdXBkYXRlX3BhcmFtcyBwYXJh bXM7CiAJc3RydWN0IGRtYV9mZW5jZSAqZmVuY2UgPSBOVUxMOworCXVpbnQzMl90IGluY3I7CiAK IAlpbnQgcjsKIApAQCAtMTA1OCwxMiArMTA1OSwxNyBAQCBzdGF0aWMgaW50IGFtZGdwdV92bV91 cGRhdGVfbGV2ZWwoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAKIAkvKiB3YWxrIG92ZXIg dGhlIGFkZHJlc3Mgc3BhY2UgYW5kIHVwZGF0ZSB0aGUgZGlyZWN0b3J5ICovCiAJZm9yIChwdF9p ZHggPSAwOyBwdF9pZHggPD0gcGFyZW50LT5sYXN0X2VudHJ5X3VzZWQ7ICsrcHRfaWR4KSB7Ci0J CXN0cnVjdCBhbWRncHVfYm8gKmJvID0gcGFyZW50LT5lbnRyaWVzW3B0X2lkeF0uYmFzZS5ibzsK KwkJc3RydWN0IGFtZGdwdV92bV9wdCAqZW50cnkgPSAmcGFyZW50LT5lbnRyaWVzW3B0X2lkeF07 CisJCXN0cnVjdCBhbWRncHVfYm8gKmJvID0gZW50cnktPmJhc2UuYm87CiAJCXVpbnQ2NF90IHBk ZSwgcHQ7CiAKIAkJaWYgKGJvID09IE5VTEwpCiAJCQljb250aW51ZTsKIAorCQlzcGluX2xvY2so JnZtLT5zdGF0dXNfbG9jayk7CisJCWxpc3RfZGVsX2luaXQoJmVudHJ5LT5iYXNlLnZtX3N0YXR1 cyk7CisJCXNwaW5fdW5sb2NrKCZ2bS0+c3RhdHVzX2xvY2spOworCiAJCXB0ID0gYW1kZ3B1X2Jv X2dwdV9vZmZzZXQoYm8pOwogCQlwdCA9IGFtZGdwdV9nYXJ0X2dldF92bV9wZGUoYWRldiwgcHQp OwogCQkvKiBEb24ndCB1cGRhdGUgaHVnZSBwYWdlcyBoZXJlICovCkBAIC0xMDc0LDYgKzEwODAs NyBAQCBzdGF0aWMgaW50IGFtZGdwdV92bV91cGRhdGVfbGV2ZWwoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCiAJCXBhcmVudC0+ZW50cmllc1twdF9pZHhdLmFkZHIgPSBwdCB8IEFNREdQVV9Q VEVfVkFMSUQ7CiAKIAkJcGRlID0gcGRfYWRkciArIHB0X2lkeCAqIDg7CisJCWluY3IgPSBhbWRn cHVfYm9fc2l6ZShibyk7CiAJCWlmICgoKGxhc3RfcGRlICsgOCAqIGNvdW50KSAhPSBwZGUpIHx8 CiAJCSAgICAoKGxhc3RfcHQgKyBpbmNyICogY291bnQpICE9IHB0KSB8fAogCQkgICAgKGNvdW50 ID09IEFNREdQVV9WTV9NQVhfVVBEQVRFX1NJWkUpKSB7CkBAIC0xMTM0LDIwICsxMTQxLDYgQEAg c3RhdGljIGludCBhbWRncHVfdm1fdXBkYXRlX2xldmVsKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LAogCQkJZG1hX2ZlbmNlX3B1dChmZW5jZSk7CiAJCX0KIAl9Ci0JLyoKLQkgKiBSZWN1cnNl IGludG8gdGhlIHN1YmRpcmVjdG9yaWVzLiBUaGlzIHJlY3Vyc2lvbiBpcyBoYXJtbGVzcyBiZWNh dXNlCi0JICogd2Ugb25seSBoYXZlIGEgbWF4aW11bSBvZiA1IGxheWVycy4KLQkgKi8KLQlmb3Ig KHB0X2lkeCA9IDA7IHB0X2lkeCA8PSBwYXJlbnQtPmxhc3RfZW50cnlfdXNlZDsgKytwdF9pZHgp IHsKLQkJc3RydWN0IGFtZGdwdV92bV9wdCAqZW50cnkgPSAmcGFyZW50LT5lbnRyaWVzW3B0X2lk eF07Ci0KLQkJaWYgKCFlbnRyeS0+YmFzZS5ibykKLQkJCWNvbnRpbnVlOwotCi0JCXIgPSBhbWRn cHVfdm1fdXBkYXRlX2xldmVsKGFkZXYsIHZtLCBlbnRyeSwgbGV2ZWwgKyAxKTsKLQkJaWYgKHIp Ci0JCQlyZXR1cm4gcjsKLQl9CiAKIAlyZXR1cm4gMDsKIApAQCAtMTE2Myw3ICsxMTU2LDggQEAg c3RhdGljIGludCBhbWRncHVfdm1fdXBkYXRlX2xldmVsKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LAogICoKICAqIE1hcmsgYWxsIFBEIGxldmVsIGFzIGludmFsaWQgYWZ0ZXIgYW4gZXJyb3Iu CiAgKi8KLXN0YXRpYyB2b2lkIGFtZGdwdV92bV9pbnZhbGlkYXRlX2xldmVsKHN0cnVjdCBhbWRn cHVfdm1fcHQgKnBhcmVudCkKK3N0YXRpYyB2b2lkIGFtZGdwdV92bV9pbnZhbGlkYXRlX2xldmVs KHN0cnVjdCBhbWRncHVfdm0gKnZtLAorCQkJCSAgICAgICBzdHJ1Y3QgYW1kZ3B1X3ZtX3B0ICpw YXJlbnQpCiB7CiAJdW5zaWduZWQgcHRfaWR4OwogCkBAIC0xMTc4LDcgKzExNzIsMTAgQEAgc3Rh dGljIHZvaWQgYW1kZ3B1X3ZtX2ludmFsaWRhdGVfbGV2ZWwoc3RydWN0IGFtZGdwdV92bV9wdCAq cGFyZW50KQogCQkJY29udGludWU7CiAKIAkJZW50cnktPmFkZHIgPSB+MFVMTDsKLQkJYW1kZ3B1 X3ZtX2ludmFsaWRhdGVfbGV2ZWwoZW50cnkpOworCQlzcGluX2xvY2soJnZtLT5zdGF0dXNfbG9j ayk7CisJCWxpc3RfbW92ZSgmZW50cnktPmJhc2Uudm1fc3RhdHVzLCAmdm0tPnJlbG9jYXRlZCk7 CisJCXNwaW5fdW5sb2NrKCZ2bS0+c3RhdHVzX2xvY2spOworCQlhbWRncHVfdm1faW52YWxpZGF0 ZV9sZXZlbCh2bSwgZW50cnkpOwogCX0KIH0KIApAQCAtMTE5Niw5ICsxMTkzLDM4IEBAIGludCBh bWRncHVfdm1fdXBkYXRlX2RpcmVjdG9yaWVzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog ewogCWludCByOwogCi0JciA9IGFtZGdwdV92bV91cGRhdGVfbGV2ZWwoYWRldiwgdm0sICZ2bS0+ cm9vdCwgMCk7Ci0JaWYgKHIpCi0JCWFtZGdwdV92bV9pbnZhbGlkYXRlX2xldmVsKCZ2bS0+cm9v dCk7CisJc3Bpbl9sb2NrKCZ2bS0+c3RhdHVzX2xvY2spOworCXdoaWxlICghbGlzdF9lbXB0eSgm dm0tPnJlbG9jYXRlZCkpIHsKKwkJc3RydWN0IGFtZGdwdV92bV9ib19iYXNlICpib19iYXNlOwor CQlzdHJ1Y3QgYW1kZ3B1X2JvICpibzsKKworCQlib19iYXNlID0gbGlzdF9maXJzdF9lbnRyeSgm dm0tPnJlbG9jYXRlZCwKKwkJCQkJICAgc3RydWN0IGFtZGdwdV92bV9ib19iYXNlLAorCQkJCQkg ICB2bV9zdGF0dXMpOworCQlzcGluX3VubG9jaygmdm0tPnN0YXR1c19sb2NrKTsKKworCQlibyA9 IGJvX2Jhc2UtPmJvLT5wYXJlbnQ7CisJCWlmIChibykgeworCQkJc3RydWN0IGFtZGdwdV92bV9i b19iYXNlICpwYXJlbnQ7CisJCQlzdHJ1Y3QgYW1kZ3B1X3ZtX3B0ICpwdDsKKworCQkJcGFyZW50 ID0gbGlzdF9maXJzdF9lbnRyeSgmYm8tPnZhLAorCQkJCQkJICBzdHJ1Y3QgYW1kZ3B1X3ZtX2Jv X2Jhc2UsCisJCQkJCQkgIGJvX2xpc3QpOworCQkJcHQgPSBjb250YWluZXJfb2YocGFyZW50LCBz dHJ1Y3QgYW1kZ3B1X3ZtX3B0LCBiYXNlKTsKKworCQkJciA9IGFtZGdwdV92bV91cGRhdGVfbGV2 ZWwoYWRldiwgdm0sIHB0KTsKKwkJCWlmIChyKSB7CisJCQkJYW1kZ3B1X3ZtX2ludmFsaWRhdGVf bGV2ZWwodm0sICZ2bS0+cm9vdCk7CisJCQkJcmV0dXJuIHI7CisJCQl9CisJCQlzcGluX2xvY2so JnZtLT5zdGF0dXNfbG9jayk7CisJCX0gZWxzZSB7CisJCQlzcGluX2xvY2soJnZtLT5zdGF0dXNf bG9jayk7CisJCQlsaXN0X2RlbF9pbml0KCZib19iYXNlLT52bV9zdGF0dXMpOworCQl9CisJfQor CXNwaW5fdW5sb2NrKCZ2bS0+c3RhdHVzX2xvY2spOwogCiAJaWYgKHZtLT51c2VfY3B1X2Zvcl91 cGRhdGUpIHsKIAkJLyogRmx1c2ggSERQICovCkBAIC0xNjAwLDcgKzE2MjYsNyBAQCBzdGF0aWMg aW50IGFtZGdwdV92bV9ib191cGRhdGVfbWFwcGluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwKIAogZXJyb3JfZnJlZToKIAlhbWRncHVfam9iX2ZyZWUoam9iKTsKLQlhbWRncHVfdm1faW52 YWxpZGF0ZV9sZXZlbCgmdm0tPnJvb3QpOworCWFtZGdwdV92bV9pbnZhbGlkYXRlX2xldmVsKHZt LCAmdm0tPnJvb3QpOwogCXJldHVybiByOwogfQogCkBAIC0yMzkwLDkgKzI0MTYsMTMgQEAgdm9p ZCBhbWRncHVfdm1fYm9faW52YWxpZGF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJ CWNvbnRpbnVlOwogCQl9CiAKLQkJLyogRG9uJ3QgYWRkIHBhZ2UgdGFibGVzIHRvIHRoZSBtb3Zl ZCBzdGF0ZSAqLwotCQlpZiAoYm8tPnRiby50eXBlID09IHR0bV9ib190eXBlX2tlcm5lbCkKKwkJ aWYgKGJvLT50Ym8udHlwZSA9PSB0dG1fYm9fdHlwZV9rZXJuZWwpIHsKKwkJCXNwaW5fbG9jaygm Ym9fYmFzZS0+dm0tPnN0YXR1c19sb2NrKTsKKwkJCWlmIChsaXN0X2VtcHR5KCZib19iYXNlLT52 bV9zdGF0dXMpKQorCQkJCWxpc3RfYWRkKCZib19iYXNlLT52bV9zdGF0dXMsICZ2bS0+cmVsb2Nh dGVkKTsKKwkJCXNwaW5fdW5sb2NrKCZib19iYXNlLT52bS0+c3RhdHVzX2xvY2spOwogCQkJY29u dGludWU7CisJCX0KIAogCQlzcGluX2xvY2soJmJvX2Jhc2UtPnZtLT5zdGF0dXNfbG9jayk7CiAJ CWxpc3RfbW92ZSgmYm9fYmFzZS0+dm1fc3RhdHVzLCAmYm9fYmFzZS0+dm0tPm1vdmVkKTsKQEAg LTI0ODIsNiArMjUxMiw3IEBAIGludCBhbWRncHVfdm1faW5pdChzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwgc3RydWN0IGFtZGdwdV92bSAqdm0sCiAJCXZtLT5yZXNlcnZlZF92bWlkW2ldID0g TlVMTDsKIAlzcGluX2xvY2tfaW5pdCgmdm0tPnN0YXR1c19sb2NrKTsKIAlJTklUX0xJU1RfSEVB RCgmdm0tPmV2aWN0ZWQpOworCUlOSVRfTElTVF9IRUFEKCZ2bS0+cmVsb2NhdGVkKTsKIAlJTklU X0xJU1RfSEVBRCgmdm0tPm1vdmVkKTsKIAlJTklUX0xJU1RfSEVBRCgmdm0tPmZyZWVkKTsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmggYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uaAppbmRleCA0ZTQ2NWU4Li5jMzc1M2Fm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uaApAQCAtMTI5LDYgKzEyOSw5 IEBAIHN0cnVjdCBhbWRncHVfdm0gewogCS8qIEJPcyB3aG8gbmVlZHMgYSB2YWxpZGF0aW9uICov CiAJc3RydWN0IGxpc3RfaGVhZAlldmljdGVkOwogCisJLyogUFQgQk9zIHdoaWNoIHJlbG9jYXRl ZCBhbmQgdGhlaXIgcGFyZW50IG5lZWQgYW4gdXBkYXRlICovCisJc3RydWN0IGxpc3RfaGVhZAly ZWxvY2F0ZWQ7CisKIAkvKiBCT3MgbW92ZWQsIGJ1dCBub3QgeWV0IHVwZGF0ZWQgaW4gdGhlIFBU ICovCiAJc3RydWN0IGxpc3RfaGVhZAltb3ZlZDsKIAotLSAKMi43LjQKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFt ZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=