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: Tue, 26 Aug 2014 18:35:05 +0200 Message-ID: <1409070910-2549-4-git-send-email-deathsimple@vodafone.de> References: <1409070910-2549-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 8ACBE6E482 for ; Tue, 26 Aug 2014 09:35:34 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id 089B02613F9 for ; Tue, 26 Aug 2014 18:35:34 +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 YbpStbJsHoQL for ; Tue, 26 Aug 2014 18:35:23 +0200 (CEST) Received: from smtp-03.vodafone.de (smtp-03.vodafone.de [10.215.254.38]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id CA9832613FB for ; Tue, 26 Aug 2014 18:35:23 +0200 (CEST) Received: from smtp-03.vodafone.de ([127.0.0.1]) by localhost (xsmail-dmz7.prod.vfnet.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a6+GfbUc2sHH for ; Tue, 26 Aug 2014 18:35:11 +0200 (CEST) In-Reply-To: <1409070910-2549-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: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKSW5zdGVh ZCBvZiByZXNldHRpbmcgYWxsIGZlbmNlIG51bWJlcnMsIG9ubHkgcmVzZXQgdGhlCm51bWJlciBv ZiB0aGUgcHJvYmxlbWF0aWMgcmluZy4gU3BsaXQgb3V0IGZyb20gYSBwYXRjaApmcm9tIE1hYXJ0 ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBjYW5vbmljYWwuY29tPgoKU2lnbmVkLW9m Zi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmggICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9yYWRlb24vcmFkZW9uX2RldmljZS5jIHwgIDYgKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v cmFkZW9uL3JhZGVvbl9mZW5jZS5jICB8IDEyICsrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yYWRlb25faWIuYyAgICAgfCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDcgaW5zZXJ0 aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb24uaCBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKaW5kZXggODgx MGRmMy4uODIxYmY1MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24u aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCkBAIC0zNzAsNyArMzcwLDcg QEAgc3RydWN0IHJhZGVvbl9mZW5jZSB7CiBpbnQgcmFkZW9uX2ZlbmNlX2RyaXZlcl9zdGFydF9y aW5nKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZyk7CiBpbnQgcmFkZW9uX2Zl bmNlX2RyaXZlcl9pbml0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KTsKIHZvaWQgcmFkZW9u X2ZlbmNlX2RyaXZlcl9maW5pKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KTsKLXZvaWQgcmFk ZW9uX2ZlbmNlX2RyaXZlcl9mb3JjZV9jb21wbGV0aW9uKHN0cnVjdCByYWRlb25fZGV2aWNlICpy ZGV2KTsKK3ZvaWQgcmFkZW9uX2ZlbmNlX2RyaXZlcl9mb3JjZV9jb21wbGV0aW9uKHN0cnVjdCBy YWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZyk7CiBpbnQgcmFkZW9uX2ZlbmNlX2VtaXQoc3Ry dWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIHN0cnVjdCByYWRlb25fZmVuY2UgKipmZW5jZSwgaW50 IHJpbmcpOwogdm9pZCByYWRlb25fZmVuY2VfcHJvY2VzcyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAq cmRldiwgaW50IHJpbmcpOwogYm9vbCByYWRlb25fZmVuY2Vfc2lnbmFsZWQoc3RydWN0IHJhZGVv bl9mZW5jZSAqZmVuY2UpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRl b25fZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYwppbmRl eCBiNmFlZTQwLi5iY2E3ZDQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2Uu YwpAQCAtMTQ4OCw3ICsxNDg4LDYgQEAgaW50IHJhZGVvbl9zdXNwZW5kX2ttcyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBib29sIHN1c3BlbmQsIGJvb2wgZmJjb24pCiAJc3RydWN0IGRybV9jcnRj ICpjcnRjOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7CiAJaW50IGksIHI7Ci0J Ym9vbCBmb3JjZV9jb21wbGV0aW9uID0gZmFsc2U7CiAKIAlpZiAoZGV2ID09IE5VTEwgfHwgZGV2 LT5kZXZfcHJpdmF0ZSA9PSBOVUxMKSB7CiAJCXJldHVybiAtRU5PREVWOwpAQCAtMTUzMiwxMiAr MTUzMSw5IEBAIGludCByYWRlb25fc3VzcGVuZF9rbXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg Ym9vbCBzdXNwZW5kLCBib29sIGZiY29uKQogCQlyID0gcmFkZW9uX2ZlbmNlX3dhaXRfZW1wdHko cmRldiwgaSk7CiAJCWlmIChyKSB7CiAJCQkvKiBkZWxheSBHUFUgcmVzZXQgdG8gcmVzdW1lICov Ci0JCQlmb3JjZV9jb21wbGV0aW9uID0gdHJ1ZTsKKwkJCXJhZGVvbl9mZW5jZV9kcml2ZXJfZm9y Y2VfY29tcGxldGlvbihyZGV2LCBpKTsKIAkJfQogCX0KLQlpZiAoZm9yY2VfY29tcGxldGlvbikg ewotCQlyYWRlb25fZmVuY2VfZHJpdmVyX2ZvcmNlX2NvbXBsZXRpb24ocmRldik7Ci0JfQogCiAJ cmFkZW9uX3NhdmVfYmlvc19zY3JhdGNoX3JlZ3MocmRldik7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbl9mZW5jZS5jCmluZGV4IDViZDgzN2EuLmU4YTI4ZTcgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb25fZmVuY2UuYwpAQCAtNzU4LDcgKzc1OCw3IEBAIHZvaWQgcmFkZW9uX2ZlbmNl X2RyaXZlcl9maW5pKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCQlyID0gcmFkZW9uX2Zl bmNlX3dhaXRfZW1wdHkocmRldiwgcmluZyk7CiAJCWlmIChyKSB7CiAJCQkvKiBubyBuZWVkIHRv IHRyaWdnZXIgR1BVIHJlc2V0IGFzIHdlIGFyZSB1bmxvYWRpbmcgKi8KLQkJCXJhZGVvbl9mZW5j ZV9kcml2ZXJfZm9yY2VfY29tcGxldGlvbihyZGV2KTsKKwkJCXJhZGVvbl9mZW5jZV9kcml2ZXJf Zm9yY2VfY29tcGxldGlvbihyZGV2LCByaW5nKTsKIAkJfQogCQl3YWtlX3VwX2FsbCgmcmRldi0+ ZmVuY2VfcXVldWUpOwogCQlyYWRlb25fc2NyYXRjaF9mcmVlKHJkZXYsIHJkZXYtPmZlbmNlX2Ry dltyaW5nXS5zY3JhdGNoX3JlZyk7CkBAIC03NzEsMTkgKzc3MSwxNSBAQCB2b2lkIHJhZGVvbl9m ZW5jZV9kcml2ZXJfZmluaShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKICAqIHJhZGVvbl9m ZW5jZV9kcml2ZXJfZm9yY2VfY29tcGxldGlvbiAtIGZvcmNlIGFsbCBmZW5jZSB3YWl0ZXIgdG8g Y29tcGxldGUKICAqCiAgKiBAcmRldjogcmFkZW9uIGRldmljZSBwb2ludGVyCisgKiBAcmluZzog dGhlIHJpbmcgdG8gY29tcGxldGUKICAqCiAgKiBJbiBjYXNlIG9mIEdQVSByZXNldCBmYWlsdXJl IG1ha2Ugc3VyZSBubyBwcm9jZXNzIGtlZXAgd2FpdGluZyBvbiBmZW5jZQogICogdGhhdCB3aWxs IG5ldmVyIGNvbXBsZXRlLgogICovCi12b2lkIHJhZGVvbl9mZW5jZV9kcml2ZXJfZm9yY2VfY29t cGxldGlvbihzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKK3ZvaWQgcmFkZW9uX2ZlbmNlX2Ry aXZlcl9mb3JjZV9jb21wbGV0aW9uKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmlu ZykKIHsKLQlpbnQgcmluZzsKLQotCWZvciAocmluZyA9IDA7IHJpbmcgPCBSQURFT05fTlVNX1JJ TkdTOyByaW5nKyspIHsKLQkJaWYgKCFyZGV2LT5mZW5jZV9kcnZbcmluZ10uaW5pdGlhbGl6ZWQp Ci0JCQljb250aW51ZTsKKwlpZiAocmRldi0+ZmVuY2VfZHJ2W3JpbmddLmluaXRpYWxpemVkKQog CQlyYWRlb25fZmVuY2Vfd3JpdGUocmRldiwgcmRldi0+ZmVuY2VfZHJ2W3JpbmddLnN5bmNfc2Vx W3JpbmddLCByaW5nKTsKLQl9CiB9CiAKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb25faWIuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2liLmMKaW5k ZXggNjViMGMyMS4uYmM3N2UwMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25faWIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9pYi5jCkBAIC0y NjgsNiArMjY4LDcgQEAgaW50IHJhZGVvbl9pYl9yaW5nX3Rlc3RzKHN0cnVjdCByYWRlb25fZGV2 aWNlICpyZGV2KQogCiAJCXIgPSByYWRlb25faWJfdGVzdChyZGV2LCBpLCByaW5nKTsKIAkJaWYg KHIpIHsKKwkJCXJhZGVvbl9mZW5jZV9kcml2ZXJfZm9yY2VfY29tcGxldGlvbihyZGV2LCBpKTsK IAkJCXJpbmctPnJlYWR5ID0gZmFsc2U7CiAJCQlyZGV2LT5uZWVkc19yZXNldCA9IGZhbHNlOwog Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK