From: Roger.He Subject: [PATCH] drm/amdgpu: extend lock range for race condition when gpu reset Date: Fri, 5 May 2017 15:22:42 +0800 Message-ID: <1493968962-10463-1-git-send-email-Hongbo.He@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: "Roger.He" dG8gY292ZXIgYmVsb3cgY2FzZToKMS4gQSB0YXNrIGdhcnQgYmluZC91bmJpbmQgYnV0IG5vdCBh ZGQgdG8gYWRldi0+Z3R0X2xpc3QgeWV0CjIuIGF0IHRoaXMgdGltZSBncHUgcmVzZXQsIGd0dCBv bmx5IHJlY292ZXIgdGhvc2UgZ3R0IGluIGFkZXYtPmd0dF9saXN0CgpDaGFuZ2UtSWQ6IElmYjQz NjBlM2I2ODYyNGYyYmU2N2ZhODIxMDA2MjNjZjRjNDUxODczClNpZ25lZC1vZmYtYnk6IFJvZ2Vy LkhlIDxIb25nYm8uSGVAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHUuaCAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9n YXJ0LmMgfCAgNiArKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0u YyAgfCAyMiArKysrKysrKysrKysrKy0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE5IGluc2Vy dGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgK aW5kZXggOTBhNjliZi4uNTMxMDc4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgK QEAgLTU1Niw3ICs1NTYsNyBAQCBpbnQgYW1kZ3B1X2dhcnRfdGFibGVfdnJhbV9waW4oc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogdm9pZCBhbWRncHVfZ2FydF90YWJsZV92cmFtX3VucGlu KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIGludCBhbWRncHVfZ2FydF9pbml0KHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2KTsKIHZvaWQgYW1kZ3B1X2dhcnRfZmluaShzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldik7Ci12b2lkIGFtZGdwdV9nYXJ0X3VuYmluZChzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwgdWludDY0X3Qgb2Zmc2V0LAoraW50IGFtZGdwdV9nYXJ0X3VuYmluZChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdWludDY0X3Qgb2Zmc2V0LAogCQkJaW50IHBhZ2Vz KTsKIGludCBhbWRncHVfZ2FydF9iaW5kKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1aW50 NjRfdCBvZmZzZXQsCiAJCSAgICAgaW50IHBhZ2VzLCBzdHJ1Y3QgcGFnZSAqKnBhZ2VsaXN0LApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dhcnQuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nYXJ0LmMKaW5kZXggZTc0MDZjZS4uY2Nl ZjNjZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dhcnQu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2FydC5jCkBAIC0yMjEs OCArMjIxLDkgQEAgdm9pZCBhbWRncHVfZ2FydF90YWJsZV92cmFtX2ZyZWUoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCiAgKgogICogVW5iaW5kcyB0aGUgcmVxdWVzdGVkIHBhZ2VzIGZyb20g dGhlIGdhcnQgcGFnZSB0YWJsZSBhbmQKICAqIHJlcGxhY2VzIHRoZW0gd2l0aCB0aGUgZHVtbXkg cGFnZSAoYWxsIGFzaWNzKS4KKyAqIFJldHVybnMgMCBmb3Igc3VjY2VzcywgLUVJTlZBTCBmb3Ig ZmFpbHVyZS4KICAqLwotdm9pZCBhbWRncHVfZ2FydF91bmJpbmQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsIHVpbnQ2NF90IG9mZnNldCwKK2ludCBhbWRncHVfZ2FydF91bmJpbmQoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVpbnQ2NF90IG9mZnNldCwKIAkJCWludCBwYWdlcykKIHsK IAl1bnNpZ25lZCB0OwpAQCAtMjM0LDcgKzIzNSw3IEBAIHZvaWQgYW1kZ3B1X2dhcnRfdW5iaW5k KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1aW50NjRfdCBvZmZzZXQsCiAKIAlpZiAoIWFk ZXYtPmdhcnQucmVhZHkpIHsKIAkJV0FSTigxLCAidHJ5aW5nIHRvIHVuYmluZCBtZW1vcnkgZnJv bSB1bmluaXRpYWxpemVkIEdBUlQgIVxuIik7Ci0JCXJldHVybjsKKwkJcmV0dXJuIC1FSU5WQUw7 CiAJfQogCiAJdCA9IG9mZnNldCAvIEFNREdQVV9HUFVfUEFHRV9TSVpFOwpAQCAtMjU1LDYgKzI1 Niw3IEBAIHZvaWQgYW1kZ3B1X2dhcnRfdW5iaW5kKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LCB1aW50NjRfdCBvZmZzZXQsCiAJfQogCW1iKCk7CiAJYW1kZ3B1X2dhcnRfZmx1c2hfZ3B1X3Rs YihhZGV2LCAwKTsKKwlyZXR1cm4gMDsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfdHRtLmMKaW5kZXggYzNmYjJmOS4uMjc4ZjU1YiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV90dG0uYwpAQCAtNzQ1LDYgKzc0NSw3IEBAIGludCBhbWRncHVfdHRt X2JpbmQoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywgc3RydWN0IHR0bV9tZW1fcmVnICpi b19tZW0pCiAJCXJldHVybiByOwogCX0KIAorCXNwaW5fbG9jaygmZ3R0LT5hZGV2LT5ndHRfbGlz dF9sb2NrKTsKIAlmbGFncyA9IGFtZGdwdV90dG1fdHRfcHRlX2ZsYWdzKGd0dC0+YWRldiwgdHRt LCBib19tZW0pOwogCWd0dC0+b2Zmc2V0ID0gKHU2NClib19tZW0tPnN0YXJ0IDw8IFBBR0VfU0hJ RlQ7CiAJciA9IGFtZGdwdV9nYXJ0X2JpbmQoZ3R0LT5hZGV2LCBndHQtPm9mZnNldCwgdHRtLT5u dW1fcGFnZXMsCkBAIC03NTMsMTIgKzc1NCwxMyBAQCBpbnQgYW1kZ3B1X3R0bV9iaW5kKHN0cnVj dCB0dG1fYnVmZmVyX29iamVjdCAqYm8sIHN0cnVjdCB0dG1fbWVtX3JlZyAqYm9fbWVtKQogCWlm IChyKSB7CiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIGJpbmQgJWx1IHBhZ2VzIGF0IDB4JTA4bGxY XG4iLAogCQkJICB0dG0tPm51bV9wYWdlcywgZ3R0LT5vZmZzZXQpOwotCQlyZXR1cm4gcjsKKwkJ Z290byBlcnJvcl9nYXJ0X2JpbmQ7CiAJfQotCXNwaW5fbG9jaygmZ3R0LT5hZGV2LT5ndHRfbGlz dF9sb2NrKTsKKwogCWxpc3RfYWRkX3RhaWwoJmd0dC0+bGlzdCwgJmd0dC0+YWRldi0+Z3R0X2xp c3QpOworZXJyb3JfZ2FydF9iaW5kOgogCXNwaW5fdW5sb2NrKCZndHQtPmFkZXYtPmd0dF9saXN0 X2xvY2spOwotCXJldHVybiAwOworCXJldHVybiByOwogfQogCiBpbnQgYW1kZ3B1X3R0bV9yZWNv dmVyX2dhcnQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCkBAIC03ODksNiArNzkxLDcgQEAg aW50IGFtZGdwdV90dG1fcmVjb3Zlcl9nYXJ0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQog c3RhdGljIGludCBhbWRncHVfdHRtX2JhY2tlbmRfdW5iaW5kKHN0cnVjdCB0dG1fdHQgKnR0bSkK IHsKIAlzdHJ1Y3QgYW1kZ3B1X3R0bV90dCAqZ3R0ID0gKHZvaWQgKil0dG07CisJaW50IHI7CiAK IAlpZiAoZ3R0LT51c2VycHRyKQogCQlhbWRncHVfdHRtX3R0X3VucGluX3VzZXJwdHIodHRtKTsK QEAgLTc5NywxNCArODAwLDE3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X3R0bV9iYWNrZW5kX3VuYmlu ZChzdHJ1Y3QgdHRtX3R0ICp0dG0pCiAJCXJldHVybiAwOwogCiAJLyogdW5iaW5kIHNob3VsZG4n dCBiZSBkb25lIGZvciBHRFMvR1dTL09BIGluIHR0bV9ib19jbGVhbl9tbSAqLwotCWlmIChndHQt PmFkZXYtPmdhcnQucmVhZHkpCi0JCWFtZGdwdV9nYXJ0X3VuYmluZChndHQtPmFkZXYsIGd0dC0+ b2Zmc2V0LCB0dG0tPm51bV9wYWdlcyk7Ci0KIAlzcGluX2xvY2soJmd0dC0+YWRldi0+Z3R0X2xp c3RfbG9jayk7CisJciA9IGFtZGdwdV9nYXJ0X3VuYmluZChndHQtPmFkZXYsIGd0dC0+b2Zmc2V0 LCB0dG0tPm51bV9wYWdlcyk7CisJaWYgKHIpIHsKKwkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gdW5i aW5kICVsdSBwYWdlcyBhdCAweCUwOGxsWFxuIiwKKwkJCSAgZ3R0LT50dG0udHRtLm51bV9wYWdl cywgZ3R0LT5vZmZzZXQpOworCQlnb3RvIGVycm9yX3VuYmluZDsKKwl9CiAJbGlzdF9kZWxfaW5p dCgmZ3R0LT5saXN0KTsKK2Vycm9yX3VuYmluZDoKIAlzcGluX3VubG9jaygmZ3R0LT5hZGV2LT5n dHRfbGlzdF9sb2NrKTsKLQotCXJldHVybiAwOworCXJldHVybiByOwogfQogCiBzdGF0aWMgdm9p ZCBhbWRncHVfdHRtX2JhY2tlbmRfZGVzdHJveShzdHJ1Y3QgdHRtX3R0ICp0dG0pCi0tIAoyLjcu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdm eCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==