From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 3/3] drm/radeon: add timeout argument to radeon_fence_wait_seq Date: Mon, 18 Aug 2014 16:46:29 +0200 Message-ID: <53F211C5.3050406@canonical.com> References: <53F2118F.8000706@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by gabe.freedesktop.org (Postfix) with ESMTP id EEC266E472 for ; Mon, 18 Aug 2014 07:46:29 -0700 (PDT) In-Reply-To: <53F2118F.8000706@canonical.com> 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" , =?UTF-8?B?Q2hyaXN0aWFuIEvDtm5pZw==?= List-Id: dri-devel@lists.freedesktop.org VGhpcyBtYWtlcyBpdCBwb3NzaWJsZSB0byB3YWl0IGZvciBhIHNwZWNpZmljIGFtb3VudCBvZiB0 aW1lLApyYXRoZXIgdGhhbiB3YWl0IHVudGlsIGluZmluaXR5LgoKU2lnbmVkLW9mZi1ieTogTWFh cnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGNhbm9uaWNhbC5jb20+ClJldmlld2Vk LWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxkZWF0aHNpbXBsZUB2b2RhZm9uZS5kZT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jIHwgNTAgKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCAyMCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9m ZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYwppbmRleCA5NGVj YTUzZDk5ZjguLmU4ZWE0MjM2NDhhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fZmVuY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5j ZS5jCkBAIC0zMjAsMjIgKzMyMCwyNSBAQCBzdGF0aWMgYm9vbCByYWRlb25fZmVuY2VfYW55X3Nl cV9zaWduYWxlZChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgdTY0ICpzZXEpCiB9CiAKIC8q KgotICogcmFkZW9uX2ZlbmNlX3dhaXRfc2VxIC0gd2FpdCBmb3IgYSBzcGVjaWZpYyBzZXF1ZW5j ZSBudW1iZXJzCisgKiByYWRlb25fZmVuY2Vfd2FpdF9zZXFfdGltZW91dCAtIHdhaXQgZm9yIGEg c3BlY2lmaWMgc2VxdWVuY2UgbnVtYmVycwogICoKICAqIEByZGV2OiByYWRlb24gZGV2aWNlIHBv aW50ZXIKICAqIEB0YXJnZXRfc2VxOiBzZXF1ZW5jZSBudW1iZXIocykgd2Ugd2FudCB0byB3YWl0 IGZvcgogICogQGludHI6IHVzZSBpbnRlcnJ1cHRhYmxlIHNsZWVwCisgKiBAdGltZW91dDogbWF4 aW11bSB0aW1lIHRvIHdhaXQsIG9yIE1BWF9TQ0hFRFVMRV9USU1FT1VUIGZvciBpbmZpbml0ZSB3 YWl0CiAgKgogICogV2FpdCBmb3IgdGhlIHJlcXVlc3RlZCBzZXF1ZW5jZSBudW1iZXIocykgdG8g YmUgd3JpdHRlbiBieSBhbnkgcmluZwogICogKGFsbCBhc2ljcykuICBTZXF1bmNlIG51bWJlciBh cnJheSBpcyBpbmRleGVkIGJ5IHJpbmcgaWQuCiAgKiBAaW50ciBzZWxlY3RzIHdoZXRoZXIgdG8g dXNlIGludGVycnVwdGFibGUgKHRydWUpIG9yIG5vbi1pbnRlcnJ1cHRhYmxlCiAgKiAoZmFsc2Up IHNsZWVwIHdoZW4gd2FpdGluZyBmb3IgdGhlIHNlcXVlbmNlIG51bWJlci4gIEhlbHBlciBmdW5j dGlvbgogICogZm9yIHJhZGVvbl9mZW5jZV93YWl0XyooKS4KLSAqIFJldHVybnMgMCBpZiB0aGUg c2VxdWVuY2UgbnVtYmVyIGhhcyBwYXNzZWQsIGVycm9yIGZvciBhbGwgb3RoZXIgY2FzZXMuCisg KiBSZXR1cm5zIHJlbWFpbmluZyB0aW1lIGlmIHRoZSBzZXF1ZW5jZSBudW1iZXIgaGFzIHBhc3Nl ZCwgMCB3aGVuCisgKiB0aGUgd2FpdCB0aW1lb3V0LCBvciBhbiBlcnJvciBmb3IgYWxsIG90aGVy IGNhc2VzLgogICogLUVERUFETEsgaXMgcmV0dXJuZWQgd2hlbiBhIEdQVSBsb2NrdXAgaGFzIGJl ZW4gZGV0ZWN0ZWQuCiAgKi8KLXN0YXRpYyBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHN0cnVj dCByYWRlb25fZGV2aWNlICpyZGV2LCB1NjQgKnRhcmdldF9zZXEsCi0JCQkJIGJvb2wgaW50cikK K3N0YXRpYyBsb25nIHJhZGVvbl9mZW5jZV93YWl0X3NlcV90aW1lb3V0KHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2LAorCQkJCQkgIHU2NCAqdGFyZ2V0X3NlcSwgYm9vbCBpbnRyLAorCQkJCQkg IGxvbmcgdGltZW91dCkKIHsKIAl1aW50NjRfdCBsYXN0X3NlcVtSQURFT05fTlVNX1JJTkdTXTsK IAlib29sIHNpZ25hbGVkOwpAQCAtMzU3LDExICszNjAsMTEgQEAgc3RhdGljIGludCByYWRlb25f ZmVuY2Vfd2FpdF9zZXEoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIHU2NCAqdGFyZ2V0X3Nl cSwKIAkJaWYgKGludHIpIHsKIAkJCXIgPSB3YWl0X2V2ZW50X2ludGVycnVwdGlibGVfdGltZW91 dChyZGV2LT5mZW5jZV9xdWV1ZSwgKAogCQkJCShzaWduYWxlZCA9IHJhZGVvbl9mZW5jZV9hbnlf c2VxX3NpZ25hbGVkKHJkZXYsIHRhcmdldF9zZXEpKQotCQkJCSB8fCByZGV2LT5uZWVkc19yZXNl dCksIE1BWF9TQ0hFRFVMRV9USU1FT1VUKTsKKwkJCQkgfHwgcmRldi0+bmVlZHNfcmVzZXQpLCB0 aW1lb3V0KTsKIAkJfSBlbHNlIHsKIAkJCXIgPSB3YWl0X2V2ZW50X3RpbWVvdXQocmRldi0+ZmVu Y2VfcXVldWUsICgKIAkJCQkoc2lnbmFsZWQgPSByYWRlb25fZmVuY2VfYW55X3NlcV9zaWduYWxl ZChyZGV2LCB0YXJnZXRfc2VxKSkKLQkJCQkgfHwgcmRldi0+bmVlZHNfcmVzZXQpLCBNQVhfU0NI RURVTEVfVElNRU9VVCk7CisJCQkJIHx8IHJkZXYtPm5lZWRzX3Jlc2V0KSwgdGltZW91dCk7CiAJ CX0KIAogCQlmb3IgKGkgPSAwOyBpIDwgUkFERU9OX05VTV9SSU5HUzsgKytpKSB7CkBAIC0zNzIs MjAgKzM3NSwyMiBAQCBzdGF0aWMgaW50IHJhZGVvbl9mZW5jZV93YWl0X3NlcShzdHJ1Y3QgcmFk ZW9uX2RldmljZSAqcmRldiwgdTY0ICp0YXJnZXRfc2VxLAogCQkJdHJhY2VfcmFkZW9uX2ZlbmNl X3dhaXRfZW5kKHJkZXYtPmRkZXYsIGksIHRhcmdldF9zZXFbaV0pOwogCQl9CiAKLQkJaWYgKHIg PCAwKQorCQlpZiAociA8PSAwKQogCQkJcmV0dXJuIHI7CiAKIAkJaWYgKHJkZXYtPm5lZWRzX3Jl c2V0KQogCQkJcmV0dXJuIC1FREVBRExLOworCisJCXRpbWVvdXQgPSByOwogCX0KLQlyZXR1cm4g MDsKKwlyZXR1cm4gdGltZW91dDsKIH0KIAogLyoqCiAgKiByYWRlb25fZmVuY2Vfd2FpdCAtIHdh aXQgZm9yIGEgZmVuY2UgdG8gc2lnbmFsCiAgKgogICogQGZlbmNlOiByYWRlb24gZmVuY2Ugb2Jq ZWN0Ci0gKiBAaW50cjogdXNlIGludGVycnVwdGFibGUgc2xlZXAKKyAqIEBpbnRyOiB1c2UgaW50 ZXJydXB0aWJsZSBzbGVlcAogICoKICAqIFdhaXQgZm9yIHRoZSByZXF1ZXN0ZWQgZmVuY2UgdG8g c2lnbmFsIChhbGwgYXNpY3MpLgogICogQGludHIgc2VsZWN0cyB3aGV0aGVyIHRvIHVzZSBpbnRl cnJ1cHRhYmxlICh0cnVlKSBvciBub24taW50ZXJydXB0YWJsZQpAQCAtMzk1LDcgKzQwMCw3IEBA IHN0YXRpYyBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHN0cnVjdCByYWRlb25fZGV2aWNlICpy ZGV2LCB1NjQgKnRhcmdldF9zZXEsCiBpbnQgcmFkZW9uX2ZlbmNlX3dhaXQoc3RydWN0IHJhZGVv bl9mZW5jZSAqZmVuY2UsIGJvb2wgaW50cikKIHsKIAl1aW50NjRfdCBzZXFbUkFERU9OX05VTV9S SU5HU10gPSB7fTsKLQlpbnQgcjsKKwlsb25nIHI7CiAKIAlpZiAoZmVuY2UgPT0gTlVMTCkgewog CQlXQVJOKDEsICJRdWVyeWluZyBhbiBpbnZhbGlkIGZlbmNlIDogJXAgIVxuIiwgZmVuY2UpOwpA QCAtNDA2LDkgKzQxMSwxMCBAQCBpbnQgcmFkZW9uX2ZlbmNlX3dhaXQoc3RydWN0IHJhZGVvbl9m ZW5jZSAqZmVuY2UsIGJvb2wgaW50cikKIAlpZiAoc2VxW2ZlbmNlLT5yaW5nXSA9PSBSQURFT05f RkVOQ0VfU0lHTkFMRURfU0VRKQogCQlyZXR1cm4gMDsKIAotCXIgPSByYWRlb25fZmVuY2Vfd2Fp dF9zZXEoZmVuY2UtPnJkZXYsIHNlcSwgaW50cik7Ci0JaWYgKHIpCisJciA9IHJhZGVvbl9mZW5j ZV93YWl0X3NlcV90aW1lb3V0KGZlbmNlLT5yZGV2LCBzZXEsIGludHIsIE1BWF9TQ0hFRFVMRV9U SU1FT1VUKTsKKwlpZiAociA8IDApIHsKIAkJcmV0dXJuIHI7CisJfQogCiAJZmVuY2UtPnNlcSA9 IFJBREVPTl9GRU5DRV9TSUdOQUxFRF9TRVE7CiAJcmV0dXJuIDA7CkBAIC00MzMsNyArNDM5LDcg QEAgaW50IHJhZGVvbl9mZW5jZV93YWl0X2FueShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwK IHsKIAl1aW50NjRfdCBzZXFbUkFERU9OX05VTV9SSU5HU107CiAJdW5zaWduZWQgaSwgbnVtX3Jp bmdzID0gMDsKLQlpbnQgcjsKKwlsb25nIHI7CiAKIAlmb3IgKGkgPSAwOyBpIDwgUkFERU9OX05V TV9SSU5HUzsgKytpKSB7CiAJCXNlcVtpXSA9IDA7CkBAIC00NTQsOCArNDYwLDggQEAgaW50IHJh ZGVvbl9mZW5jZV93YWl0X2FueShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAlpZiAobnVt X3JpbmdzID09IDApCiAJCXJldHVybiAtRU5PRU5UOwogCi0JciA9IHJhZGVvbl9mZW5jZV93YWl0 X3NlcShyZGV2LCBzZXEsIGludHIpOwotCWlmIChyKSB7CisJciA9IHJhZGVvbl9mZW5jZV93YWl0 X3NlcV90aW1lb3V0KHJkZXYsIHNlcSwgaW50ciwgTUFYX1NDSEVEVUxFX1RJTUVPVVQpOworCWlm IChyIDwgMCkgewogCQlyZXR1cm4gcjsKIAl9CiAJcmV0dXJuIDA7CkBAIC00NzQsNiArNDgwLDcg QEAgaW50IHJhZGVvbl9mZW5jZV93YWl0X2FueShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwK IGludCByYWRlb25fZmVuY2Vfd2FpdF9uZXh0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBp bnQgcmluZykKIHsKIAl1aW50NjRfdCBzZXFbUkFERU9OX05VTV9SSU5HU10gPSB7fTsKKwlsb25n IHI7CiAKIAlzZXFbcmluZ10gPSBhdG9taWM2NF9yZWFkKCZyZGV2LT5mZW5jZV9kcnZbcmluZ10u bGFzdF9zZXEpICsgMVVMTDsKIAlpZiAoc2VxW3JpbmddID49IHJkZXYtPmZlbmNlX2RydltyaW5n XS5zeW5jX3NlcVtyaW5nXSkgewpAQCAtNDgxLDcgKzQ4OCwxMCBAQCBpbnQgcmFkZW9uX2ZlbmNl X3dhaXRfbmV4dChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgaW50IHJpbmcpCiAJCSAgIGFs cmVhZHkgdGhlIGxhc3QgZW1pdGVkIGZlbmNlICovCiAJCXJldHVybiAtRU5PRU5UOwogCX0KLQly ZXR1cm4gcmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHJkZXYsIHNlcSwgZmFsc2UpOworCXIgPSByYWRl b25fZmVuY2Vfd2FpdF9zZXFfdGltZW91dChyZGV2LCBzZXEsIGZhbHNlLCBNQVhfU0NIRURVTEVf VElNRU9VVCk7CisJaWYgKHIgPCAwKQorCQlyZXR1cm4gcjsKKwlyZXR1cm4gMDsKIH0KIAogLyoq CkBAIC00OTcsMTggKzUwNywxOCBAQCBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfbmV4dChzdHJ1Y3Qg cmFkZW9uX2RldmljZSAqcmRldiwgaW50IHJpbmcpCiBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfZW1w dHkoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKQogewogCXVpbnQ2NF90IHNl cVtSQURFT05fTlVNX1JJTkdTXSA9IHt9OwotCWludCByOworCWxvbmcgcjsKIAogCXNlcVtyaW5n XSA9IHJkZXYtPmZlbmNlX2RydltyaW5nXS5zeW5jX3NlcVtyaW5nXTsKIAlpZiAoIXNlcVtyaW5n XSkKIAkJcmV0dXJuIDA7CiAKLQlyID0gcmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHJkZXYsIHNlcSwg ZmFsc2UpOwotCWlmIChyKSB7CisJciA9IHJhZGVvbl9mZW5jZV93YWl0X3NlcV90aW1lb3V0KHJk ZXYsIHNlcSwgZmFsc2UsIE1BWF9TQ0hFRFVMRV9USU1FT1VUKTsKKwlpZiAociA8IDApIHsKIAkJ aWYgKHIgPT0gLUVERUFETEspCiAJCQlyZXR1cm4gLUVERUFETEs7CiAKLQkJZGV2X2VycihyZGV2 LT5kZXYsICJlcnJvciB3YWl0aW5nIGZvciByaW5nWyVkXSB0byBiZWNvbWUgaWRsZSAoJWQpXG4i LAorCQlkZXZfZXJyKHJkZXYtPmRldiwgImVycm9yIHdhaXRpbmcgZm9yIHJpbmdbJWRdIHRvIGJl Y29tZSBpZGxlICglbGQpXG4iLAogCQkJcmluZywgcik7CiAJfQogCXJldHVybiAwOwotLSAKMi4w LjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=