From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 02/13] drm/radeon: replace gpu_lockup with ring->ready flag Date: Fri, 20 Apr 2012 00:39:09 +0200 Message-ID: <1334875160-5454-3-git-send-email-deathsimple@vodafone.de> References: <1334875160-5454-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from outgoing.email.vodafone.de (outgoing.email.vodafone.de [139.7.28.128]) by gabe.freedesktop.org (Postfix) with ESMTP id 789F09EF44 for ; Thu, 19 Apr 2012 15:39:25 -0700 (PDT) In-Reply-To: <1334875160-5454-1-git-send-email-deathsimple@vodafone.de> 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 SXQgbWFrZXMgbm8gc2Vuc2UgYXQgYWxsIHRvIGhhdmUgbW9yZSB0aGFuIG9uZSBmbGFnLgoKU2ln bmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8ZGVhdGhzaW1wbGVAdm9kYWZvbmUuZGU+ClJl dmlld2VkLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yMTAwLmMgICAgICAgICAgfCAgICAxIC0KIGRyaXZlcnMv Z3B1L2RybS9yYWRlb24vcjMwMC5jICAgICAgICAgIHwgICAgMSAtCiBkcml2ZXJzL2dwdS9kcm0v cmFkZW9uL3JhZGVvbi5oICAgICAgICB8ICAgIDEgLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fZGV2aWNlLmMgfCAgICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2Zl bmNlLmMgIHwgICAzNiArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JzNjAwLmMgICAgICAgICB8ICAgIDEgLQogNiBmaWxlcyBjaGFuZ2VkLCAx MyBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3IxMDAuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjEwMC5jCmluZGV4 IGUxMWRmNzcuLjRiNjc3ZmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjEw MC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcjEwMC5jCkBAIC0yMzAwLDcgKzIzMDAs NiBAQCBpbnQgcjEwMF9hc2ljX3Jlc2V0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCWlm IChHXzAwMEU0MF9TRV9CVVNZKHN0YXR1cykgfHwgR18wMDBFNDBfUkVfQlVTWShzdGF0dXMpIHx8 CiAJCUdfMDAwRTQwX1RBTV9CVVNZKHN0YXR1cykgfHwgR18wMDBFNDBfUEJfQlVTWShzdGF0dXMp KSB7CiAJCWRldl9lcnIocmRldi0+ZGV2LCAiZmFpbGVkIHRvIHJlc2V0IEdQVVxuIik7Ci0JCXJk ZXYtPmdwdV9sb2NrdXAgPSB0cnVlOwogCQlyZXQgPSAtMTsKIAl9IGVsc2UKIAkJZGV2X2luZm8o cmRldi0+ZGV2LCAiR1BVIHJlc2V0IHN1Y2NlZWRcbiIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9yMzAwLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3IzMDAuYwppbmRl eCBmYTE0MzgzLi5hNjNmNDMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Iz MDAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3IzMDAuYwpAQCAtNDQ5LDcgKzQ0OSw2 IEBAIGludCByMzAwX2FzaWNfcmVzZXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJLyog Q2hlY2sgaWYgR1BVIGlzIGlkbGUgKi8KIAlpZiAoR18wMDBFNDBfR0FfQlVTWShzdGF0dXMpIHx8 IEdfMDAwRTQwX1ZBUF9CVVNZKHN0YXR1cykpIHsKIAkJZGV2X2VycihyZGV2LT5kZXYsICJmYWls ZWQgdG8gcmVzZXQgR1BVXG4iKTsKLQkJcmRldi0+Z3B1X2xvY2t1cCA9IHRydWU7CiAJCXJldCA9 IC0xOwogCX0gZWxzZQogCQlkZXZfaW5mbyhyZGV2LT5kZXYsICJHUFUgcmVzZXQgc3VjY2VlZFxu Iik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oIGIvZHJpdmVy cy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaAppbmRleCBiZWE5OWUzLi4zNjUzMzRiIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uLmgKQEAgLTE1MjksNyArMTUyOSw2IEBAIHN0cnVjdCByYWRlb25fZGV2 aWNlIHsKIAlzdHJ1Y3QgcmFkZW9uX211dGV4CQljc19tdXRleDsKIAlzdHJ1Y3QgcmFkZW9uX3di CQl3YjsKIAlzdHJ1Y3QgcmFkZW9uX2R1bW15X3BhZ2UJZHVtbXlfcGFnZTsKLQlib29sCQkJCWdw dV9sb2NrdXA7CiAJYm9vbAkJCQlzaHV0ZG93bjsKIAlib29sCQkJCXN1c3BlbmQ7CiAJYm9vbAkJ CQluZWVkX2RtYTMyOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f ZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYwppbmRleCAw ZmI0Zjg5Li5kZWRiMzk4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVv bl9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYwpA QCAtNzE0LDcgKzcxNCw2IEBAIGludCByYWRlb25fZGV2aWNlX2luaXQoc3RydWN0IHJhZGVvbl9k ZXZpY2UgKnJkZXYsCiAJcmRldi0+aXNfYXRvbV9iaW9zID0gZmFsc2U7CiAJcmRldi0+dXNlY190 aW1lb3V0ID0gUkFERU9OX01BWF9VU0VDX1RJTUVPVVQ7CiAJcmRldi0+bWMuZ3R0X3NpemUgPSBy YWRlb25fZ2FydF9zaXplICogMTAyNCAqIDEwMjQ7Ci0JcmRldi0+Z3B1X2xvY2t1cCA9IGZhbHNl OwogCXJkZXYtPmFjY2VsX3dvcmtpbmcgPSBmYWxzZTsKIAogCURSTV9JTkZPKCJpbml0aWFsaXpp bmcga2VybmVsIG1vZGVzZXR0aW5nICglcyAweCUwNFg6MHglMDRYIDB4JTA0WDoweCUwNFgpLlxu IiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMgYi9k cml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jCmluZGV4IDY2YjIyMjkuLjM2YzQx MWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYwpAQCAtNzEsMTQgKzcxLDcg QEAgaW50IHJhZGVvbl9mZW5jZV9lbWl0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBzdHJ1 Y3QgcmFkZW9uX2ZlbmNlICpmZW5jZSkKIAkJcmV0dXJuIDA7CiAJfQogCWZlbmNlLT5zZXEgPSBh dG9taWNfYWRkX3JldHVybigxLCAmcmRldi0+ZmVuY2VfZHJ2W2ZlbmNlLT5yaW5nXS5zZXEpOwot CWlmICghcmRldi0+cmluZ1tmZW5jZS0+cmluZ10ucmVhZHkpCi0JCS8qIEZJWE1FOiBjcCBpcyBu b3QgcnVubmluZyBhc3N1bWUgZXZlcnl0aGluZ3MgaXMgZG9uZSByaWdodAotCQkgKiBhd2F5Ci0J CSAqLwotCQlyYWRlb25fZmVuY2Vfd3JpdGUocmRldiwgZmVuY2UtPnNlcSwgZmVuY2UtPnJpbmcp OwotCWVsc2UKLQkJcmFkZW9uX2ZlbmNlX3JpbmdfZW1pdChyZGV2LCBmZW5jZS0+cmluZywgZmVu Y2UpOwotCisJcmFkZW9uX2ZlbmNlX3JpbmdfZW1pdChyZGV2LCBmZW5jZS0+cmluZywgZmVuY2Up OwogCXRyYWNlX3JhZGVvbl9mZW5jZV9lbWl0KHJkZXYtPmRkZXYsIGZlbmNlLT5zZXEpOwogCWZl bmNlLT5lbWl0dGVkID0gdHJ1ZTsKIAlsaXN0X21vdmVfdGFpbCgmZmVuY2UtPmxpc3QsICZyZGV2 LT5mZW5jZV9kcnZbZmVuY2UtPnJpbmddLmVtaXR0ZWQpOwpAQCAtMTkxLDkgKzE4NCw2IEBAIGJv b2wgcmFkZW9uX2ZlbmNlX3NpZ25hbGVkKHN0cnVjdCByYWRlb25fZmVuY2UgKmZlbmNlKQogCWlm ICghZmVuY2UpCiAJCXJldHVybiB0cnVlOwogCi0JaWYgKGZlbmNlLT5yZGV2LT5ncHVfbG9ja3Vw KQotCQlyZXR1cm4gdHJ1ZTsKLQogCXdyaXRlX2xvY2tfaXJxc2F2ZSgmZmVuY2UtPnJkZXYtPmZl bmNlX2xvY2ssIGlycV9mbGFncyk7CiAJc2lnbmFsZWQgPSBmZW5jZS0+c2lnbmFsZWQ7CiAJLyog aWYgd2UgYXJlIHNodXRpbmcgZG93biByZXBvcnQgYWxsIGZlbmNlIGFzIHNpZ25hbGVkICovCkBA IC0yNjAsMTggKzI1MCwxNiBAQCByZXRyeToKIAkJICovCiAJCWlmIChzZXEgPT0gcmRldi0+ZmVu Y2VfZHJ2W2ZlbmNlLT5yaW5nXS5sYXN0X3NlcSAmJgogCQkgICAgcmFkZW9uX3JpbmdfaXNfbG9j a3VwKHJkZXYsIGZlbmNlLT5yaW5nLCAmcmRldi0+cmluZ1tmZW5jZS0+cmluZ10pKSB7CisKIAkJ CS8qIGdvb2QgbmV3cyB3ZSBiZWxpZXZlIGl0J3MgYSBsb2NrdXAgKi8KIAkJCXByaW50ayhLRVJO X1dBUk5JTkcgIkdQVSBsb2NrdXAgKHdhaXRpbmcgZm9yIDB4JTA4WCBsYXN0IGZlbmNlIGlkIDB4 JTA4WClcbiIsCiAJCQkgICAgIGZlbmNlLT5zZXEsIHNlcSk7Ci0JCQkvKiBGSVhNRTogd2hhdCBz aG91bGQgd2UgZG8gPyBtYXJraW5nIGV2ZXJ5b25lCi0JCQkgKiBhcyBzaWduYWxlZCBmb3Igbm93 Ci0JCQkgKi8KLQkJCXJkZXYtPmdwdV9sb2NrdXAgPSB0cnVlOworCisJCQkvKiBtYXJrIHRoZSBy aW5nIGFzIG5vdCByZWFkeSBhbnkgbW9yZSAqLworCQkJcmRldi0+cmluZ1tmZW5jZS0+cmluZ10u cmVhZHkgPSBmYWxzZTsKIAkJCXIgPSByYWRlb25fZ3B1X3Jlc2V0KHJkZXYpOwogCQkJaWYgKHIp CiAJCQkJcmV0dXJuIHI7Ci0JCQlyYWRlb25fZmVuY2Vfd3JpdGUocmRldiwgZmVuY2UtPnNlcSwg ZmVuY2UtPnJpbmcpOwotCQkJcmRldi0+Z3B1X2xvY2t1cCA9IGZhbHNlOwogCQl9CiAJCXRpbWVv dXQgPSBSQURFT05fRkVOQ0VfSklGRklFU19USU1FT1VUOwogCQl3cml0ZV9sb2NrX2lycXNhdmUo JnJkZXYtPmZlbmNlX2xvY2ssIGlycV9mbGFncyk7CkBAIC0yODksMTAgKzI3NywxMSBAQCBpbnQg cmFkZW9uX2ZlbmNlX3dhaXRfbmV4dChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgaW50IHJp bmcpCiAJc3RydWN0IHJhZGVvbl9mZW5jZSAqZmVuY2U7CiAJaW50IHI7CiAKLQlpZiAocmRldi0+ Z3B1X2xvY2t1cCkgewotCQlyZXR1cm4gMDsKLQl9CiAJd3JpdGVfbG9ja19pcnFzYXZlKCZyZGV2 LT5mZW5jZV9sb2NrLCBpcnFfZmxhZ3MpOworCWlmICghcmRldi0+cmluZ1tyaW5nXS5yZWFkeSkg eworCQl3cml0ZV91bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ZmVuY2VfbG9jaywgaXJxX2ZsYWdz KTsKKwkJcmV0dXJuIC1FQlVTWTsKKwl9CiAJaWYgKGxpc3RfZW1wdHkoJnJkZXYtPmZlbmNlX2Ry dltyaW5nXS5lbWl0dGVkKSkgewogCQl3cml0ZV91bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ZmVu Y2VfbG9jaywgaXJxX2ZsYWdzKTsKIAkJcmV0dXJuIDA7CkBAIC0zMTIsMTAgKzMwMSwxMSBAQCBp bnQgcmFkZW9uX2ZlbmNlX3dhaXRfbGFzdChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgaW50 IHJpbmcpCiAJc3RydWN0IHJhZGVvbl9mZW5jZSAqZmVuY2U7CiAJaW50IHI7CiAKLQlpZiAocmRl di0+Z3B1X2xvY2t1cCkgewotCQlyZXR1cm4gMDsKLQl9CiAJd3JpdGVfbG9ja19pcnFzYXZlKCZy ZGV2LT5mZW5jZV9sb2NrLCBpcnFfZmxhZ3MpOworCWlmICghcmRldi0+cmluZ1tyaW5nXS5yZWFk eSkgeworCQl3cml0ZV91bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ZmVuY2VfbG9jaywgaXJxX2Zs YWdzKTsKKwkJcmV0dXJuIC1FQlVTWTsKKwl9CiAJaWYgKGxpc3RfZW1wdHkoJnJkZXYtPmZlbmNl X2RydltyaW5nXS5lbWl0dGVkKSkgewogCQl3cml0ZV91bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ ZmVuY2VfbG9jaywgaXJxX2ZsYWdzKTsKIAkJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JzNjAwLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JzNjAwLmMK aW5kZXggZDI1Y2Y4Ni4uZjcwOWZlOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yczYwMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcnM2MDAuYwpAQCAtMzk2LDcg KzM5Niw2IEBAIGludCByczYwMF9hc2ljX3Jlc2V0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2 KQogCS8qIENoZWNrIGlmIEdQVSBpcyBpZGxlICovCiAJaWYgKEdfMDAwRTQwX0dBX0JVU1koc3Rh dHVzKSB8fCBHXzAwMEU0MF9WQVBfQlVTWShzdGF0dXMpKSB7CiAJCWRldl9lcnIocmRldi0+ZGV2 LCAiZmFpbGVkIHRvIHJlc2V0IEdQVVxuIik7Ci0JCXJkZXYtPmdwdV9sb2NrdXAgPSB0cnVlOwog CQlyZXQgPSAtMTsKIAl9IGVsc2UKIAkJZGV2X2luZm8ocmRldi0+ZGV2LCAiR1BVIHJlc2V0IHN1 Y2NlZWRcbiIpOwotLSAKMS43LjUuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK