From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chunming Zhou Subject: [PATCH 2/6] drm/amdgpu: clean up for amdgpu ctx Date: Thu, 18 Aug 2016 15:50:14 +0800 Message-ID: <1471506618-29849-3-git-send-email-David1.Zhou@amd.com> References: <1471506618-29849-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: In-Reply-To: <1471506618-29849-1-git-send-email-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: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Chunming Zhou , David.Mao-5C7GfCeVMHo@public.gmane.org Tm8gdXNlZCBtb3JlLgoKQ2hhbmdlLUlkOiBJNTRkZGQzZjQ5MjM1NDg2M2EwNTVhZDIzNTZiY2Nj Y2M3NDlmZjQyMApTaWduZWQtb2ZmLWJ5OiBDaHVubWluZyBaaG91IDxEYXZpZDEuWmhvdUBhbWQu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAgICB8IDEzICst LS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jICB8ICA3 ICsrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jdHguYyB8IDI3ICsr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X2ttcy5jIHwgIDQgLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA0 MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHUuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCmluZGV4IGI2NTUy ZWQuLjA0OWUxZDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC0xMDMyLDE0 ICsxMDMyLDcgQEAgc3RydWN0IGFtZGdwdV9jdHggewogCXN0cnVjdCBhbWRncHVfY3R4X3JpbmcJ cmluZ3NbQU1ER1BVX01BWF9SSU5HU107CiB9OwogCi1zdHJ1Y3QgYW1kZ3B1X2N0eF9tZ3Igewot CXN0cnVjdCBhbWRncHVfZGV2aWNlCSphZGV2OwotCXN0cnVjdCBtdXRleAkJbG9jazsKLQkvKiBw cm90ZWN0ZWQgYnkgbG9jayAqLwotCXN0cnVjdCBpZHIJCWN0eF9oYW5kbGVzOwotfTsKLQotc3Ry dWN0IGFtZGdwdV9jdHggKmFtZGdwdV9jdHhfZ2V0KHN0cnVjdCBhbWRncHVfZnByaXYgKmZwcml2 LCB1aW50MzJfdCBpZCk7CitzdHJ1Y3QgYW1kZ3B1X2N0eCAqYW1kZ3B1X2N0eF9nZXQodWludDMy X3QgaWQpOwogaW50IGFtZGdwdV9jdHhfcHV0KHN0cnVjdCBhbWRncHVfY3R4ICpjdHgpOwogCiB1 aW50NjRfdCBhbWRncHVfY3R4X2FkZF9mZW5jZShzdHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4LCBzdHJ1 Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCkBAIC0xMDUwLDkgKzEwNDMsNiBAQCBzdHJ1Y3QgZmVuY2Ug KmFtZGdwdV9jdHhfZ2V0X2ZlbmNlKHN0cnVjdCBhbWRncHVfY3R4ICpjdHgsCiBpbnQgYW1kZ3B1 X2N0eF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkgICAgIHN0 cnVjdCBkcm1fZmlsZSAqZmlscCk7CiAKLXZvaWQgYW1kZ3B1X2N0eF9tZ3JfaW5pdChzdHJ1Y3Qg YW1kZ3B1X2N0eF9tZ3IgKm1ncik7Ci12b2lkIGFtZGdwdV9jdHhfbWdyX2Zpbmkoc3RydWN0IGFt ZGdwdV9jdHhfbWdyICptZ3IpOwotCiAvKgogICogZmlsZSBwcml2YXRlIHN0cnVjdHVyZQogICov CkBAIC0xMDYxLDcgKzEwNTEsNiBAQCBzdHJ1Y3QgYW1kZ3B1X2Zwcml2IHsKIAlzdHJ1Y3QgYW1k Z3B1X3ZtCXZtOwogCXN0cnVjdCBtdXRleAkJYm9fbGlzdF9sb2NrOwogCXN0cnVjdCBpZHIJCWJv X2xpc3RfaGFuZGxlczsKLQlzdHJ1Y3QgYW1kZ3B1X2N0eF9tZ3IJY3R4X21ncjsKIH07CiAKIC8q CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCmluZGV4IDM0MzQwOTguLmNmYWU2 NWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCkBAIC0xMzMsNyArMTMz LDcgQEAgaW50IGFtZGdwdV9jc19wYXJzZXJfaW5pdChzdHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAq cCwgdm9pZCAqZGF0YSkKIAlpZiAoIWNodW5rX2FycmF5KQogCQlyZXR1cm4gLUVOT01FTTsKIAot CXAtPmN0eCA9IGFtZGdwdV9jdHhfZ2V0KGZwcml2LCBjcy0+aW4uY3R4X2lkKTsKKwlwLT5jdHgg PSBhbWRncHVfY3R4X2dldChjcy0+aW4uY3R4X2lkKTsKIAlpZiAoIXAtPmN0eCkgewogCQlyZXQg PSAtRUlOVkFMOwogCQlnb3RvIGZyZWVfY2h1bms7CkBAIC04MDQsNyArODA0LDYgQEAgc3RhdGlj IGludCBhbWRncHVfY3NfaWJfZmlsbChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIHN0YXRp YyBpbnQgYW1kZ3B1X2NzX2RlcGVuZGVuY2llcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwK IAkJCQkgIHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwKQogewotCXN0cnVjdCBhbWRncHVfZnBy aXYgKmZwcml2ID0gcC0+ZmlscC0+ZHJpdmVyX3ByaXY7CiAJaW50IGksIGosIHI7CiAKIAlmb3Ig KGkgPSAwOyBpIDwgcC0+bmNodW5rczsgKytpKSB7CkBAIC04MzIsNyArODMxLDcgQEAgc3RhdGlj IGludCBhbWRncHVfY3NfZGVwZW5kZW5jaWVzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog CQkJaWYgKHIpCiAJCQkJcmV0dXJuIHI7CiAKLQkJCWN0eCA9IGFtZGdwdV9jdHhfZ2V0KGZwcml2 LCBkZXBzW2pdLmN0eF9pZCk7CisJCQljdHggPSBhbWRncHVfY3R4X2dldChkZXBzW2pdLmN0eF9p ZCk7CiAJCQlpZiAoY3R4ID09IE5VTEwpCiAJCQkJcmV0dXJuIC1FSU5WQUw7CiAKQEAgLTk2Nyw3 ICs5NjYsNyBAQCBpbnQgYW1kZ3B1X2NzX3dhaXRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKLQljdHggPSBhbWRncHVfY3R4 X2dldChmaWxwLT5kcml2ZXJfcHJpdiwgd2FpdC0+aW4uY3R4X2lkKTsKKwljdHggPSBhbWRncHVf Y3R4X2dldCh3YWl0LT5pbi5jdHhfaWQpOwogCWlmIChjdHggPT0gTlVMTCkKIAkJcmV0dXJuIC1F SU5WQUw7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9j dHguYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jdHguYwppbmRleCBiZDc0 YTU3Li45NjNhMTRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfY3R4LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2N0eC5jCkBA IC04Nyw3ICs4Nyw2IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9jdHhfZmluaShzdHJ1Y3QgYW1kZ3B1 X2N0eCAqY3R4KQogfQogCiBzdGF0aWMgaW50IGFtZGdwdV9jdHhfYWxsb2Moc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYsCi0JCQkgICAgc3RydWN0IGFtZGdwdV9mcHJpdiAqZnByaXYsCiAJCQkg ICAgdWludDMyX3QgKmlkKQogewogCXN0cnVjdCBhbWRncHVfY3R4ICpjdHg7CkBAIC0xMjYsNyAr MTI1LDcgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2N0eF9kb19yZWxlYXNlKHN0cnVjdCBrcmVmICpy ZWYpCiAJa2ZyZWUoY3R4KTsKIH0KIAotc3RhdGljIGludCBhbWRncHVfY3R4X2ZyZWUoc3RydWN0 IGFtZGdwdV9mcHJpdiAqZnByaXYsIHVpbnQzMl90IGlkKQorc3RhdGljIGludCBhbWRncHVfY3R4 X2ZyZWUodWludDMyX3QgaWQpCiB7CiAJc3RydWN0IGFtZGdwdV9jdHggKmN0eDsKIApAQCAtMTQz LDE1ICsxNDIsMTIgQEAgc3RhdGljIGludCBhbWRncHVfY3R4X2ZyZWUoc3RydWN0IGFtZGdwdV9m cHJpdiAqZnByaXYsIHVpbnQzMl90IGlkKQogfQogCiBzdGF0aWMgaW50IGFtZGdwdV9jdHhfcXVl cnkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0JCQkgICAgc3RydWN0IGFtZGdwdV9mcHJp diAqZnByaXYsIHVpbnQzMl90IGlkLAorCQkJICAgIHVpbnQzMl90IGlkLAogCQkJICAgIHVuaW9u IGRybV9hbWRncHVfY3R4X291dCAqb3V0KQogewogCXN0cnVjdCBhbWRncHVfY3R4ICpjdHg7CiAJ dW5zaWduZWQgcmVzZXRfY291bnRlcjsKIAotCWlmICghZnByaXYpCi0JCXJldHVybiAtRUlOVkFM OwotCiAJbXV0ZXhfbG9jaygmYW1kZ3B1X2N0eF9sb2NrKTsKIAljdHggPSBpZHJfZmluZCgmYW1k Z3B1X2N0eF9pZHIsIGlkKTsKIAlpZiAoIWN0eCkgewpAQCAtMTg0LDIxICsxODAsMjAgQEAgaW50 IGFtZGdwdV9jdHhfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAog CXVuaW9uIGRybV9hbWRncHVfY3R4ICphcmdzID0gZGF0YTsKIAlzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGFtZGdwdV9mcHJpdiAqZnByaXYg PSBmaWxwLT5kcml2ZXJfcHJpdjsKIAogCXIgPSAwOwogCWlkID0gYXJncy0+aW4uY3R4X2lkOwog CiAJc3dpdGNoIChhcmdzLT5pbi5vcCkgewogCWNhc2UgQU1ER1BVX0NUWF9PUF9BTExPQ19DVFg6 Ci0JCXIgPSBhbWRncHVfY3R4X2FsbG9jKGFkZXYsIGZwcml2LCAmaWQpOworCQlyID0gYW1kZ3B1 X2N0eF9hbGxvYyhhZGV2LCAmaWQpOwogCQlhcmdzLT5vdXQuYWxsb2MuY3R4X2lkID0gaWQ7CiAJ CWJyZWFrOwogCWNhc2UgQU1ER1BVX0NUWF9PUF9GUkVFX0NUWDoKLQkJciA9IGFtZGdwdV9jdHhf ZnJlZShmcHJpdiwgaWQpOworCQlyID0gYW1kZ3B1X2N0eF9mcmVlKGlkKTsKIAkJYnJlYWs7CiAJ Y2FzZSBBTURHUFVfQ1RYX09QX1FVRVJZX1NUQVRFOgotCQlyID0gYW1kZ3B1X2N0eF9xdWVyeShh ZGV2LCBmcHJpdiwgaWQsICZhcmdzLT5vdXQpOworCQlyID0gYW1kZ3B1X2N0eF9xdWVyeShhZGV2 LCBpZCwgJmFyZ3MtPm91dCk7CiAJCWJyZWFrOwogCWRlZmF1bHQ6CiAJCXJldHVybiAtRUlOVkFM OwpAQCAtMjA3LDEzICsyMDIsMTAgQEAgaW50IGFtZGdwdV9jdHhfaW9jdGwoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlyZXR1cm4gcjsKIH0KIAotc3RydWN0IGFtZGdwdV9j dHggKmFtZGdwdV9jdHhfZ2V0KHN0cnVjdCBhbWRncHVfZnByaXYgKmZwcml2LCB1aW50MzJfdCBp ZCkKK3N0cnVjdCBhbWRncHVfY3R4ICphbWRncHVfY3R4X2dldCh1aW50MzJfdCBpZCkKIHsKIAlz dHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4OwogCi0JaWYgKCFmcHJpdikKLQkJcmV0dXJuIE5VTEw7Ci0K IAltdXRleF9sb2NrKCZhbWRncHVfY3R4X2xvY2spOwogCWN0eCA9IGlkcl9maW5kKCZhbWRncHVf Y3R4X2lkciwgaWQpOwogCWlmIChjdHgpCkBAIC0yODUsMTAgKzI3NywzIEBAIHN0cnVjdCBmZW5j ZSAqYW1kZ3B1X2N0eF9nZXRfZmVuY2Uoc3RydWN0IGFtZGdwdV9jdHggKmN0eCwKIAlyZXR1cm4g ZmVuY2U7CiB9CiAKLXZvaWQgYW1kZ3B1X2N0eF9tZ3JfaW5pdChzdHJ1Y3QgYW1kZ3B1X2N0eF9t Z3IgKm1ncikKLXsKLX0KLQotdm9pZCBhbWRncHVfY3R4X21ncl9maW5pKHN0cnVjdCBhbWRncHVf Y3R4X21nciAqbWdyKQotewotfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5j CmluZGV4IDBmYjU0ODguLjljZWY4M2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9rbXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfa21zLmMKQEAgLTU0Myw4ICs1NDMsNiBAQCBpbnQgYW1kZ3B1X2RyaXZlcl9vcGVuX2ttcyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdikKIAltdXRl eF9pbml0KCZmcHJpdi0+Ym9fbGlzdF9sb2NrKTsKIAlpZHJfaW5pdCgmZnByaXYtPmJvX2xpc3Rf aGFuZGxlcyk7CiAKLQlhbWRncHVfY3R4X21ncl9pbml0KCZmcHJpdi0+Y3R4X21ncik7Ci0KIAlm aWxlX3ByaXYtPmRyaXZlcl9wcml2ID0gZnByaXY7CiAKIAlwbV9ydW50aW1lX21hcmtfbGFzdF9i dXN5KGRldi0+ZGV2KTsKQEAgLTU3Niw4ICs1NzQsNiBAQCB2b2lkIGFtZGdwdV9kcml2ZXJfcG9z dGNsb3NlX2ttcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmICghZnByaXYpCiAJCXJldHVy bjsKIAotCWFtZGdwdV9jdHhfbWdyX2ZpbmkoJmZwcml2LT5jdHhfbWdyKTsKLQogCWFtZGdwdV91 dmRfZnJlZV9oYW5kbGVzKGFkZXYsIGZpbGVfcHJpdik7CiAJYW1kZ3B1X3ZjZV9mcmVlX2hhbmRs ZXMoYWRldiwgZmlsZV9wcml2KTsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vYW1kLWdmeAo=