From mboxrd@z Thu Jan 1 00:00:00 1970 From: j.glisse@gmail.com Subject: [PATCH 02/27] drm/radeon: replace gpu_lockup with ring->ready flag Date: Tue, 1 May 2012 13:19:12 -0400 Message-ID: <1335892777-7357-3-git-send-email-j.glisse@gmail.com> References: <ยท> <1335892777-7357-1-git-send-email-j.glisse@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qc0-f177.google.com (mail-qc0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 32A239EF4F for ; Tue, 1 May 2012 10:19:57 -0700 (PDT) Received: by qcsu28 with SMTP id u28so2436886qcs.36 for ; Tue, 01 May 2012 10:19:56 -0700 (PDT) In-Reply-To: <1335892777-7357-1-git-send-email-j.glisse@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8ZGVhdGhzaW1wbGVAdm9kYWZvbmUuZGU+CgpJdCBtYWtl cyBubyBzZW5zZSBhdCBhbGwgdG8gaGF2ZSBtb3JlIHRoYW4gb25lIGZsYWcuCgpTaWduZWQtb2Zm LWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxkZWF0aHNpbXBsZUB2b2RhZm9uZS5kZT4KUmV2aWV3ZWQt Ynk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6 IEplcm9tZSBHbGlzc2UgPGpnbGlzc2VAcmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v cmFkZW9uL3IxMDAuYyAgICAgICAgICB8ICAgIDEgLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y MzAwLmMgICAgICAgICAgfCAgICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgg ICAgICAgIHwgICAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYyB8 ICAgIDEgLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYyAgfCAgIDM2ICsr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vcnM2 MDAuYyAgICAgICAgIHwgICAgMSAtCiA2IGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyks IDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjEw MC5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yMTAwLmMKaW5kZXggZmUzM2QzNS4uNjU3M2Uy OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yMTAwLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3JhZGVvbi9yMTAwLmMKQEAgLTIyOTYsNyArMjI5Niw2IEBAIGludCByMTAwX2Fz aWNfcmVzZXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJaWYgKEdfMDAwRTQwX1NFX0JV U1koc3RhdHVzKSB8fCBHXzAwMEU0MF9SRV9CVVNZKHN0YXR1cykgfHwKIAkJR18wMDBFNDBfVEFN X0JVU1koc3RhdHVzKSB8fCBHXzAwMEU0MF9QQl9CVVNZKHN0YXR1cykpIHsKIAkJZGV2X2Vycihy ZGV2LT5kZXYsICJmYWlsZWQgdG8gcmVzZXQgR1BVXG4iKTsKLQkJcmRldi0+Z3B1X2xvY2t1cCA9 IHRydWU7CiAJCXJldCA9IC0xOwogCX0gZWxzZQogCQlkZXZfaW5mbyhyZGV2LT5kZXYsICJHUFUg cmVzZXQgc3VjY2VlZFxuIik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Iz MDAuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjMwMC5jCmluZGV4IGZhMTQzODMuLmE2M2Y0 MzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjMwMC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vcjMwMC5jCkBAIC00NDksNyArNDQ5LDYgQEAgaW50IHIzMDBfYXNp Y19yZXNldChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAkvKiBDaGVjayBpZiBHUFUgaXMg aWRsZSAqLwogCWlmIChHXzAwMEU0MF9HQV9CVVNZKHN0YXR1cykgfHwgR18wMDBFNDBfVkFQX0JV U1koc3RhdHVzKSkgewogCQlkZXZfZXJyKHJkZXYtPmRldiwgImZhaWxlZCB0byByZXNldCBHUFVc biIpOwotCQlyZGV2LT5ncHVfbG9ja3VwID0gdHJ1ZTsKIAkJcmV0ID0gLTE7CiAJfSBlbHNlCiAJ CWRldl9pbmZvKHJkZXYtPmRldiwgIkdQVSByZXNldCBzdWNjZWVkXG4iKTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmggYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbi5oCmluZGV4IGJlYTk5ZTMuLjM2NTMzNGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9yYWRlb24vcmFkZW9uLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24u aApAQCAtMTUyOSw3ICsxNTI5LDYgQEAgc3RydWN0IHJhZGVvbl9kZXZpY2UgewogCXN0cnVjdCBy YWRlb25fbXV0ZXgJCWNzX211dGV4OwogCXN0cnVjdCByYWRlb25fd2IJCXdiOwogCXN0cnVjdCBy YWRlb25fZHVtbXlfcGFnZQlkdW1teV9wYWdlOwotCWJvb2wJCQkJZ3B1X2xvY2t1cDsKIAlib29s CQkJCXNodXRkb3duOwogCWJvb2wJCQkJc3VzcGVuZDsKIAlib29sCQkJCW5lZWRfZG1hMzI7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYyBiL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2RldmljZS5jCmluZGV4IGVhN2RmMTYuLmViNjNhMDYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2RldmljZS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2RldmljZS5jCkBAIC03MTQsNyArNzE0LDYg QEAgaW50IHJhZGVvbl9kZXZpY2VfaW5pdChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAly ZGV2LT5pc19hdG9tX2Jpb3MgPSBmYWxzZTsKIAlyZGV2LT51c2VjX3RpbWVvdXQgPSBSQURFT05f TUFYX1VTRUNfVElNRU9VVDsKIAlyZGV2LT5tYy5ndHRfc2l6ZSA9IHJhZGVvbl9nYXJ0X3NpemUg KiAxMDI0ICogMTAyNDsKLQlyZGV2LT5ncHVfbG9ja3VwID0gZmFsc2U7CiAJcmRldi0+YWNjZWxf d29ya2luZyA9IGZhbHNlOwogCiAJRFJNX0lORk8oImluaXRpYWxpemluZyBrZXJuZWwgbW9kZXNl dHRpbmcgKCVzIDB4JTA0WDoweCUwNFggMHglMDRYOjB4JTA0WCkuXG4iLApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX2ZlbmNlLmMKaW5kZXggNjZiMjIyOS4uMzZjNDExZiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jCkBAIC03MSwxNCArNzEsNyBAQCBpbnQgcmFkZW9uX2Zl bmNlX2VtaXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIHN0cnVjdCByYWRlb25fZmVuY2Ug KmZlbmNlKQogCQlyZXR1cm4gMDsKIAl9CiAJZmVuY2UtPnNlcSA9IGF0b21pY19hZGRfcmV0dXJu KDEsICZyZGV2LT5mZW5jZV9kcnZbZmVuY2UtPnJpbmddLnNlcSk7Ci0JaWYgKCFyZGV2LT5yaW5n W2ZlbmNlLT5yaW5nXS5yZWFkeSkKLQkJLyogRklYTUU6IGNwIGlzIG5vdCBydW5uaW5nIGFzc3Vt ZSBldmVyeXRoaW5ncyBpcyBkb25lIHJpZ2h0Ci0JCSAqIGF3YXkKLQkJICovCi0JCXJhZGVvbl9m ZW5jZV93cml0ZShyZGV2LCBmZW5jZS0+c2VxLCBmZW5jZS0+cmluZyk7Ci0JZWxzZQotCQlyYWRl b25fZmVuY2VfcmluZ19lbWl0KHJkZXYsIGZlbmNlLT5yaW5nLCBmZW5jZSk7Ci0KKwlyYWRlb25f ZmVuY2VfcmluZ19lbWl0KHJkZXYsIGZlbmNlLT5yaW5nLCBmZW5jZSk7CiAJdHJhY2VfcmFkZW9u X2ZlbmNlX2VtaXQocmRldi0+ZGRldiwgZmVuY2UtPnNlcSk7CiAJZmVuY2UtPmVtaXR0ZWQgPSB0 cnVlOwogCWxpc3RfbW92ZV90YWlsKCZmZW5jZS0+bGlzdCwgJnJkZXYtPmZlbmNlX2RydltmZW5j ZS0+cmluZ10uZW1pdHRlZCk7CkBAIC0xOTEsOSArMTg0LDYgQEAgYm9vbCByYWRlb25fZmVuY2Vf c2lnbmFsZWQoc3RydWN0IHJhZGVvbl9mZW5jZSAqZmVuY2UpCiAJaWYgKCFmZW5jZSkKIAkJcmV0 dXJuIHRydWU7CiAKLQlpZiAoZmVuY2UtPnJkZXYtPmdwdV9sb2NrdXApCi0JCXJldHVybiB0cnVl OwotCiAJd3JpdGVfbG9ja19pcnFzYXZlKCZmZW5jZS0+cmRldi0+ZmVuY2VfbG9jaywgaXJxX2Zs YWdzKTsKIAlzaWduYWxlZCA9IGZlbmNlLT5zaWduYWxlZDsKIAkvKiBpZiB3ZSBhcmUgc2h1dGlu ZyBkb3duIHJlcG9ydCBhbGwgZmVuY2UgYXMgc2lnbmFsZWQgKi8KQEAgLTI2MCwxOCArMjUwLDE2 IEBAIHJldHJ5OgogCQkgKi8KIAkJaWYgKHNlcSA9PSByZGV2LT5mZW5jZV9kcnZbZmVuY2UtPnJp bmddLmxhc3Rfc2VxICYmCiAJCSAgICByYWRlb25fcmluZ19pc19sb2NrdXAocmRldiwgZmVuY2Ut PnJpbmcsICZyZGV2LT5yaW5nW2ZlbmNlLT5yaW5nXSkpIHsKKwogCQkJLyogZ29vZCBuZXdzIHdl IGJlbGlldmUgaXQncyBhIGxvY2t1cCAqLwogCQkJcHJpbnRrKEtFUk5fV0FSTklORyAiR1BVIGxv Y2t1cCAod2FpdGluZyBmb3IgMHglMDhYIGxhc3QgZmVuY2UgaWQgMHglMDhYKVxuIiwKIAkJCSAg ICAgZmVuY2UtPnNlcSwgc2VxKTsKLQkJCS8qIEZJWE1FOiB3aGF0IHNob3VsZCB3ZSBkbyA/IG1h cmtpbmcgZXZlcnlvbmUKLQkJCSAqIGFzIHNpZ25hbGVkIGZvciBub3cKLQkJCSAqLwotCQkJcmRl di0+Z3B1X2xvY2t1cCA9IHRydWU7CisKKwkJCS8qIG1hcmsgdGhlIHJpbmcgYXMgbm90IHJlYWR5 IGFueSBtb3JlICovCisJCQlyZGV2LT5yaW5nW2ZlbmNlLT5yaW5nXS5yZWFkeSA9IGZhbHNlOwog CQkJciA9IHJhZGVvbl9ncHVfcmVzZXQocmRldik7CiAJCQlpZiAocikKIAkJCQlyZXR1cm4gcjsK LQkJCXJhZGVvbl9mZW5jZV93cml0ZShyZGV2LCBmZW5jZS0+c2VxLCBmZW5jZS0+cmluZyk7Ci0J CQlyZGV2LT5ncHVfbG9ja3VwID0gZmFsc2U7CiAJCX0KIAkJdGltZW91dCA9IFJBREVPTl9GRU5D RV9KSUZGSUVTX1RJTUVPVVQ7CiAJCXdyaXRlX2xvY2tfaXJxc2F2ZSgmcmRldi0+ZmVuY2VfbG9j aywgaXJxX2ZsYWdzKTsKQEAgLTI4OSwxMCArMjc3LDExIEBAIGludCByYWRlb25fZmVuY2Vfd2Fp dF9uZXh0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZykKIAlzdHJ1Y3QgcmFk ZW9uX2ZlbmNlICpmZW5jZTsKIAlpbnQgcjsKIAotCWlmIChyZGV2LT5ncHVfbG9ja3VwKSB7Ci0J CXJldHVybiAwOwotCX0KIAl3cml0ZV9sb2NrX2lycXNhdmUoJnJkZXYtPmZlbmNlX2xvY2ssIGly cV9mbGFncyk7CisJaWYgKCFyZGV2LT5yaW5nW3JpbmddLnJlYWR5KSB7CisJCXdyaXRlX3VubG9j a19pcnFyZXN0b3JlKCZyZGV2LT5mZW5jZV9sb2NrLCBpcnFfZmxhZ3MpOworCQlyZXR1cm4gLUVC VVNZOworCX0KIAlpZiAobGlzdF9lbXB0eSgmcmRldi0+ZmVuY2VfZHJ2W3JpbmddLmVtaXR0ZWQp KSB7CiAJCXdyaXRlX3VubG9ja19pcnFyZXN0b3JlKCZyZGV2LT5mZW5jZV9sb2NrLCBpcnFfZmxh Z3MpOwogCQlyZXR1cm4gMDsKQEAgLTMxMiwxMCArMzAxLDExIEBAIGludCByYWRlb25fZmVuY2Vf d2FpdF9sYXN0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZykKIAlzdHJ1Y3Qg cmFkZW9uX2ZlbmNlICpmZW5jZTsKIAlpbnQgcjsKIAotCWlmIChyZGV2LT5ncHVfbG9ja3VwKSB7 Ci0JCXJldHVybiAwOwotCX0KIAl3cml0ZV9sb2NrX2lycXNhdmUoJnJkZXYtPmZlbmNlX2xvY2ss IGlycV9mbGFncyk7CisJaWYgKCFyZGV2LT5yaW5nW3JpbmddLnJlYWR5KSB7CisJCXdyaXRlX3Vu bG9ja19pcnFyZXN0b3JlKCZyZGV2LT5mZW5jZV9sb2NrLCBpcnFfZmxhZ3MpOworCQlyZXR1cm4g LUVCVVNZOworCX0KIAlpZiAobGlzdF9lbXB0eSgmcmRldi0+ZmVuY2VfZHJ2W3JpbmddLmVtaXR0 ZWQpKSB7CiAJCXdyaXRlX3VubG9ja19pcnFyZXN0b3JlKCZyZGV2LT5mZW5jZV9sb2NrLCBpcnFf ZmxhZ3MpOwogCQlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24v cnM2MDAuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcnM2MDAuYwppbmRleCBkMjVjZjg2Li5m NzA5ZmU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JzNjAwLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yczYwMC5jCkBAIC0zOTYsNyArMzk2LDYgQEAgaW50IHJz NjAwX2FzaWNfcmVzZXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJLyogQ2hlY2sgaWYg R1BVIGlzIGlkbGUgKi8KIAlpZiAoR18wMDBFNDBfR0FfQlVTWShzdGF0dXMpIHx8IEdfMDAwRTQw X1ZBUF9CVVNZKHN0YXR1cykpIHsKIAkJZGV2X2VycihyZGV2LT5kZXYsICJmYWlsZWQgdG8gcmVz ZXQgR1BVXG4iKTsKLQkJcmRldi0+Z3B1X2xvY2t1cCA9IHRydWU7CiAJCXJldCA9IC0xOwogCX0g ZWxzZQogCQlkZXZfaW5mbyhyZGV2LT5kZXYsICJHUFUgcmVzZXQgc3VjY2VlZFxuIik7Ci0tIAox LjcuNy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=