From mboxrd@z Thu Jan 1 00:00:00 1970 From: j.glisse@gmail.com Subject: [PATCH 03/24] drm/radeon: replace gpu_lockup with ring->ready flag Date: Wed, 25 Apr 2012 15:03:08 -0400 Message-ID: <1335380609-5804-4-git-send-email-j.glisse@gmail.com> References: <1335380609-5804-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-qa0-f49.google.com (mail-qa0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EF389F375 for ; Wed, 25 Apr 2012 12:03:48 -0700 (PDT) Received: by mail-qa0-f49.google.com with SMTP id j40so467725qab.15 for ; Wed, 25 Apr 2012 12:03:48 -0700 (PDT) In-Reply-To: <1335380609-5804-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 Ynk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3IxMDAuYyAgICAgICAgICB8ICAgIDEgLQogZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yMzAwLmMgICAgICAgICAgfCAgICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uLmggICAgICAgIHwgICAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9k ZXZpY2UuYyB8ICAgIDEgLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYyAg fCAgIDM2ICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9y YWRlb24vcnM2MDAuYyAgICAgICAgIHwgICAgMSAtCiA2IGZpbGVzIGNoYW5nZWQsIDEzIGluc2Vy dGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9y YWRlb24vcjEwMC5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yMTAwLmMKaW5kZXggOWU2OWE5 NS4uMDFlNTk3YWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjEwMC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjEwMC5jCkBAIC0yMjkzLDcgKzIyOTMsNiBAQCBp bnQgcjEwMF9hc2ljX3Jlc2V0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCWlmIChHXzAw MEU0MF9TRV9CVVNZKHN0YXR1cykgfHwgR18wMDBFNDBfUkVfQlVTWShzdGF0dXMpIHx8CiAJCUdf MDAwRTQwX1RBTV9CVVNZKHN0YXR1cykgfHwgR18wMDBFNDBfUEJfQlVTWShzdGF0dXMpKSB7CiAJ CWRldl9lcnIocmRldi0+ZGV2LCAiZmFpbGVkIHRvIHJlc2V0IEdQVVxuIik7Ci0JCXJkZXYtPmdw dV9sb2NrdXAgPSB0cnVlOwogCQlyZXQgPSAtMTsKIAl9IGVsc2UKIAkJZGV2X2luZm8ocmRldi0+ ZGV2LCAiR1BVIHJlc2V0IHN1Y2NlZWRcbiIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yMzAwLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3IzMDAuYwppbmRleCBjNTIz N2FiLi40MGJhYWVjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3IzMDAuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3IzMDAuYwpAQCAtNDQ0LDcgKzQ0NCw2IEBAIGlu dCByMzAwX2FzaWNfcmVzZXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJLyogQ2hlY2sg aWYgR1BVIGlzIGlkbGUgKi8KIAlpZiAoR18wMDBFNDBfR0FfQlVTWShzdGF0dXMpIHx8IEdfMDAw RTQwX1ZBUF9CVVNZKHN0YXR1cykpIHsKIAkJZGV2X2VycihyZGV2LT5kZXYsICJmYWlsZWQgdG8g cmVzZXQgR1BVXG4iKTsKLQkJcmRldi0+Z3B1X2xvY2t1cCA9IHRydWU7CiAJCXJldCA9IC0xOwog CX0gZWxzZQogCQlkZXZfaW5mbyhyZGV2LT5kZXYsICJHUFUgcmVzZXQgc3VjY2VlZFxuIik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oIGIvZHJpdmVycy9ncHUv ZHJtL3JhZGVvbi9yYWRlb24uaAppbmRleCBiZWE5OWUzLi4zNjUzMzRiIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRl b24vcmFkZW9uLmgKQEAgLTE1MjksNyArMTUyOSw2IEBAIHN0cnVjdCByYWRlb25fZGV2aWNlIHsK IAlzdHJ1Y3QgcmFkZW9uX211dGV4CQljc19tdXRleDsKIAlzdHJ1Y3QgcmFkZW9uX3diCQl3YjsK IAlzdHJ1Y3QgcmFkZW9uX2R1bW15X3BhZ2UJZHVtbXlfcGFnZTsKLQlib29sCQkJCWdwdV9sb2Nr dXA7CiAJYm9vbAkJCQlzaHV0ZG93bjsKIAlib29sCQkJCXN1c3BlbmQ7CiAJYm9vbAkJCQluZWVk X2RtYTMyOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGV2aWNl LmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYwppbmRleCBlYTdkZjE2 Li5lYjYzYTA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZp Y2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYwpAQCAtNzE0 LDcgKzcxNCw2IEBAIGludCByYWRlb25fZGV2aWNlX2luaXQoc3RydWN0IHJhZGVvbl9kZXZpY2Ug KnJkZXYsCiAJcmRldi0+aXNfYXRvbV9iaW9zID0gZmFsc2U7CiAJcmRldi0+dXNlY190aW1lb3V0 ID0gUkFERU9OX01BWF9VU0VDX1RJTUVPVVQ7CiAJcmRldi0+bWMuZ3R0X3NpemUgPSByYWRlb25f Z2FydF9zaXplICogMTAyNCAqIDEwMjQ7Ci0JcmRldi0+Z3B1X2xvY2t1cCA9IGZhbHNlOwogCXJk ZXYtPmFjY2VsX3dvcmtpbmcgPSBmYWxzZTsKIAogCURSTV9JTkZPKCJpbml0aWFsaXppbmcga2Vy bmVsIG1vZGVzZXR0aW5nICglcyAweCUwNFg6MHglMDRYIDB4JTA0WDoweCUwNFgpLlxuIiwKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMgYi9kcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jCmluZGV4IDc5Y2U4MjkuLmMwZWMxOWQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYwpAQCAtNzEsMTQgKzcxLDcgQEAgaW50 IHJhZGVvbl9mZW5jZV9lbWl0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBzdHJ1Y3QgcmFk ZW9uX2ZlbmNlICpmZW5jZSkKIAkJcmV0dXJuIDA7CiAJfQogCWZlbmNlLT5zZXEgPSBhdG9taWNf YWRkX3JldHVybigxLCAmcmRldi0+ZmVuY2VfZHJ2W2ZlbmNlLT5yaW5nXS5zZXEpOwotCWlmICgh cmRldi0+cmluZ1tmZW5jZS0+cmluZ10ucmVhZHkpCi0JCS8qIEZJWE1FOiBjcCBpcyBub3QgcnVu bmluZyBhc3N1bWUgZXZlcnl0aGluZ3MgaXMgZG9uZSByaWdodAotCQkgKiBhd2F5Ci0JCSAqLwot CQlyYWRlb25fZmVuY2Vfd3JpdGUocmRldiwgZmVuY2UtPnNlcSwgZmVuY2UtPnJpbmcpOwotCWVs c2UKLQkJcmFkZW9uX2ZlbmNlX3JpbmdfZW1pdChyZGV2LCBmZW5jZS0+cmluZywgZmVuY2UpOwot CisJcmFkZW9uX2ZlbmNlX3JpbmdfZW1pdChyZGV2LCBmZW5jZS0+cmluZywgZmVuY2UpOwogCXRy YWNlX3JhZGVvbl9mZW5jZV9lbWl0KHJkZXYtPmRkZXYsIGZlbmNlLT5zZXEpOwogCWZlbmNlLT5l bWl0dGVkID0gdHJ1ZTsKIAlsaXN0X21vdmVfdGFpbCgmZmVuY2UtPmxpc3QsICZyZGV2LT5mZW5j ZV9kcnZbZmVuY2UtPnJpbmddLmVtaXR0ZWQpOwpAQCAtMTkxLDkgKzE4NCw2IEBAIGJvb2wgcmFk ZW9uX2ZlbmNlX3NpZ25hbGVkKHN0cnVjdCByYWRlb25fZmVuY2UgKmZlbmNlKQogCWlmICghZmVu Y2UpCiAJCXJldHVybiB0cnVlOwogCi0JaWYgKGZlbmNlLT5yZGV2LT5ncHVfbG9ja3VwKQotCQly ZXR1cm4gdHJ1ZTsKLQogCXdyaXRlX2xvY2tfaXJxc2F2ZSgmZmVuY2UtPnJkZXYtPmZlbmNlX2xv Y2ssIGlycV9mbGFncyk7CiAJc2lnbmFsZWQgPSBmZW5jZS0+c2lnbmFsZWQ7CiAJLyogaWYgd2Ug YXJlIHNodXRpbmcgZG93biByZXBvcnQgYWxsIGZlbmNlIGFzIHNpZ25hbGVkICovCkBAIC0yNjAs MTggKzI1MCwxNiBAQCByZXRyeToKIAkJICovCiAJCWlmIChzZXEgPT0gcmRldi0+ZmVuY2VfZHJ2 W2ZlbmNlLT5yaW5nXS5sYXN0X3NlcSAmJgogCQkgICAgcmFkZW9uX3JpbmdfaXNfbG9ja3VwKHJk ZXYsIGZlbmNlLT5yaW5nLCAmcmRldi0+cmluZ1tmZW5jZS0+cmluZ10pKSB7CisKIAkJCS8qIGdv b2QgbmV3cyB3ZSBiZWxpZXZlIGl0J3MgYSBsb2NrdXAgKi8KIAkJCXByaW50ayhLRVJOX1dBUk5J TkcgIkdQVSBsb2NrdXAgKHdhaXRpbmcgZm9yIDB4JTA4WCBsYXN0IGZlbmNlIGlkIDB4JTA4WClc biIsCiAJCQkgICAgIGZlbmNlLT5zZXEsIHNlcSk7Ci0JCQkvKiBGSVhNRTogd2hhdCBzaG91bGQg d2UgZG8gPyBtYXJraW5nIGV2ZXJ5b25lCi0JCQkgKiBhcyBzaWduYWxlZCBmb3Igbm93Ci0JCQkg Ki8KLQkJCXJkZXYtPmdwdV9sb2NrdXAgPSB0cnVlOworCisJCQkvKiBtYXJrIHRoZSByaW5nIGFz IG5vdCByZWFkeSBhbnkgbW9yZSAqLworCQkJcmRldi0+cmluZ1tmZW5jZS0+cmluZ10ucmVhZHkg PSBmYWxzZTsKIAkJCXIgPSByYWRlb25fZ3B1X3Jlc2V0KHJkZXYpOwogCQkJaWYgKHIpCiAJCQkJ cmV0dXJuIHI7Ci0JCQlyYWRlb25fZmVuY2Vfd3JpdGUocmRldiwgZmVuY2UtPnNlcSwgZmVuY2Ut PnJpbmcpOwotCQkJcmRldi0+Z3B1X2xvY2t1cCA9IGZhbHNlOwogCQl9CiAJCXRpbWVvdXQgPSBS QURFT05fRkVOQ0VfSklGRklFU19USU1FT1VUOwogCQl3cml0ZV9sb2NrX2lycXNhdmUoJnJkZXYt PmZlbmNlX2xvY2ssIGlycV9mbGFncyk7CkBAIC0yODksMTAgKzI3NywxMSBAQCBpbnQgcmFkZW9u X2ZlbmNlX3dhaXRfbmV4dChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgaW50IHJpbmcpCiAJ c3RydWN0IHJhZGVvbl9mZW5jZSAqZmVuY2U7CiAJaW50IHI7CiAKLQlpZiAocmRldi0+Z3B1X2xv Y2t1cCkgewotCQlyZXR1cm4gMDsKLQl9CiAJd3JpdGVfbG9ja19pcnFzYXZlKCZyZGV2LT5mZW5j ZV9sb2NrLCBpcnFfZmxhZ3MpOworCWlmICghcmRldi0+cmluZ1tyaW5nXS5yZWFkeSkgeworCQl3 cml0ZV91bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ZmVuY2VfbG9jaywgaXJxX2ZsYWdzKTsKKwkJ cmV0dXJuIC1FQlVTWTsKKwl9CiAJaWYgKGxpc3RfZW1wdHkoJnJkZXYtPmZlbmNlX2RydltyaW5n XS5lbWl0dGVkKSkgewogCQl3cml0ZV91bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ZmVuY2VfbG9j aywgaXJxX2ZsYWdzKTsKIAkJcmV0dXJuIDA7CkBAIC0zMTIsMTAgKzMwMSwxMSBAQCBpbnQgcmFk ZW9uX2ZlbmNlX3dhaXRfbGFzdChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgaW50IHJpbmcp CiAJc3RydWN0IHJhZGVvbl9mZW5jZSAqZmVuY2U7CiAJaW50IHI7CiAKLQlpZiAocmRldi0+Z3B1 X2xvY2t1cCkgewotCQlyZXR1cm4gMDsKLQl9CiAJd3JpdGVfbG9ja19pcnFzYXZlKCZyZGV2LT5m ZW5jZV9sb2NrLCBpcnFfZmxhZ3MpOworCWlmICghcmRldi0+cmluZ1tyaW5nXS5yZWFkeSkgewor CQl3cml0ZV91bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ZmVuY2VfbG9jaywgaXJxX2ZsYWdzKTsK KwkJcmV0dXJuIC1FQlVTWTsKKwl9CiAJaWYgKGxpc3RfZW1wdHkoJnJkZXYtPmZlbmNlX2Rydlty aW5nXS5lbWl0dGVkKSkgewogCQl3cml0ZV91bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ZmVuY2Vf bG9jaywgaXJxX2ZsYWdzKTsKIAkJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vcmFkZW9uL3JzNjAwLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JzNjAwLmMKaW5kZXgg ZGM1ZWM4Yy4uNzA2MWFhZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yczYw MC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcnM2MDAuYwpAQCAtMzk2LDcgKzM5Niw2 IEBAIGludCByczYwMF9hc2ljX3Jlc2V0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCS8q IENoZWNrIGlmIEdQVSBpcyBpZGxlICovCiAJaWYgKEdfMDAwRTQwX0dBX0JVU1koc3RhdHVzKSB8 fCBHXzAwMEU0MF9WQVBfQlVTWShzdGF0dXMpKSB7CiAJCWRldl9lcnIocmRldi0+ZGV2LCAiZmFp bGVkIHRvIHJlc2V0IEdQVVxuIik7Ci0JCXJkZXYtPmdwdV9sb2NrdXAgPSB0cnVlOwogCQlyZXQg PSAtMTsKIAl9IGVsc2UKIAkJZGV2X2luZm8ocmRldi0+ZGV2LCAiR1BVIHJlc2V0IHN1Y2NlZWRc biIpOwotLSAKMS43LjcuNgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK