From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunming Zhou Subject: [PATCH] drm/amdgpu: return bo itself if userptr is cpu addr of bo V2 Date: Fri, 4 Dec 2015 14:25:52 +0800 Message-ID: <1449210353-24082-2-git-send-email-David1.Zhou@amd.com> References: <1449210353-24082-1-git-send-email-David1.Zhou@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0060.outbound.protection.outlook.com [157.56.111.60]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9E4A86EDB2 for ; Thu, 3 Dec 2015 22:46:16 -0800 (PST) Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by atltwp01.amd.com (Axway MailGate 5.3.1) with ESMTPS id 20843CAF041 for ; Fri, 4 Dec 2015 01:31:23 -0500 (EST) In-Reply-To: <1449210353-24082-1-git-send-email-David1.Zhou@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: christian.koenig@amd.com List-Id: dri-devel@lists.freedesktop.org VjI6IGdldCBvcmlnaW5hbCBnZW0gaGFuZGxlIGZyb20gZ29iagoKQ2hhbmdlLUlkOiBJNzA1ZWFk ZmUwM2NkODVjNzViZmYyNTI1NjNkNjlmM2M4YTUzNjg2OApTaWduZWQtb2ZmLWJ5OiBDaHVubWlu ZyBaaG91IDxEYXZpZDEuWmhvdUBhbWQuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXN0aWFuIEvDtm5p ZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgpSZXZpZXdlZC1ieTogSmFtbXkgWmhvdSA8SmFt bXkuWmhvdUBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5o ICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMgfCA1 OSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9rbXMuYyB8ICAxICsKIGluY2x1ZGUvdWFwaS9kcm0vYW1kZ3B1X2RybS5o ICAgICAgICAgICB8IDEyICsrKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgNzQgaW5zZXJ0aW9ucygr KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggNWI0ZjM5Yy4uMWZmY2JjMSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTE4NDIsNiArMTg0Miw4IEBAIGlu dCBhbWRncHVfZ2VtX2luZm9faW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAkJCSAgc3RydWN0IGRybV9maWxlICpmaWxwKTsKIGludCBhbWRncHVfZ2VtX3VzZXJwdHJf aW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCXN0cnVjdCBkcm1f ZmlsZSAqZmlscCk7CitpbnQgYW1kZ3B1X2dlbV9maW5kX2JvX2J5X2NwdV9tYXBwaW5nX2lvY3Rs KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCisJCQkJCSAgICBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbHApOwogaW50IGFtZGdwdV9nZW1fbW1hcF9pb2N0bChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHApOwogaW50IGFt ZGdwdV9nZW1fd2FpdF9pZGxlX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMKaW5kZXggZmMzMmZjMC4u ZTQ2MTM1NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dl bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZW0uYwpAQCAtMjE2 LDYgKzIxNiw2NSBAQCBlcnJvcl91bmxvY2s6CiAJcmV0dXJuIHI7CiB9CiAKK3N0YXRpYyBpbnQg YW1kZ3B1X2dlbV9nZXRfaGFuZGxlX2Zyb21fb2JqZWN0KHN0cnVjdCBkcm1fZmlsZSAqZmlscCwK KwkJCQkJICAgICBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKK3sKKwlpbnQgaTsKKwlzdHJ1 Y3QgZHJtX2dlbV9vYmplY3QgKnRtcDsKKwlzcGluX2xvY2soJmZpbHAtPnRhYmxlX2xvY2spOwor CWlkcl9mb3JfZWFjaF9lbnRyeSgmZmlscC0+b2JqZWN0X2lkciwgdG1wLCBpKSB7CisJCWlmIChv YmogPT0gdG1wKSB7CisJCQlkcm1fZ2VtX29iamVjdF9yZWZlcmVuY2Uob2JqKTsKKwkJCXNwaW5f dW5sb2NrKCZmaWxwLT50YWJsZV9sb2NrKTsKKwkJCXJldHVybiBpOworCQl9CisJfQorCXNwaW5f dW5sb2NrKCZmaWxwLT50YWJsZV9sb2NrKTsKKwlyZXR1cm4gMDsKK30KKworCitpbnQgYW1kZ3B1 X2dlbV9maW5kX2JvX2J5X2NwdV9tYXBwaW5nX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHZvaWQgKmRhdGEsCisJCQkJCSAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHApCit7CisJc3RydWN0 IGRybV9hbWRncHVfZ2VtX2ZpbmRfYm8gKmFyZ3MgPSBkYXRhOworCXN0cnVjdCBkcm1fZ2VtX29i amVjdCAqZ29iajsKKwlzdHJ1Y3QgYW1kZ3B1X2JvICpibzsKKwlzdHJ1Y3QgdHRtX2J1ZmZlcl9v YmplY3QgKnRibzsKKwlzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYTsKKwl1aW50MzJfdCBoYW5k bGU7CisJaW50IHI7CisKKwlpZiAob2Zmc2V0X2luX3BhZ2UoYXJncy0+YWRkciB8IGFyZ3MtPnNp emUpKQorCQlyZXR1cm4gLUVJTlZBTDsKKworCWRvd25fcmVhZCgmY3VycmVudC0+bW0tPm1tYXBf c2VtKTsKKwl2bWEgPSBmaW5kX3ZtYShjdXJyZW50LT5tbSwgYXJncy0+YWRkcik7CisJaWYgKCF2 bWEgfHwgdm1hLT52bV9maWxlICE9IGZpbHAtPmZpbHAgfHwKKwkgICAgKGFyZ3MtPnNpemUgPiAo dm1hLT52bV9lbmQgLSBhcmdzLT5hZGRyKSkpIHsKKwkJYXJncy0+aGFuZGxlID0gMDsKKwkJdXBf cmVhZCgmY3VycmVudC0+bW0tPm1tYXBfc2VtKTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCXRi byA9IHZtYS0+dm1fcHJpdmF0ZV9kYXRhOworCWJvID0gY29udGFpbmVyX29mKHRibywgc3RydWN0 IGFtZGdwdV9ibywgdGJvKTsKKwlhbWRncHVfYm9fcmVmKGJvKTsKKwlnb2JqID0gJmJvLT5nZW1f YmFzZTsKKwloYW5kbGUgPSBhbWRncHVfZ2VtX2dldF9oYW5kbGVfZnJvbV9vYmplY3QoZmlscCwg Z29iaik7CisJaWYgKGhhbmRsZSA9PSAwKSB7CisJCXIgPSBkcm1fZ2VtX2hhbmRsZV9jcmVhdGUo ZmlscCwgZ29iaiwgJmhhbmRsZSk7CisJCWlmIChyKSB7CisJCQlEUk1fRVJST1IoImNyZWF0ZSBn ZW0gaGFuZGxlIGZhaWxlZFxuIik7CisJCQl1cF9yZWFkKCZjdXJyZW50LT5tbS0+bW1hcF9zZW0p OworCQkJcmV0dXJuIHI7CisJCX0KKwl9CisJYXJncy0+aGFuZGxlID0gaGFuZGxlOworCWFyZ3Mt Pm9mZnNldCA9IGFyZ3MtPmFkZHIgLSB2bWEtPnZtX3N0YXJ0OworCXVwX3JlYWQoJmN1cnJlbnQt Pm1tLT5tbWFwX3NlbSk7CisJcmV0dXJuIDA7Cit9CisKIGludCBhbWRncHVfZ2VtX3VzZXJwdHJf aW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCSAgICAgc3RydWN0 IGRybV9maWxlICpmaWxwKQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5j CmluZGV4IGZmOGYwOTkuLjJjNGMwNTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9rbXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfa21zLmMKQEAgLTcwOSw1ICs3MDksNiBAQCBjb25zdCBzdHJ1Y3QgZHJtX2lvY3RsX2Rlc2Mg YW1kZ3B1X2lvY3Rsc19rbXNbXSA9IHsKIAlEUk1fSU9DVExfREVGX0RSVihBTURHUFVfR0VNX1ZB LCBhbWRncHVfZ2VtX3ZhX2lvY3RsLCBEUk1fQVVUSHxEUk1fVU5MT0NLRUR8RFJNX1JFTkRFUl9B TExPVyksCiAJRFJNX0lPQ1RMX0RFRl9EUlYoQU1ER1BVX0dFTV9PUCwgYW1kZ3B1X2dlbV9vcF9p b2N0bCwgRFJNX0FVVEh8RFJNX1VOTE9DS0VEfERSTV9SRU5ERVJfQUxMT1cpLAogCURSTV9JT0NU TF9ERUZfRFJWKEFNREdQVV9HRU1fVVNFUlBUUiwgYW1kZ3B1X2dlbV91c2VycHRyX2lvY3RsLCBE Uk1fQVVUSHxEUk1fVU5MT0NLRUR8RFJNX1JFTkRFUl9BTExPVyksCisJRFJNX0lPQ1RMX0RFRl9E UlYoQU1ER1BVX0dFTV9GSU5EX0JPLCBhbWRncHVfZ2VtX2ZpbmRfYm9fYnlfY3B1X21hcHBpbmdf aW9jdGwsIERSTV9BVVRIfERSTV9VTkxPQ0tFRHxEUk1fUkVOREVSX0FMTE9XKSwKIH07CiBpbnQg YW1kZ3B1X21heF9rbXNfaW9jdGwgPSBBUlJBWV9TSVpFKGFtZGdwdV9pb2N0bHNfa21zKTsKZGlm ZiAtLWdpdCBhL2luY2x1ZGUvdWFwaS9kcm0vYW1kZ3B1X2RybS5oIGIvaW5jbHVkZS91YXBpL2Ry bS9hbWRncHVfZHJtLmgKaW5kZXggNmRjYWE3OS4uYzljMDFkNTggMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUvdWFwaS9kcm0vYW1kZ3B1X2RybS5oCisrKyBiL2luY2x1ZGUvdWFwaS9kcm0vYW1kZ3B1X2Ry bS5oCkBAIC00Nyw2ICs0Nyw3IEBACiAjZGVmaW5lIERSTV9BTURHUFVfR0VNX09QCQkweDEwCiAj ZGVmaW5lIERSTV9BTURHUFVfR0VNX1VTRVJQVFIJCTB4MTEKICNkZWZpbmUgRFJNX0FNREdQVV9X QUlUX0ZFTkNFUwkJMHgxMgorI2RlZmluZSBEUk1fQU1ER1BVX0dFTV9GSU5EX0JPCSAgICAgICAg MHgxMwogCiAjZGVmaW5lIERSTV9JT0NUTF9BTURHUFVfR0VNX0NSRUFURQlEUk1fSU9XUihEUk1f Q09NTUFORF9CQVNFICsgRFJNX0FNREdQVV9HRU1fQ1JFQVRFLCB1bmlvbiBkcm1fYW1kZ3B1X2dl bV9jcmVhdGUpCiAjZGVmaW5lIERSTV9JT0NUTF9BTURHUFVfR0VNX01NQVAJRFJNX0lPV1IoRFJN X0NPTU1BTkRfQkFTRSArIERSTV9BTURHUFVfR0VNX01NQVAsIHVuaW9uIGRybV9hbWRncHVfZ2Vt X21tYXApCkBAIC02MSw2ICs2Miw3IEBACiAjZGVmaW5lIERSTV9JT0NUTF9BTURHUFVfR0VNX09Q CQlEUk1fSU9XUihEUk1fQ09NTUFORF9CQVNFICsgRFJNX0FNREdQVV9HRU1fT1AsIHN0cnVjdCBk cm1fYW1kZ3B1X2dlbV9vcCkKICNkZWZpbmUgRFJNX0lPQ1RMX0FNREdQVV9HRU1fVVNFUlBUUglE Uk1fSU9XUihEUk1fQ09NTUFORF9CQVNFICsgRFJNX0FNREdQVV9HRU1fVVNFUlBUUiwgc3RydWN0 IGRybV9hbWRncHVfZ2VtX3VzZXJwdHIpCiAjZGVmaW5lIERSTV9JT0NUTF9BTURHUFVfV0FJVF9G RU5DRVMJRFJNX0lPV1IoRFJNX0NPTU1BTkRfQkFTRSArIERSTV9BTURHUFVfV0FJVF9GRU5DRVMs IHVuaW9uIGRybV9hbWRncHVfd2FpdF9mZW5jZXMpCisjZGVmaW5lIERSTV9JT0NUTF9BTURHUFVf R0VNX0ZJTkRfQk8JRFJNX0lPV1IoRFJNX0NPTU1BTkRfQkFTRSArIERSTV9BTURHUFVfR0VNX0ZJ TkRfQk8sIHN0cnVjdCBkcm1fYW1kZ3B1X2dlbV9maW5kX2JvKQogCiAjZGVmaW5lIEFNREdQVV9H RU1fRE9NQUlOX0NQVQkJMHgxCiAjZGVmaW5lIEFNREdQVV9HRU1fRE9NQUlOX0dUVAkJMHgyCkBA IC0xOTksNiArMjAxLDE2IEBAIHN0cnVjdCBkcm1fYW1kZ3B1X2dlbV91c2VycHRyIHsKIAl1aW50 MzJfdAkJaGFuZGxlOwogfTsKIAorc3RydWN0IGRybV9hbWRncHVfZ2VtX2ZpbmRfYm8geworCXVp bnQ2NF90CQlhZGRyOworCXVpbnQ2NF90CQlzaXplOworCXVpbnQzMl90CQlmbGFnczsKKwkvKiBS ZXN1bHRpbmcgR0VNIGhhbmRsZSAqLworCXVpbnQzMl90CQloYW5kbGU7CisJLyogb2Zmc2V0IGlu IGJvICovCisJdWludDY0X3QJCW9mZnNldDsKK307CisKIC8qIHNhbWUgbWVhbmluZyBhcyB0aGUg R0JfVElMRV9NT0RFIGFuZCBHTF9NQUNST19USUxFX01PREUgZmllbGRzICovCiAjZGVmaW5lIEFN REdQVV9USUxJTkdfQVJSQVlfTU9ERV9TSElGVAkJCTAKICNkZWZpbmUgQU1ER1BVX1RJTElOR19B UlJBWV9NT0RFX01BU0sJCQkweGYKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=