From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 7/9] drm/radeon: add timeout argument to, radeon_fence_wait_seq v2 Date: Tue, 26 Aug 2014 18:35:08 +0200 Message-ID: <1409070910-2549-7-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 091F06E53D for ; Tue, 26 Aug 2014 09:35:44 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by pegasos-out.vodafone.de (Rohrpostix1 Daemon) with ESMTP id 76EC5261421 for ; Tue, 26 Aug 2014 18:35:43 +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 PMtO6DWZ-Wu7 for ; Tue, 26 Aug 2014 18:35:33 +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 B93E4261411 for ; Tue, 26 Aug 2014 18:35:24 +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 zVsE-GSG-tWG 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 RnJvbTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGNhbm9uaWNhbC5jb20+ CgpUaGlzIG1ha2VzIGl0IHBvc3NpYmxlIHRvIHdhaXQgZm9yIGEgc3BlY2lmaWMgYW1vdW50IG9m IHRpbWUsCnJhdGhlciB0aGFuIHdhaXQgdW50aWwgaW5maW5pdHkuCgp2MiAoY2hrKTogcmViYXNl ZCBvbiBvdGhlciBjaGFuZ2VzCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh cnRlbi5sYW5raG9yc3RAY2Fub25pY2FsLmNvbT4KU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvD tm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9yYWRl b24vcmFkZW9uX2ZlbmNlLmMgfCA0OCArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMgYi9kcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jCmluZGV4IGFjMTVmMzQuLmE1NGJmZDYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYwpAQCAtMzY0LDI4ICszNjQsMzEgQEAg c3RhdGljIGJvb2wgcmFkZW9uX2ZlbmNlX2FueV9zZXFfc2lnbmFsZWQoc3RydWN0IHJhZGVvbl9k ZXZpY2UgKnJkZXYsIHU2NCAqc2VxKQogfQogCiAvKioKLSAqIHJhZGVvbl9mZW5jZV93YWl0X3Nl cSAtIHdhaXQgZm9yIGEgc3BlY2lmaWMgc2VxdWVuY2UgbnVtYmVycworICogcmFkZW9uX2ZlbmNl X3dhaXRfc2VxX3RpbWVvdXQgLSB3YWl0IGZvciBhIHNwZWNpZmljIHNlcXVlbmNlIG51bWJlcnMK ICAqCiAgKiBAcmRldjogcmFkZW9uIGRldmljZSBwb2ludGVyCiAgKiBAdGFyZ2V0X3NlcTogc2Vx dWVuY2UgbnVtYmVyKHMpIHdlIHdhbnQgdG8gd2FpdCBmb3IKICAqIEBpbnRyOiB1c2UgaW50ZXJy dXB0YWJsZSBzbGVlcAorICogQHRpbWVvdXQ6IG1heGltdW0gdGltZSB0byB3YWl0LCBvciBNQVhf U0NIRURVTEVfVElNRU9VVCBmb3IgaW5maW5pdGUgd2FpdAogICoKICAqIFdhaXQgZm9yIHRoZSBy ZXF1ZXN0ZWQgc2VxdWVuY2UgbnVtYmVyKHMpIHRvIGJlIHdyaXR0ZW4gYnkgYW55IHJpbmcKICAq IChhbGwgYXNpY3MpLiAgU2VxdW5jZSBudW1iZXIgYXJyYXkgaXMgaW5kZXhlZCBieSByaW5nIGlk LgogICogQGludHIgc2VsZWN0cyB3aGV0aGVyIHRvIHVzZSBpbnRlcnJ1cHRhYmxlICh0cnVlKSBv ciBub24taW50ZXJydXB0YWJsZQogICogKGZhbHNlKSBzbGVlcCB3aGVuIHdhaXRpbmcgZm9yIHRo ZSBzZXF1ZW5jZSBudW1iZXIuICBIZWxwZXIgZnVuY3Rpb24KICAqIGZvciByYWRlb25fZmVuY2Vf d2FpdF8qKCkuCi0gKiBSZXR1cm5zIDAgaWYgdGhlIHNlcXVlbmNlIG51bWJlciBoYXMgcGFzc2Vk LCBlcnJvciBmb3IgYWxsIG90aGVyIGNhc2VzLgorICogUmV0dXJucyByZW1haW5pbmcgdGltZSBp ZiB0aGUgc2VxdWVuY2UgbnVtYmVyIGhhcyBwYXNzZWQsIDAgd2hlbgorICogdGhlIHdhaXQgdGlt ZW91dCwgb3IgYW4gZXJyb3IgZm9yIGFsbCBvdGhlciBjYXNlcy4KICAqIC1FREVBRExLIGlzIHJl dHVybmVkIHdoZW4gYSBHUFUgbG9ja3VwIGhhcyBiZWVuIGRldGVjdGVkLgogICovCi1zdGF0aWMg aW50IHJhZGVvbl9mZW5jZV93YWl0X3NlcShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgdTY0 ICp0YXJnZXRfc2VxLAotCQkJCSBib29sIGludHIpCitzdGF0aWMgbG9uZyByYWRlb25fZmVuY2Vf d2FpdF9zZXFfdGltZW91dChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKKwkJCQkJICB1NjQg KnRhcmdldF9zZXEsIGJvb2wgaW50ciwKKwkJCQkJICBsb25nIHRpbWVvdXQpCiB7CiAJbG9uZyBy OwogCWludCBpOwogCiAJaWYgKHJhZGVvbl9mZW5jZV9hbnlfc2VxX3NpZ25hbGVkKHJkZXYsIHRh cmdldF9zZXEpKQotCQlyZXR1cm4gMDsKKwkJcmV0dXJuIHRpbWVvdXQ7CiAKIAkvKiBlbmFibGUg SVJRcyBhbmQgdHJhY2luZyAqLwogCWZvciAoaSA9IDA7IGkgPCBSQURFT05fTlVNX1JJTkdTOyAr K2kpIHsKQEAgLTM5OSwxMSArNDAyLDExIEBAIHN0YXRpYyBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRf c2VxKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCB1NjQgKnRhcmdldF9zZXEsCiAJaWYgKGlu dHIpIHsKIAkJciA9IHdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZV90aW1lb3V0KHJkZXYtPmZlbmNl X3F1ZXVlLCAoCiAJCQlyYWRlb25fZmVuY2VfYW55X3NlcV9zaWduYWxlZChyZGV2LCB0YXJnZXRf c2VxKQotCQkJIHx8IHJkZXYtPm5lZWRzX3Jlc2V0KSwgTUFYX1NDSEVEVUxFX1RJTUVPVVQpOwor CQkJIHx8IHJkZXYtPm5lZWRzX3Jlc2V0KSwgdGltZW91dCk7CiAJfSBlbHNlIHsKIAkJciA9IHdh aXRfZXZlbnRfdGltZW91dChyZGV2LT5mZW5jZV9xdWV1ZSwgKAogCQkJcmFkZW9uX2ZlbmNlX2Fu eV9zZXFfc2lnbmFsZWQocmRldiwgdGFyZ2V0X3NlcSkKLQkJCSB8fCByZGV2LT5uZWVkc19yZXNl dCksIE1BWF9TQ0hFRFVMRV9USU1FT1VUKTsKKwkJCSB8fCByZGV2LT5uZWVkc19yZXNldCksIHRp bWVvdXQpOwogCX0KIAogCWlmIChyZGV2LT5uZWVkc19yZXNldCkKQEAgLTQxNywxNCArNDIwLDE0 IEBAIHN0YXRpYyBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHN0cnVjdCByYWRlb25fZGV2aWNl ICpyZGV2LCB1NjQgKnRhcmdldF9zZXEsCiAJCXRyYWNlX3JhZGVvbl9mZW5jZV93YWl0X2VuZChy ZGV2LT5kZGV2LCBpLCB0YXJnZXRfc2VxW2ldKTsKIAl9CiAKLQlyZXR1cm4gciA8IDAgPyByIDog MDsKKwlyZXR1cm4gcjsKIH0KIAogLyoqCiAgKiByYWRlb25fZmVuY2Vfd2FpdCAtIHdhaXQgZm9y IGEgZmVuY2UgdG8gc2lnbmFsCiAgKgogICogQGZlbmNlOiByYWRlb24gZmVuY2Ugb2JqZWN0Ci0g KiBAaW50cjogdXNlIGludGVycnVwdGFibGUgc2xlZXAKKyAqIEBpbnRyOiB1c2UgaW50ZXJydXB0 aWJsZSBzbGVlcAogICoKICAqIFdhaXQgZm9yIHRoZSByZXF1ZXN0ZWQgZmVuY2UgdG8gc2lnbmFs IChhbGwgYXNpY3MpLgogICogQGludHIgc2VsZWN0cyB3aGV0aGVyIHRvIHVzZSBpbnRlcnJ1cHRh YmxlICh0cnVlKSBvciBub24taW50ZXJydXB0YWJsZQpAQCAtNDM0LDcgKzQzNyw3IEBAIHN0YXRp YyBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCB1 NjQgKnRhcmdldF9zZXEsCiBpbnQgcmFkZW9uX2ZlbmNlX3dhaXQoc3RydWN0IHJhZGVvbl9mZW5j ZSAqZmVuY2UsIGJvb2wgaW50cikKIHsKIAl1aW50NjRfdCBzZXFbUkFERU9OX05VTV9SSU5HU10g PSB7fTsKLQlpbnQgcjsKKwlsb25nIHI7CiAKIAlpZiAoZmVuY2UgPT0gTlVMTCkgewogCQlXQVJO KDEsICJRdWVyeWluZyBhbiBpbnZhbGlkIGZlbmNlIDogJXAgIVxuIiwgZmVuY2UpOwpAQCAtNDQ1 LDkgKzQ0OCwxMCBAQCBpbnQgcmFkZW9uX2ZlbmNlX3dhaXQoc3RydWN0IHJhZGVvbl9mZW5jZSAq ZmVuY2UsIGJvb2wgaW50cikKIAlpZiAoc2VxW2ZlbmNlLT5yaW5nXSA9PSBSQURFT05fRkVOQ0Vf U0lHTkFMRURfU0VRKQogCQlyZXR1cm4gMDsKIAotCXIgPSByYWRlb25fZmVuY2Vfd2FpdF9zZXEo ZmVuY2UtPnJkZXYsIHNlcSwgaW50cik7Ci0JaWYgKHIpCisJciA9IHJhZGVvbl9mZW5jZV93YWl0 X3NlcV90aW1lb3V0KGZlbmNlLT5yZGV2LCBzZXEsIGludHIsIE1BWF9TQ0hFRFVMRV9USU1FT1VU KTsKKwlpZiAociA8IDApIHsKIAkJcmV0dXJuIHI7CisJfQogCiAJZmVuY2UtPnNlcSA9IFJBREVP Tl9GRU5DRV9TSUdOQUxFRF9TRVE7CiAJcmV0dXJuIDA7CkBAIC00NzIsNyArNDc2LDcgQEAgaW50 IHJhZGVvbl9mZW5jZV93YWl0X2FueShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIHsKIAl1 aW50NjRfdCBzZXFbUkFERU9OX05VTV9SSU5HU107CiAJdW5zaWduZWQgaSwgbnVtX3JpbmdzID0g MDsKLQlpbnQgcjsKKwlsb25nIHI7CiAKIAlmb3IgKGkgPSAwOyBpIDwgUkFERU9OX05VTV9SSU5H UzsgKytpKSB7CiAJCXNlcVtpXSA9IDA7CkBAIC00OTMsOCArNDk3LDggQEAgaW50IHJhZGVvbl9m ZW5jZV93YWl0X2FueShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAlpZiAobnVtX3Jpbmdz ID09IDApCiAJCXJldHVybiAtRU5PRU5UOwogCi0JciA9IHJhZGVvbl9mZW5jZV93YWl0X3NlcShy ZGV2LCBzZXEsIGludHIpOwotCWlmIChyKSB7CisJciA9IHJhZGVvbl9mZW5jZV93YWl0X3NlcV90 aW1lb3V0KHJkZXYsIHNlcSwgaW50ciwgTUFYX1NDSEVEVUxFX1RJTUVPVVQpOworCWlmIChyIDwg MCkgewogCQlyZXR1cm4gcjsKIAl9CiAJcmV0dXJuIDA7CkBAIC01MTMsNiArNTE3LDcgQEAgaW50 IHJhZGVvbl9mZW5jZV93YWl0X2FueShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIGludCBy YWRlb25fZmVuY2Vfd2FpdF9uZXh0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmlu ZykKIHsKIAl1aW50NjRfdCBzZXFbUkFERU9OX05VTV9SSU5HU10gPSB7fTsKKwlsb25nIHI7CiAK IAlzZXFbcmluZ10gPSBhdG9taWM2NF9yZWFkKCZyZGV2LT5mZW5jZV9kcnZbcmluZ10ubGFzdF9z ZXEpICsgMVVMTDsKIAlpZiAoc2VxW3JpbmddID49IHJkZXYtPmZlbmNlX2RydltyaW5nXS5zeW5j X3NlcVtyaW5nXSkgewpAQCAtNTIwLDcgKzUyNSwxMCBAQCBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRf bmV4dChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgaW50IHJpbmcpCiAJCSAgIGFscmVhZHkg dGhlIGxhc3QgZW1pdGVkIGZlbmNlICovCiAJCXJldHVybiAtRU5PRU5UOwogCX0KLQlyZXR1cm4g cmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHJkZXYsIHNlcSwgZmFsc2UpOworCXIgPSByYWRlb25fZmVu Y2Vfd2FpdF9zZXFfdGltZW91dChyZGV2LCBzZXEsIGZhbHNlLCBNQVhfU0NIRURVTEVfVElNRU9V VCk7CisJaWYgKHIgPCAwKQorCQlyZXR1cm4gcjsKKwlyZXR1cm4gMDsKIH0KIAogLyoqCkBAIC01 MzYsMTggKzU0NCwxOCBAQCBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfbmV4dChzdHJ1Y3QgcmFkZW9u X2RldmljZSAqcmRldiwgaW50IHJpbmcpCiBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfZW1wdHkoc3Ry dWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKQogewogCXVpbnQ2NF90IHNlcVtSQURF T05fTlVNX1JJTkdTXSA9IHt9OwotCWludCByOworCWxvbmcgcjsKIAogCXNlcVtyaW5nXSA9IHJk ZXYtPmZlbmNlX2RydltyaW5nXS5zeW5jX3NlcVtyaW5nXTsKIAlpZiAoIXNlcVtyaW5nXSkKIAkJ cmV0dXJuIDA7CiAKLQlyID0gcmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHJkZXYsIHNlcSwgZmFsc2Up OwotCWlmIChyKSB7CisJciA9IHJhZGVvbl9mZW5jZV93YWl0X3NlcV90aW1lb3V0KHJkZXYsIHNl cSwgZmFsc2UsIE1BWF9TQ0hFRFVMRV9USU1FT1VUKTsKKwlpZiAociA8IDApIHsKIAkJaWYgKHIg PT0gLUVERUFETEspCiAJCQlyZXR1cm4gLUVERUFETEs7CiAKLQkJZGV2X2VycihyZGV2LT5kZXYs ICJlcnJvciB3YWl0aW5nIGZvciByaW5nWyVkXSB0byBiZWNvbWUgaWRsZSAoJWQpXG4iLAorCQlk ZXZfZXJyKHJkZXYtPmRldiwgImVycm9yIHdhaXRpbmcgZm9yIHJpbmdbJWRdIHRvIGJlY29tZSBp ZGxlICglbGQpXG4iLAogCQkJcmluZywgcik7CiAJfQogCXJldHVybiAwOwotLSAKMS45LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==