From: Junwei Zhang Subject: [PATCH 1/2] drm/amdgpu: return bo itself if userptr is cpu addr of bo (v3) Date: Mon, 30 Jul 2018 18:02:29 +0800 Message-ID: <1532944950-28619-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: 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 , Chunming Zhou , christian.koenig-5C7GfCeVMHo@public.gmane.org RnJvbTogQ2h1bm1pbmcgWmhvdSA8RGF2aWQxLlpob3VAYW1kLmNvbT4KCnYyOiBnZXQgb3JpZ2lu YWwgZ2VtIGhhbmRsZSBmcm9tIGdvYmoKdjM6IHVwZGF0ZSBmaW5kIGJvIGRhdGEgc3RydWN0dXJl IGFzIHVuaW9uKGluLCBvdXQpCiAgICBzaW1wbHkgc29tZSBjb2RlIGxvZ2ljCgpTaWduZWQtb2Zm LWJ5OiBDaHVubWluZyBaaG91IDxEYXZpZDEuWmhvdUBhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBK dW53ZWkgWmhhbmcgPEplcnJ5LlpoYW5nQGFtZC5jb20+ICh2MykKUmV2aWV3ZWQtYnk6IENocmlz dGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEphbW15 IFpob3UgPEphbW15Llpob3VAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHUuaCAgICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2dlbS5jIHwgNjMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfa21zLmMgfCAgMyArLQogaW5jbHVkZS91YXBpL2RybS9h bWRncHVfZHJtLmggICAgICAgICAgIHwgMjEgKysrKysrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwg ODggaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1LmgKaW5kZXggNGNkMjBlNy4uNDZjMzcwYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1LmgKQEAgLTEyMTMsNiArMTIxMyw4IEBAIGludCBhbWRncHVfZ2VtX2luZm9faW9jdGwoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCSAgc3RydWN0IGRybV9maWxlICpm aWxwKTsKIGludCBhbWRncHVfZ2VtX3VzZXJwdHJfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAkJCXN0cnVjdCBkcm1fZmlsZSAqZmlscCk7CitpbnQgYW1kZ3B1X2dl bV9maW5kX2JvX2J5X2NwdV9tYXBwaW5nX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZv aWQgKmRhdGEsCisJCQkJCSAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHApOwogaW50IGFtZGdwdV9n ZW1fbW1hcF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJICBz dHJ1Y3QgZHJtX2ZpbGUgKmZpbHApOwogaW50IGFtZGdwdV9nZW1fd2FpdF9pZGxlX2lvY3RsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfZ2VtLmMKaW5kZXggNzE3OTJkOC4uYmFlODQxNyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9nZW0uYwpAQCAtMjg4LDYgKzI4OCw2OSBAQCBpbnQgYW1kZ3B1X2dl bV9jcmVhdGVfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlyZXR1 cm4gMDsKIH0KIAorc3RhdGljIGludCBhbWRncHVfZ2VtX2dldF9oYW5kbGVfZnJvbV9vYmplY3Qo c3RydWN0IGRybV9maWxlICpmaWxwLAorCQkJCQkgICAgIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAq b2JqKQoreworCWludCBpOworCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqdG1wOworCisJc3Bpbl9s b2NrKCZmaWxwLT50YWJsZV9sb2NrKTsKKwlpZHJfZm9yX2VhY2hfZW50cnkoJmZpbHAtPm9iamVj dF9pZHIsIHRtcCwgaSkgeworCQlpZiAob2JqID09IHRtcCkgeworCQkJZHJtX2dlbV9vYmplY3Rf cmVmZXJlbmNlKG9iaik7CisJCQlzcGluX3VubG9jaygmZmlscC0+dGFibGVfbG9jayk7CisJCQly ZXR1cm4gaTsKKwkJfQorCX0KKwlzcGluX3VubG9jaygmZmlscC0+dGFibGVfbG9jayk7CisKKwly ZXR1cm4gMDsKK30KKworaW50IGFtZGdwdV9nZW1fZmluZF9ib19ieV9jcHVfbWFwcGluZ19pb2N0 bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAorCQkJCQkgICAgc3RydWN0IGRy bV9maWxlICpmaWxwKQoreworCXVuaW9uIGRybV9hbWRncHVfZ2VtX2ZpbmRfYm8gKmFyZ3MgPSBk YXRhOworCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqZ29iajsKKwlzdHJ1Y3QgYW1kZ3B1X2JvICpi bzsKKwlzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKnRibzsKKwlzdHJ1Y3Qgdm1fYXJlYV9zdHJ1 Y3QgKnZtYTsKKwl1aW50MzJfdCBoYW5kbGU7CisJaW50IHI7CisKKwlpZiAob2Zmc2V0X2luX3Bh Z2UoYXJncy0+aW4uYWRkciB8IGFyZ3MtPmluLnNpemUpKQorCQlyZXR1cm4gLUVJTlZBTDsKKwor CWRvd25fcmVhZCgmY3VycmVudC0+bW0tPm1tYXBfc2VtKTsKKwl2bWEgPSBmaW5kX3ZtYShjdXJy ZW50LT5tbSwgYXJncy0+aW4uYWRkcik7CisJaWYgKCF2bWEgfHwgdm1hLT52bV9maWxlICE9IGZp bHAtPmZpbHAgfHwKKwkgICAgKGFyZ3MtPmluLnNpemUgPiAodm1hLT52bV9lbmQgLSBhcmdzLT5p bi5hZGRyKSkpIHsKKwkJYXJncy0+b3V0LmhhbmRsZSA9IDA7CisJCXVwX3JlYWQoJmN1cnJlbnQt Pm1tLT5tbWFwX3NlbSk7CisJCXJldHVybiAtRUlOVkFMOworCX0KKwlhcmdzLT5vdXQub2Zmc2V0 ID0gYXJncy0+aW4uYWRkciAtIHZtYS0+dm1fc3RhcnQ7CisKKwl0Ym8gPSB2bWEtPnZtX3ByaXZh dGVfZGF0YTsKKwlibyA9IGNvbnRhaW5lcl9vZih0Ym8sIHN0cnVjdCBhbWRncHVfYm8sIHRibyk7 CisJYW1kZ3B1X2JvX3JlZihibyk7CisJZ29iaiA9ICZiby0+Z2VtX2Jhc2U7CisKKwloYW5kbGUg PSBhbWRncHVfZ2VtX2dldF9oYW5kbGVfZnJvbV9vYmplY3QoZmlscCwgZ29iaik7CisJaWYgKCFo YW5kbGUpIHsKKwkJciA9IGRybV9nZW1faGFuZGxlX2NyZWF0ZShmaWxwLCBnb2JqLCAmaGFuZGxl KTsKKwkJaWYgKHIpIHsKKwkJCURSTV9FUlJPUigiY3JlYXRlIGdlbSBoYW5kbGUgZmFpbGVkXG4i KTsKKwkJCXVwX3JlYWQoJmN1cnJlbnQtPm1tLT5tbWFwX3NlbSk7CisJCQlyZXR1cm4gcjsKKwkJ fQorCX0KKwlhcmdzLT5vdXQuaGFuZGxlID0gaGFuZGxlOworCXVwX3JlYWQoJmN1cnJlbnQtPm1t LT5tbWFwX3NlbSk7CisKKwlyZXR1cm4gMDsKK30KKwogaW50IGFtZGdwdV9nZW1fdXNlcnB0cl9p b2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJICAgICBzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbHApCiB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfa21zLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfa21zLmMK aW5kZXggNzk1Njg0OC4uMWJkMmNjMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9rbXMuYwpAQCAtMTEwMCw3ICsxMTAwLDggQEAgdm9pZCBhbWRncHVfZGlzYWJsZV92Ymxhbmtf a21zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKQogCURSTV9JT0NU TF9ERUZfRFJWKEFNREdQVV9HRU1fVkEsIGFtZGdwdV9nZW1fdmFfaW9jdGwsIERSTV9BVVRIfERS TV9SRU5ERVJfQUxMT1cpLAogCURSTV9JT0NUTF9ERUZfRFJWKEFNREdQVV9HRU1fT1AsIGFtZGdw dV9nZW1fb3BfaW9jdGwsIERSTV9BVVRIfERSTV9SRU5ERVJfQUxMT1cpLAogCURSTV9JT0NUTF9E RUZfRFJWKEFNREdQVV9HRU1fVVNFUlBUUiwgYW1kZ3B1X2dlbV91c2VycHRyX2lvY3RsLCBEUk1f QVVUSHxEUk1fUkVOREVSX0FMTE9XKSwKLQlEUk1fSU9DVExfREVGX0RSVihBTURHUFVfRlJFRVNZ TkMsIGFtZGdwdV9kaXNwbGF5X2ZyZWVzeW5jX2lvY3RsLCBEUk1fTUFTVEVSKQorCURSTV9JT0NU TF9ERUZfRFJWKEFNREdQVV9GUkVFU1lOQywgYW1kZ3B1X2Rpc3BsYXlfZnJlZXN5bmNfaW9jdGws IERSTV9NQVNURVIpLAorCURSTV9JT0NUTF9ERUZfRFJWKEFNREdQVV9HRU1fRklORF9CTywgYW1k Z3B1X2dlbV9maW5kX2JvX2J5X2NwdV9tYXBwaW5nX2lvY3RsLCBEUk1fQVVUSHxEUk1fUkVOREVS X0FMTE9XKQogfTsKIGNvbnN0IGludCBhbWRncHVfbWF4X2ttc19pb2N0bCA9IEFSUkFZX1NJWkUo YW1kZ3B1X2lvY3Rsc19rbXMpOwogCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvZHJtL2FtZGdw dV9kcm0uaCBiL2luY2x1ZGUvdWFwaS9kcm0vYW1kZ3B1X2RybS5oCmluZGV4IDk0NDQ0ZWUuLjAw MGM0MTUgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvdWFwaS9kcm0vYW1kZ3B1X2RybS5oCisrKyBiL2lu Y2x1ZGUvdWFwaS9kcm0vYW1kZ3B1X2RybS5oCkBAIC01NCw2ICs1NCw3IEBACiAjZGVmaW5lIERS TV9BTURHUFVfVk0JCQkweDEzCiAjZGVmaW5lIERSTV9BTURHUFVfRkVOQ0VfVE9fSEFORExFCTB4 MTQKICNkZWZpbmUgRFJNX0FNREdQVV9TQ0hFRAkJMHgxNQorI2RlZmluZSBEUk1fQU1ER1BVX0dF TV9GSU5EX0JPCQkweDE2CiAvKiBub3QgdXBzdHJlYW0gKi8KICNkZWZpbmUgRFJNX0FNREdQVV9G UkVFU1lOQwkgICAgICAgIDB4NWQKIApAQCAtNzQsNiArNzUsNyBAQAogI2RlZmluZSBEUk1fSU9D VExfQU1ER1BVX0ZFTkNFX1RPX0hBTkRMRSBEUk1fSU9XUihEUk1fQ09NTUFORF9CQVNFICsgRFJN X0FNREdQVV9GRU5DRV9UT19IQU5ETEUsIHVuaW9uIGRybV9hbWRncHVfZmVuY2VfdG9faGFuZGxl KQogI2RlZmluZSBEUk1fSU9DVExfQU1ER1BVX1NDSEVECQlEUk1fSU9XKERSTV9DT01NQU5EX0JB U0UgKyBEUk1fQU1ER1BVX1NDSEVELCB1bmlvbiBkcm1fYW1kZ3B1X3NjaGVkKQogI2RlZmluZSBE Uk1fSU9DVExfQU1ER1BVX0ZSRUVTWU5DCURSTV9JT1dSKERSTV9DT01NQU5EX0JBU0UgKyBEUk1f QU1ER1BVX0ZSRUVTWU5DLCBzdHJ1Y3QgZHJtX2FtZGdwdV9mcmVlc3luYykKKyNkZWZpbmUgRFJN X0lPQ1RMX0FNREdQVV9HRU1fRklORF9CTwlEUk1fSU9XUihEUk1fQ09NTUFORF9CQVNFICsgRFJN X0FNREdQVV9HRU1fRklORF9CTywgdW5pb24gZHJtX2FtZGdwdV9nZW1fZmluZF9ibykKIAogLyoq CiAgKiBET0M6IG1lbW9yeSBkb21haW5zCkBAIC0zOTIsNiArMzk0LDI1IEBAIHN0cnVjdCBkcm1f YW1kZ3B1X2dlbV93YWl0X2lkbGVfb3V0IHsKIAlzdHJ1Y3QgZHJtX2FtZGdwdV9nZW1fd2FpdF9p ZGxlX291dCBvdXQ7CiB9OwogCitzdHJ1Y3QgZHJtX2FtZGdwdV9nZW1fZmluZF9ib19pbiB7CisJ LyogQ1BVIGFkZHJlc3MgKi8KKwlfX3U2NAkJCWFkZHI7CisJLyogbWVtb3J5IHNpemUgZnJvbSBD UFUgYWRkcmVzcyAqLworCV9fdTY0CQkJc2l6ZTsKK307CisKK3N0cnVjdCBkcm1fYW1kZ3B1X2dl bV9maW5kX2JvX291dCB7CisJLyogb2Zmc2V0IGluIGJvICovCisJX191NjQJCQlvZmZzZXQ7CisJ LyogcmVzdWx0aW5nIEdFTSBoYW5kbGUgKi8KKwlfX3UzMgkJCWhhbmRsZTsKK307CisKK3VuaW9u IGRybV9hbWRncHVfZ2VtX2ZpbmRfYm8geworCXN0cnVjdCBkcm1fYW1kZ3B1X2dlbV9maW5kX2Jv X2luIGluOworCXN0cnVjdCBkcm1fYW1kZ3B1X2dlbV9maW5kX2JvX291dCBvdXQ7Cit9OworCiBz dHJ1Y3QgZHJtX2FtZGdwdV93YWl0X2NzX2luIHsKIAkvKiBDb21tYW5kIHN1Ym1pc3Npb24gaGFu ZGxlCiAgICAgICAgICAqIGhhbmRsZSBlcXVhbHMgMCBtZWFucyBub25lIHRvIHdhaXQgZm9yCi0t IAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K YW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==