From: Monk Liu Subject: [PATCH libdrm 2/2] drm: merge and cleanup amdgpu_bo_free Date: Tue, 8 Aug 2017 15:34:21 +0800 Message-ID: <1502177661-1430-2-git-send-email-Monk.Liu@amd.com> References: <1502177661-1430-1-git-send-email-Monk.Liu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1502177661-1430-1-git-send-email-Monk.Liu-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: Monk Liu RnJvbTogTW9uayBMaXUgPG1vbmsubGl1QGFtZC5jb20+CgpzaW5jZSBib19yZWZlcmVuY2UgYW5k IGJvX2ludGVybmFsX2ZyZWUgYXJlCmFsbCBvbmx5IHVzZWQgYnkgYm9fZnJlZSwgc28gd2UganVz dCBtZXJnZSB0aGVtCnRvZ2V0aGVyCgpDaGFuZ2UtSWQ6IEk3MmViYzljOGJjZmNkMjNmNGQ1MmEx Mzg1ZGI4NzFhOTVjMjM4NTllClNpZ25lZC1vZmYtYnk6IE1vbmsgTGl1IDxtb25rLmxpdUBhbWQu Y29tPgotLS0KIGFtZGdwdS9hbWRncHVfYm8uYyAgICAgICB8IDUyICsrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogYW1kZ3B1L2FtZGdwdV9pbnRlcm5hbC5o IHwgMzMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI5 IGluc2VydGlvbnMoKyksIDU2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FtZGdwdS9hbWRn cHVfYm8uYyBiL2FtZGdwdS9hbWRncHVfYm8uYwppbmRleCA4MmYzOGMwLi45MDE2NzNhIDEwMDY0 NAotLS0gYS9hbWRncHUvYW1kZ3B1X2JvLmMKKysrIGIvYW1kZ3B1L2FtZGdwdV9iby5jCkBAIC01 MiwyNyArNTIsNiBAQCBzdGF0aWMgdm9pZCBhbWRncHVfY2xvc2Vfa21zX2hhbmRsZShhbWRncHVf ZGV2aWNlX2hhbmRsZSBkZXYsCiAJZHJtSW9jdGwoZGV2LT5mZCwgRFJNX0lPQ1RMX0dFTV9DTE9T RSwgJmFyZ3MpOwogfQogCi12b2lkIGFtZGdwdV9ib19mcmVlX2ludGVybmFsKGFtZGdwdV9ib19o YW5kbGUgYm8pCi17Ci0JLyogUmVtb3ZlIHRoZSBidWZmZXIgZnJvbSB0aGUgaGFzaCB0YWJsZXMu ICovCi0JdXRpbF9oYXNoX3RhYmxlX3JlbW92ZShiby0+ZGV2LT5ib19oYW5kbGVzLAotCQkJICAg ICAgICh2b2lkKikodWludHB0cl90KWJvLT5oYW5kbGUpOwotCWlmIChiby0+ZmxpbmtfbmFtZSkg ewotCQl1dGlsX2hhc2hfdGFibGVfcmVtb3ZlKGJvLT5kZXYtPmJvX2ZsaW5rX25hbWVzLAotCQkJ CSAgICAgICAodm9pZCopKHVpbnRwdHJfdCliby0+ZmxpbmtfbmFtZSk7Ci0JfQotCi0JLyogUmVs ZWFzZSBDUFUgYWNjZXNzLiAqLwotCWlmIChiby0+Y3B1X21hcF9jb3VudCA+IDApIHsKLQkJYm8t PmNwdV9tYXBfY291bnQgPSAxOwotCQlhbWRncHVfYm9fY3B1X3VubWFwKGJvKTsKLQl9Ci0KLQlh bWRncHVfY2xvc2Vfa21zX2hhbmRsZShiby0+ZGV2LCBiby0+aGFuZGxlKTsKLQlwdGhyZWFkX211 dGV4X2Rlc3Ryb3koJmJvLT5jcHVfYWNjZXNzX211dGV4KTsKLQlmcmVlKGJvKTsKLX0KLQogaW50 IGFtZGdwdV9ib19hbGxvYyhhbWRncHVfZGV2aWNlX2hhbmRsZSBkZXYsCiAJCSAgICBzdHJ1Y3Qg YW1kZ3B1X2JvX2FsbG9jX3JlcXVlc3QgKmFsbG9jX2J1ZmZlciwKIAkJICAgIGFtZGdwdV9ib19o YW5kbGUgKmJ1Zl9oYW5kbGUpCkBAIC00MTUsOCArMzk0LDM1IEBAIGludCBhbWRncHVfYm9faW1w b3J0KGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwKIAogaW50IGFtZGdwdV9ib19mcmVlKGFtZGdw dV9ib19oYW5kbGUgYnVmX2hhbmRsZSkKIHsKLQkvKiBKdXN0IGRyb3AgdGhlIHJlZmVyZW5jZS4g Ki8KLQlhbWRncHVfYm9fcmVmZXJlbmNlKCZidWZfaGFuZGxlLCBOVUxMKTsKKwlzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqZGV2OworCXN0cnVjdCBhbWRncHVfYm8gKmJvID0gYnVmX2hhbmRsZTsKKwor CWFzc2VydChibyAhPSBOVUxMKTsKKwlkZXYgPSBiby0+ZGV2OworCXB0aHJlYWRfbXV0ZXhfbG9j aygmZGV2LT5ib190YWJsZV9tdXRleCk7CisKKwlpZiAodXBkYXRlX3JlZmVyZW5jZXMoJmJvLT5y ZWZjb3VudCwgTlVMTCkpIHsKKwkJLyogUmVtb3ZlIHRoZSBidWZmZXIgZnJvbSB0aGUgaGFzaCB0 YWJsZXMuICovCisJCXV0aWxfaGFzaF90YWJsZV9yZW1vdmUoZGV2LT5ib19oYW5kbGVzLAorCQkJ CQkodm9pZCopKHVpbnRwdHJfdCliby0+aGFuZGxlKTsKKworCQlpZiAoYm8tPmZsaW5rX25hbWUp IHsKKwkJCXV0aWxfaGFzaF90YWJsZV9yZW1vdmUoZGV2LT5ib19mbGlua19uYW1lcywKKwkJCQkJ CSh2b2lkKikodWludHB0cl90KWJvLT5mbGlua19uYW1lKTsKKwkJfQorCisJCS8qIFJlbGVhc2Ug Q1BVIGFjY2Vzcy4gKi8KKwkJaWYgKGJvLT5jcHVfbWFwX2NvdW50ID4gMCkgeworCQkJYm8tPmNw dV9tYXBfY291bnQgPSAxOworCQkJYW1kZ3B1X2JvX2NwdV91bm1hcChibyk7CisJCX0KKworCQlh bWRncHVfY2xvc2Vfa21zX2hhbmRsZShkZXYsIGJvLT5oYW5kbGUpOworCQlwdGhyZWFkX211dGV4 X2Rlc3Ryb3koJmJvLT5jcHVfYWNjZXNzX211dGV4KTsKKwkJZnJlZShibyk7CisJfQorCisJcHRo cmVhZF9tdXRleF91bmxvY2soJmRldi0+Ym9fdGFibGVfbXV0ZXgpOwogCXJldHVybiAwOwogfQog CmRpZmYgLS1naXQgYS9hbWRncHUvYW1kZ3B1X2ludGVybmFsLmggYi9hbWRncHUvYW1kZ3B1X2lu dGVybmFsLmgKaW5kZXggNzlkYTBlNy4uYTZiZjgzMSAxMDA2NDQKLS0tIGEvYW1kZ3B1L2FtZGdw dV9pbnRlcm5hbC5oCisrKyBiL2FtZGdwdS9hbWRncHVfaW50ZXJuYWwuaApAQCAtMTMzLDggKzEz Myw2IEBAIHN0cnVjdCBhbWRncHVfc2VtYXBob3JlIHsKIAogdm9pZCBhbWRncHVfZGV2aWNlX2Zy ZWVfaW50ZXJuYWwoYW1kZ3B1X2RldmljZV9oYW5kbGUgZGV2KTsKIAotdm9pZCBhbWRncHVfYm9f ZnJlZV9pbnRlcm5hbChhbWRncHVfYm9faGFuZGxlIGJvKTsKLQogdm9pZCBhbWRncHVfdmFtZ3Jf aW5pdChzdHJ1Y3QgYW1kZ3B1X2JvX3ZhX21nciAqbWdyLCB1aW50NjRfdCBzdGFydCwKIAkJICAg ICAgIHVpbnQ2NF90IG1heCwgdWludDY0X3QgYWxpZ25tZW50KTsKIApAQCAtMTc3LDM3ICsxNzUs NiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgdXBkYXRlX3JlZmVyZW5jZXMoYXRvbWljX3QgKmRzdCwg YXRvbWljX3QgKnNyYykKIH0KIAogLyoqCi0gKiBBc3NpZ25tZW50IGJldHdlZW4gdHdvIGFtZGdw dV9ibyBwb2ludGVycyB3aXRoIHJlZmVyZW5jZSBjb3VudGluZy4KLSAqCi0gKiBVc2FnZToKLSAq ICAgIHN0cnVjdCBhbWRncHVfYm8gKmRzdCA9IC4uLiAsICpzcmMgPSAuLi47Ci0gKgotICogICAg ZHN0ID0gc3JjOwotICogICAgLy8gTm8gcmVmZXJlbmNlIGNvdW50aW5nLiBPbmx5IHVzZSB0aGlz IHdoZW4geW91IG5lZWQgdG8gbW92ZQotICogICAgLy8gYSByZWZlcmVuY2UgZnJvbSBvbmUgcG9p bnRlciB0byBhbm90aGVyLgotICoKLSAqICAgIGFtZGdwdV9ib19yZWZlcmVuY2UoJmRzdCwgc3Jj KTsKLSAqICAgIC8vIFJlZmVyZW5jZSBjb3VudGVycyBhcmUgdXBkYXRlZC4gZHN0IGlzIGRlY3Jl bWVudGVkIGFuZCBzcmMgaXMKLSAqICAgIC8vIGluY3JlbWVudGVkLiBkc3QgaXMgZnJlZWQgaWYg aXRzIHJlZmVyZW5jZSBjb3VudGVyIGlzIDAuCi0gKi8KLXN0YXRpYyBpbmxpbmUgdm9pZCBhbWRn cHVfYm9fcmVmZXJlbmNlKHN0cnVjdCBhbWRncHVfYm8gKipkc3QsCi0JCQkJCXN0cnVjdCBhbWRn cHVfYm8gKnNyYykKLXsKLQlwdGhyZWFkX211dGV4X3QgKm1sb2NrOwotCXN0cnVjdCBhbWRncHVf Ym8qIGJvID0gKmRzdDsKLQotCWFzc2VydChibyAhPSBOVUxMKTsKLQltbG9jayA9ICZiby0+ZGV2 LT5ib190YWJsZV9tdXRleDsKLQlwdGhyZWFkX211dGV4X2xvY2sobWxvY2spOwotCi0JaWYgKHVw ZGF0ZV9yZWZlcmVuY2VzKCZiby0+cmVmY291bnQsIHNyYz8mc3JjLT5yZWZjb3VudDpOVUxMKSkK LQkJYW1kZ3B1X2JvX2ZyZWVfaW50ZXJuYWwoYm8pOwotCi0JcHRocmVhZF9tdXRleF91bmxvY2so bWxvY2spOwotCSpkc3QgPSBzcmM7Ci19Ci0KLS8qKgogICogQXNzaWdubWVudCBiZXR3ZWVuIHR3 byBhbWRncHVfZGV2aWNlIHBvaW50ZXJzIHdpdGggcmVmZXJlbmNlIGNvdW50aW5nLgogICoKICAq IFVzYWdlOgotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eAo=