From: Monk Liu Subject: [PATCH] amdgpu:fix incorrect use on the remap_mutex Date: Mon, 17 Apr 2017 14:56:47 +0800 Message-ID: <1492412207-27659-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: 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 dGhpcyBwYXRjaCBmaXhlZCBhIG11bHRpLXRocmVhZCByYWNlIGlzc3VlIGJ5IGV4cGFuZCB0aGUK cHJvdGVjdGlvbiByYW5nZSBvZiByZW1hcF9tdXRleCB0byB0aGUgd2hvbGUgTElTVCB3YWxrIHRo cm91Z2gsCmJ5IHRoaXMgZml4IHRoZSBDVFMgdGVzdDoKImRFUVAtVksuYXBpLm9iamVjdF9tYW5h Z2VtZW50Lm11bHRpdGhyZWFkZWRfcGVyX3RocmVhZF9kZXZpY2UuZGV2aWNlX21lbW9yeV9zbWFs IgpjYW4gYWx3YXlzIHBhc3Mgbm93LApQcmV2aW91c2x5IGl0IGhhcyAxLzE1IGNoYW5jZSB0byBm YWlsIHdpdGggYSBoaWdoIHBlcmZvcm1hbmNlIEk3IENQVQp1bmRlciB2aXJ0dWFsaXphdGlvbiBl bnZyaW9ubWVudC4KCkNoYW5nZS1JZDogSWY4OGI5ZDM1ZTc5ZmUxY2I2ZWIwZTMyYzY4MGJjNDk5 NmM3OTE1YmMKU2lnbmVkLW9mZi1ieTogTW9uayBMaXUgPE1vbmsuTGl1QGFtZC5jb20+Ci0tLQog YW1kZ3B1L2FtZGdwdV9iby5jICAgIHwgMjkgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0K IGFtZGdwdS9hbWRncHVfdmFtZ3IuYyB8ICA1ICsrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGlu c2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FtZGdwdS9hbWRncHVf Ym8uYyBiL2FtZGdwdS9hbWRncHVfYm8uYwppbmRleCAzM2NiNzA1Li44OTYwNzI4IDEwMDY0NAot LS0gYS9hbWRncHUvYW1kZ3B1X2JvLmMKKysrIGIvYW1kZ3B1L2FtZGdwdV9iby5jCkBAIC05ODks NiArOTg5LDggQEAgaW50IGFtZGdwdV9ib192YV9vcF9yZWZjb3VudGVkKGFtZGdwdV9kZXZpY2Vf aGFuZGxlIGRldiwKIAkJCXJldHVybiAtRUlOVkFMOwogCX0KIAorCXB0aHJlYWRfbXV0ZXhfbG9j aygmZGV2LT5yZW1hcF9tdXRleCk7CisKIAkvKiBmaW5kIHRoZSBwcmV2aW91cyBtYXBwZWQgdmEg b2JqZWN0IGFuZCBpdHMgYm8gYW5kIHVubWFwIGl0Ki8KIAlpZiAob3BzID09IEFNREdQVV9WQV9P UF9NQVApIHsKIAkJTElTVF9GT1JfRUFDSF9FTlRSWSh2YWhhbmRsZSwgJmRldi0+cmVtYXBfbGlz dCwgbGlzdCkgewpAQCAtOTk4LDE1ICsxMDAwLDE1IEBAIGludCBhbWRncHVfYm9fdmFfb3BfcmVm Y291bnRlZChhbWRncHVfZGV2aWNlX2hhbmRsZSBkZXYsCiAJCQkJLyogdGhlIG92ZXJsYXAgdmEg bWFwcGluZyB3aGljaCBuZWVkIHRvIGJlIHVubWFwcGVkIGZpcnN0ICovCiAJCQkJdmFvID0gdmFo YW5kbGU7CiAJCQkJciA9IGFtZGdwdV9ib192YV9vcCh2YW8tPmJvLCB2YW8tPm9mZnNldCwgdmFv LT5zaXplLCB2YW8tPmFkZHJlc3MsIGZsYWdzLCBBTURHUFVfVkFfT1BfVU5NQVApOwotCQkJCWlm IChyKQorCQkJCWlmIChyKSB7CisJCQkJCXB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZkZXYtPnJlbWFw X211dGV4KTsKIAkJCQkJcmV0dXJuIC1FSU5WQUw7CisJCQkJfQogCiAJCQkJLyogSnVzdCBkcm9w IHRoZSByZWZlcmVuY2UuICovCiAJCQkJYW1kZ3B1X2JvX3JlZmVyZW5jZSgmdmFvLT5ibywgTlVM TCk7CiAJCQkJLyogcmVtb3ZlIHRoZSByZW1hcCBmcm9tIGxpc3QgKi8KLQkJCQlwdGhyZWFkX211 dGV4X2xvY2soJmRldi0+cmVtYXBfbXV0ZXgpOwogCQkJCWxpc3RfZGVsKCZ2YW8tPmxpc3QpOwot CQkJCXB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZkZXYtPnJlbWFwX211dGV4KTsKIAkJCQlmcmVlKHZh byk7CiAJCQl9CiAJCX0KQEAgLTEwMjEsMTIgKzEwMjMsMTggQEAgaW50IGFtZGdwdV9ib192YV9v cF9yZWZjb3VudGVkKGFtZGdwdV9kZXZpY2VfaGFuZGxlIGRldiwKIAkJCX0KIAkJfQogCQlpZiAo dmFvKSB7Ci0JCQlpZiAoYm8gJiYgKGJvICE9IHZhby0+Ym8pKQorCQkJaWYgKGJvICYmIChibyAh PSB2YW8tPmJvKSkgeworCQkJCXB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZkZXYtPnJlbWFwX211dGV4 KTsKIAkJCQlyZXR1cm4gLUVJTlZBTDsKLQkJfSBlbHNlCisJCQl9CisJCX0gZWxzZSB7CisJCQlw dGhyZWFkX211dGV4X3VubG9jaygmZGV2LT5yZW1hcF9tdXRleCk7CiAJCQlyZXR1cm4gLUVJTlZB TDsKLQl9IGVsc2UKKwkJfQorCX0gZWxzZSB7CisJCXB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZkZXYt PnJlbWFwX211dGV4KTsKIAkJcmV0dXJuIC1FSU5WQUw7CisJfQogCiAJLyogd2Ugb25seSBhbGxv dyBudWxsIGJvIGZvciB1bm1hcCBvcGVyYXRpb24gKi8KIAlpZiAoIWJvKQpAQCAtMTAzOSwyNiAr MTA0NywyNSBAQCBpbnQgYW1kZ3B1X2JvX3ZhX29wX3JlZmNvdW50ZWQoYW1kZ3B1X2RldmljZV9o YW5kbGUgZGV2LAogCQkJLyogSnVzdCBkcm9wIHRoZSByZWZlcmVuY2UuICovCiAJCQlhbWRncHVf Ym9fcmVmZXJlbmNlKCZibywgTlVMTCk7CiAJCQkvKiByZW1vdmUgdGhlIHJlbWFwIGZyb20gbGlz dCAqLwotCQkJcHRocmVhZF9tdXRleF9sb2NrKCZkZXYtPnJlbWFwX211dGV4KTsKIAkJCWxpc3Rf ZGVsKCZ2YW8tPmxpc3QpOwotCQkJcHRocmVhZF9tdXRleF91bmxvY2soJmRldi0+cmVtYXBfbXV0 ZXgpOwogCQkJZnJlZSh2YW8pOwogCQl9IGVsc2UgaWYgKG9wcyA9PSBBTURHUFVfVkFfT1BfTUFQ KSB7CiAJCQkvKiBidW1wIHRoZSByZWZjb3VudCBvZiBibyEgKi8KIAkJCWF0b21pY19pbmMoJmJv LT5yZWZjb3VudCk7CiAJCQkvKiBhZGQgdGhlIHJlbWFwIHRvIGxpc3QgYW5kIHZhbyBzaG91bGQg YmUgTlVMTCBmb3IgbWFwICovCiAJCQl2YW8gPSAoc3RydWN0IGFtZGdwdV92YV9yZW1hcCopY2Fs bG9jKDEsIHNpemVvZihzdHJ1Y3QgYW1kZ3B1X3ZhX3JlbWFwKSk7Ci0JCQlpZiAoIXZhbykKKwkJ CWlmICghdmFvKSB7CisJCQkJcHRocmVhZF9tdXRleF91bmxvY2soJmRldi0+cmVtYXBfbXV0ZXgp OwogCQkJCXJldHVybiAtRU5PTUVNOworCQkJfQogCQkJdmFvLT5hZGRyZXNzID0gYWRkcjsKIAkJ CXZhby0+c2l6ZSA9IHNpemU7CiAJCQl2YW8tPm9mZnNldCA9IG9mZnNldDsKIAkJCXZhby0+Ym8g PSBibzsKLQkJCXB0aHJlYWRfbXV0ZXhfbG9jaygmZGV2LT5yZW1hcF9tdXRleCk7CiAJCQlsaXN0 X2FkZCgmdmFvLT5saXN0LCAmZGV2LT5yZW1hcF9saXN0KTsKLQkJCXB0aHJlYWRfbXV0ZXhfdW5s b2NrKCZkZXYtPnJlbWFwX211dGV4KTsKIAkJfQogCX0KKwlwdGhyZWFkX211dGV4X3VubG9jaygm ZGV2LT5yZW1hcF9tdXRleCk7CiAJcmV0dXJuIHI7CiB9CiAKZGlmZiAtLWdpdCBhL2FtZGdwdS9h bWRncHVfdmFtZ3IuYyBiL2FtZGdwdS9hbWRncHVfdmFtZ3IuYwppbmRleCBiM2Y1Mzk3Li5jNWE3 ZjQxIDEwMDY0NAotLS0gYS9hbWRncHUvYW1kZ3B1X3ZhbWdyLmMKKysrIGIvYW1kZ3B1L2FtZGdw dV92YW1nci5jCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiYW1kZ3B1X2RybS5oIgogI2lu Y2x1ZGUgImFtZGdwdV9pbnRlcm5hbC5oIgogI2luY2x1ZGUgInV0aWxfbWF0aC5oIgorI2luY2x1 ZGUgInN0ZGlvLmgiCiAKIC8qIERldmljZXMgc2hhcmUgU1ZNIHJhbmdlLiBTbyBhIGdsb2JhbCBT Vk0gVkFNIG1hbmFnZXIgaXMgbmVlZGVkLiAqLwogc3RhdGljIHN0cnVjdCBhbWRncHVfYm9fdmFf bWdyIHZhbWdyX3N2bTsKQEAgLTQ4OCw2ICs0ODksNyBAQCBpbnQgYW1kZ3B1X3ZhX3JhbmdlX2Zy ZWUoYW1kZ3B1X3ZhX2hhbmRsZSB2YV9yYW5nZV9oYW5kbGUpCiAJYWRkcmVzcyA9IHZhX3Jhbmdl X2hhbmRsZS0+YWRkcmVzczsKIAlzaXplICAgID0gdmFfcmFuZ2VfaGFuZGxlLT5zaXplOwogCisJ cHRocmVhZF9tdXRleF9sb2NrKCZkZXYtPnJlbWFwX211dGV4KTsKIAkvKiBjbGVhbiB1cCBwcmV2 aW91cyBtYXBwaW5nIGlmIGl0IGlzIHVzZWQgZm9yIHZpcnR1YWwgYWxsb2NhdGlvbiAqLwogCUxJ U1RfRk9SX0VBQ0hfRU5UUlkodmFoYW5kbGUsICZkZXYtPnJlbWFwX2xpc3QsIGxpc3QpIHsKIAkJ LyogY2hlY2sgd2hldGhlciB0aGUgcmVtYXAgbGlzdCBhbHJhZWR5IGhhdmUgdmEgdGhhdCBvdmVy bGFwIHdpdGggY3VycmVudCByZXF1ZXN0ICovCkBAIC01MDAsMTIgKzUwMiwxMSBAQCBpbnQgYW1k Z3B1X3ZhX3JhbmdlX2ZyZWUoYW1kZ3B1X3ZhX2hhbmRsZSB2YV9yYW5nZV9oYW5kbGUpCiAJCQkv KiBKdXN0IGRyb3AgdGhlIHJlZmVyZW5jZS4gKi8KIAkJCWFtZGdwdV9ib19yZWZlcmVuY2UoJnZh aGFuZGxlLT5ibywgTlVMTCk7CiAJCQkvKiByZW1vdmUgdGhlIHJlbWFwIGZyb20gbGlzdCAqLwot CQkJcHRocmVhZF9tdXRleF9sb2NrKCZkZXYtPnJlbWFwX211dGV4KTsKIAkJCWxpc3RfZGVsKCZ2 YWhhbmRsZS0+bGlzdCk7Ci0JCQlwdGhyZWFkX211dGV4X3VubG9jaygmZGV2LT5yZW1hcF9tdXRl eCk7CiAJCQlmcmVlKHZhaGFuZGxlKTsKIAkJfQogCX0KKwlwdGhyZWFkX211dGV4X3VubG9jaygm ZGV2LT5yZW1hcF9tdXRleCk7CiAKIAlhbWRncHVfdmFtZ3JfZnJlZV92YSh2YV9yYW5nZV9oYW5k bGUtPnZhbWdyLAogCQkJdmFfcmFuZ2VfaGFuZGxlLT5hZGRyZXNzLAotLSAKMi43LjQKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGlu ZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=