From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 4/9] drm/radeon: force fence completion only on problematic rings Date: Wed, 27 Aug 2014 15:21:56 +0200 Message-ID: <1409145721-32136-5-git-send-email-deathsimple@vodafone.de> References: <1409145721-32136-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 pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id 2516B6E36E for ; Wed, 27 Aug 2014 06:22:47 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id 933CD261406 for ; Wed, 27 Aug 2014 15:22:46 +0200 (CEST) Received: from pegasos-out.vodafone.de ([127.0.0.1]) by localhost (rohrpostix1.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CsgbODM+on+i for ; Wed, 27 Aug 2014 15:22:16 +0200 (CEST) In-Reply-To: <1409145721-32136-1-git-send-email-deathsimple@vodafone.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: alexdeucher@gmail.com, maarten.lankhorst@canonical.com Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKSW5zdGVh ZCBvZiByZXNldHRpbmcgYWxsIGZlbmNlIG51bWJlcnMsIG9ubHkgcmVzZXQgdGhlCm51bWJlciBv ZiB0aGUgcHJvYmxlbWF0aWMgcmluZy4gU3BsaXQgb3V0IGZyb20gYSBwYXRjaApmcm9tIE1hYXJ0 ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBjYW5vbmljYWwuY29tPgoKU2lnbmVkLW9m Zi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgpSZXZpZXdl ZC1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGNhbm9uaWNhbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCAgICAgICAgfCAgMiArLQogZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZGV2aWNlLmMgfCAgNiArLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMgIHwgMTIgKysrKy0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9pYi5jICAgICB8ICAxICsKIDQgZmlsZXMgY2hhbmdlZCwg NyBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbi5oIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaApp bmRleCA4ODEwZGYzLi44MjFiZjUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKQEAgLTM3MCw3 ICszNzAsNyBAQCBzdHJ1Y3QgcmFkZW9uX2ZlbmNlIHsKIGludCByYWRlb25fZmVuY2VfZHJpdmVy X3N0YXJ0X3Jpbmcoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKTsKIGludCBy YWRlb25fZmVuY2VfZHJpdmVyX2luaXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpOwogdm9p ZCByYWRlb25fZmVuY2VfZHJpdmVyX2Zpbmkoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpOwot dm9pZCByYWRlb25fZmVuY2VfZHJpdmVyX2ZvcmNlX2NvbXBsZXRpb24oc3RydWN0IHJhZGVvbl9k ZXZpY2UgKnJkZXYpOwordm9pZCByYWRlb25fZmVuY2VfZHJpdmVyX2ZvcmNlX2NvbXBsZXRpb24o c3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKTsKIGludCByYWRlb25fZmVuY2Vf ZW1pdChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgc3RydWN0IHJhZGVvbl9mZW5jZSAqKmZl bmNlLCBpbnQgcmluZyk7CiB2b2lkIHJhZGVvbl9mZW5jZV9wcm9jZXNzKHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2LCBpbnQgcmluZyk7CiBib29sIHJhZGVvbl9mZW5jZV9zaWduYWxlZChzdHJ1 Y3QgcmFkZW9uX2ZlbmNlICpmZW5jZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFk ZW9uL3JhZGVvbl9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2Rldmlj ZS5jCmluZGV4IGI2YWVlNDAuLmJjYTdkNDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9u X2RldmljZS5jCkBAIC0xNDg4LDcgKzE0ODgsNiBAQCBpbnQgcmFkZW9uX3N1c3BlbmRfa21zKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgc3VzcGVuZCwgYm9vbCBmYmNvbikKIAlzdHJ1Y3Qg ZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlpbnQg aSwgcjsKLQlib29sIGZvcmNlX2NvbXBsZXRpb24gPSBmYWxzZTsKIAogCWlmIChkZXYgPT0gTlVM TCB8fCBkZXYtPmRldl9wcml2YXRlID09IE5VTEwpIHsKIAkJcmV0dXJuIC1FTk9ERVY7CkBAIC0x NTMyLDEyICsxNTMxLDkgQEAgaW50IHJhZGVvbl9zdXNwZW5kX2ttcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBib29sIHN1c3BlbmQsIGJvb2wgZmJjb24pCiAJCXIgPSByYWRlb25fZmVuY2Vfd2Fp dF9lbXB0eShyZGV2LCBpKTsKIAkJaWYgKHIpIHsKIAkJCS8qIGRlbGF5IEdQVSByZXNldCB0byBy ZXN1bWUgKi8KLQkJCWZvcmNlX2NvbXBsZXRpb24gPSB0cnVlOworCQkJcmFkZW9uX2ZlbmNlX2Ry aXZlcl9mb3JjZV9jb21wbGV0aW9uKHJkZXYsIGkpOwogCQl9CiAJfQotCWlmIChmb3JjZV9jb21w bGV0aW9uKSB7Ci0JCXJhZGVvbl9mZW5jZV9kcml2ZXJfZm9yY2VfY29tcGxldGlvbihyZGV2KTsK LQl9CiAKIAlyYWRlb25fc2F2ZV9iaW9zX3NjcmF0Y2hfcmVncyhyZGV2KTsKIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMKaW5kZXggNWJkODM3YS4uZThhMjhlNyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jCkBAIC03NTgsNyArNzU4LDcgQEAgdm9pZCByYWRl b25fZmVuY2VfZHJpdmVyX2Zpbmkoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJCXIgPSBy YWRlb25fZmVuY2Vfd2FpdF9lbXB0eShyZGV2LCByaW5nKTsKIAkJaWYgKHIpIHsKIAkJCS8qIG5v IG5lZWQgdG8gdHJpZ2dlciBHUFUgcmVzZXQgYXMgd2UgYXJlIHVubG9hZGluZyAqLwotCQkJcmFk ZW9uX2ZlbmNlX2RyaXZlcl9mb3JjZV9jb21wbGV0aW9uKHJkZXYpOworCQkJcmFkZW9uX2ZlbmNl X2RyaXZlcl9mb3JjZV9jb21wbGV0aW9uKHJkZXYsIHJpbmcpOwogCQl9CiAJCXdha2VfdXBfYWxs KCZyZGV2LT5mZW5jZV9xdWV1ZSk7CiAJCXJhZGVvbl9zY3JhdGNoX2ZyZWUocmRldiwgcmRldi0+ ZmVuY2VfZHJ2W3JpbmddLnNjcmF0Y2hfcmVnKTsKQEAgLTc3MSwxOSArNzcxLDE1IEBAIHZvaWQg cmFkZW9uX2ZlbmNlX2RyaXZlcl9maW5pKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogICog cmFkZW9uX2ZlbmNlX2RyaXZlcl9mb3JjZV9jb21wbGV0aW9uIC0gZm9yY2UgYWxsIGZlbmNlIHdh aXRlciB0byBjb21wbGV0ZQogICoKICAqIEByZGV2OiByYWRlb24gZGV2aWNlIHBvaW50ZXIKKyAq IEByaW5nOiB0aGUgcmluZyB0byBjb21wbGV0ZQogICoKICAqIEluIGNhc2Ugb2YgR1BVIHJlc2V0 IGZhaWx1cmUgbWFrZSBzdXJlIG5vIHByb2Nlc3Mga2VlcCB3YWl0aW5nIG9uIGZlbmNlCiAgKiB0 aGF0IHdpbGwgbmV2ZXIgY29tcGxldGUuCiAgKi8KLXZvaWQgcmFkZW9uX2ZlbmNlX2RyaXZlcl9m b3JjZV9jb21wbGV0aW9uKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQordm9pZCByYWRlb25f ZmVuY2VfZHJpdmVyX2ZvcmNlX2NvbXBsZXRpb24oc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYs IGludCByaW5nKQogewotCWludCByaW5nOwotCi0JZm9yIChyaW5nID0gMDsgcmluZyA8IFJBREVP Tl9OVU1fUklOR1M7IHJpbmcrKykgewotCQlpZiAoIXJkZXYtPmZlbmNlX2RydltyaW5nXS5pbml0 aWFsaXplZCkKLQkJCWNvbnRpbnVlOworCWlmIChyZGV2LT5mZW5jZV9kcnZbcmluZ10uaW5pdGlh bGl6ZWQpCiAJCXJhZGVvbl9mZW5jZV93cml0ZShyZGV2LCByZGV2LT5mZW5jZV9kcnZbcmluZ10u c3luY19zZXFbcmluZ10sIHJpbmcpOwotCX0KIH0KIAogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbl9pYi5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f aWIuYwppbmRleCA2NWIwYzIxLi5iYzc3ZTAxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v cmFkZW9uL3JhZGVvbl9pYi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2li LmMKQEAgLTI2OCw2ICsyNjgsNyBAQCBpbnQgcmFkZW9uX2liX3JpbmdfdGVzdHMoc3RydWN0IHJh ZGVvbl9kZXZpY2UgKnJkZXYpCiAKIAkJciA9IHJhZGVvbl9pYl90ZXN0KHJkZXYsIGksIHJpbmcp OwogCQlpZiAocikgeworCQkJcmFkZW9uX2ZlbmNlX2RyaXZlcl9mb3JjZV9jb21wbGV0aW9uKHJk ZXYsIGkpOwogCQkJcmluZy0+cmVhZHkgPSBmYWxzZTsKIAkJCXJkZXYtPm5lZWRzX3Jlc2V0ID0g ZmFsc2U7CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=