From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 3/3] drm/radeon: add timeout argument to, radeon_fence_wait_seq Date: Tue, 19 Aug 2014 14:27:53 +0200 Message-ID: <53F342C9.8090907@canonical.com> References: <53F341A3.6060902@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 8C4EC6E5B3 for ; Tue, 19 Aug 2014 05:27:54 -0700 (PDT) In-Reply-To: <53F341A3.6060902@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: =?UTF-8?B?Q2hyaXN0aWFuIEvDtm5pZw==?= , "Deucher, Alexander" Cc: "dri-devel@lists.freedesktop.org" List-Id: dri-devel@lists.freedesktop.org VGhpcyBtYWtlcyBpdCBwb3NzaWJsZSB0byB3YWl0IGZvciBhIHNwZWNpZmljIGFtb3VudCBvZiB0 aW1lLApyYXRoZXIgdGhhbiB3YWl0IHVudGlsIGluZmluaXR5LgoKU2lnbmVkLW9mZi1ieTogTWFh cnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGNhbm9uaWNhbC5jb20+ClJldmlld2Vk LWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxkZWF0aHNpbXBsZUB2b2RhZm9uZS5kZT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jIHwgNTQgKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCspLCAyMyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9m ZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYwppbmRleCA1NzU1 YWJmODFlMDEuLmFkOWFlMjUxY2Q5ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fZmVuY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5j ZS5jCkBAIC0zNDUsMzEgKzM0NSwzNCBAQCBzdGF0aWMgYm9vbCByYWRlb25fZmVuY2VfYW55X3Nl cV9zaWduYWxlZChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgdTY0ICpzZXEpCiB9CiAKIC8q KgotICogcmFkZW9uX2ZlbmNlX3dhaXRfc2VxIC0gd2FpdCBmb3IgYSBzcGVjaWZpYyBzZXF1ZW5j ZSBudW1iZXJzCisgKiByYWRlb25fZmVuY2Vfd2FpdF9zZXFfdGltZW91dCAtIHdhaXQgZm9yIGEg c3BlY2lmaWMgc2VxdWVuY2UgbnVtYmVycwogICoKICAqIEByZGV2OiByYWRlb24gZGV2aWNlIHBv aW50ZXIKICAqIEB0YXJnZXRfc2VxOiBzZXF1ZW5jZSBudW1iZXIocykgd2Ugd2FudCB0byB3YWl0 IGZvcgogICogQGludHI6IHVzZSBpbnRlcnJ1cHRhYmxlIHNsZWVwCisgKiBAdGltZW91dDogbWF4 aW11bSB0aW1lIHRvIHdhaXQsIG9yIE1BWF9TQ0hFRFVMRV9USU1FT1VUIGZvciBpbmZpbml0ZSB3 YWl0CiAgKgogICogV2FpdCBmb3IgdGhlIHJlcXVlc3RlZCBzZXF1ZW5jZSBudW1iZXIocykgdG8g YmUgd3JpdHRlbiBieSBhbnkgcmluZwogICogKGFsbCBhc2ljcykuICBTZXF1bmNlIG51bWJlciBh cnJheSBpcyBpbmRleGVkIGJ5IHJpbmcgaWQuCiAgKiBAaW50ciBzZWxlY3RzIHdoZXRoZXIgdG8g dXNlIGludGVycnVwdGFibGUgKHRydWUpIG9yIG5vbi1pbnRlcnJ1cHRhYmxlCiAgKiAoZmFsc2Up IHNsZWVwIHdoZW4gd2FpdGluZyBmb3IgdGhlIHNlcXVlbmNlIG51bWJlci4gIEhlbHBlciBmdW5j dGlvbgogICogZm9yIHJhZGVvbl9mZW5jZV93YWl0XyooKS4KLSAqIFJldHVybnMgMCBpZiB0aGUg c2VxdWVuY2UgbnVtYmVyIGhhcyBwYXNzZWQsIGVycm9yIGZvciBhbGwgb3RoZXIgY2FzZXMuCisg KiBSZXR1cm5zIHJlbWFpbmluZyB0aW1lIGlmIHRoZSBzZXF1ZW5jZSBudW1iZXIgaGFzIHBhc3Nl ZCwgMCB3aGVuCisgKiB0aGUgd2FpdCB0aW1lb3V0LCBvciBhbiBlcnJvciBmb3IgYWxsIG90aGVy IGNhc2VzLgogICogLUVERUFETEsgaXMgcmV0dXJuZWQgd2hlbiBhIEdQVSBsb2NrdXAgaGFzIGJl ZW4gZGV0ZWN0ZWQuCiAgKi8KLXN0YXRpYyBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHN0cnVj dCByYWRlb25fZGV2aWNlICpyZGV2LCB1NjQgKnRhcmdldF9zZXEsCi0JCQkJIGJvb2wgaW50cikK K3N0YXRpYyBsb25nIHJhZGVvbl9mZW5jZV93YWl0X3NlcV90aW1lb3V0KHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2LAorCQkJCQkgIHU2NCAqdGFyZ2V0X3NlcSwgYm9vbCBpbnRyLAorCQkJCQkg IGxvbmcgdGltZW91dCkKIHsKIAl1aW50NjRfdCBsYXN0X3NlcVtSQURFT05fTlVNX1JJTkdTXTsK IAlib29sIHNpZ25hbGVkOwotCWxvbmcgcjsKKwlsb25nIHIgPSB0aW1lb3V0OwogCWludCBpOwog CiAJc2lnbmFsZWQgPSByYWRlb25fZmVuY2VfYW55X3NlcV9zaWduYWxlZChyZGV2LCB0YXJnZXRf c2VxKTsKLQlpZiAoc2lnbmFsZWQpCi0JCXJldHVybiAwOworCWlmIChzaWduYWxlZCB8fCAhcikK KwkJcmV0dXJuIHI7CiAKIAkvKiBTYXZlIGN1cnJlbnQgc2VxdWVuY2UgdmFsdWVzLCB1c2VkIHRv IGNoZWNrIGZvciBHUFUgbG9ja3VwcyAqLwogCWZvciAoaSA9IDA7IGkgPCBSQURFT05fTlVNX1JJ TkdTOyArK2kpIHsKQEAgLTM4NSwxNCArMzg4LDE0IEBAIHN0YXRpYyBpbnQgcmFkZW9uX2ZlbmNl X3dhaXRfc2VxKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCB1NjQgKnRhcmdldF9zZXEsCiAJ CWlmIChpbnRyKSB7CiAJCQlyID0gd2FpdF9ldmVudF9pbnRlcnJ1cHRpYmxlX3RpbWVvdXQocmRl di0+ZmVuY2VfcXVldWUsICgKIAkJCQkoc2lnbmFsZWQgPSByYWRlb25fZmVuY2VfYW55X3NlcV9z aWduYWxlZChyZGV2LCB0YXJnZXRfc2VxKSkKLQkJCQkgfHwgcmRldi0+bmVlZHNfcmVzZXQpLCBN QVhfU0NIRURVTEVfVElNRU9VVCk7CisJCQkJIHx8IHJkZXYtPm5lZWRzX3Jlc2V0KSwgcik7CiAJ CX0gZWxzZSB7CiAJCQlyID0gd2FpdF9ldmVudF90aW1lb3V0KHJkZXYtPmZlbmNlX3F1ZXVlLCAo CiAJCQkJKHNpZ25hbGVkID0gcmFkZW9uX2ZlbmNlX2FueV9zZXFfc2lnbmFsZWQocmRldiwgdGFy Z2V0X3NlcSkpCi0JCQkJIHx8IHJkZXYtPm5lZWRzX3Jlc2V0KSwgTUFYX1NDSEVEVUxFX1RJTUVP VVQpOworCQkJCSB8fCByZGV2LT5uZWVkc19yZXNldCksIHIpOwogCQl9CiAKLQkJaWYgKHIgPCAw KQorCQlpZiAociA8PSAwKQogCQkJYnJlYWs7CiAKIAkJaWYgKHJkZXYtPm5lZWRzX3Jlc2V0KSB7 CkBAIC00MDksMTQgKzQxMiwxNCBAQCBzdGF0aWMgaW50IHJhZGVvbl9mZW5jZV93YWl0X3NlcShz dHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgdTY0ICp0YXJnZXRfc2VxLAogCQl0cmFjZV9yYWRl b25fZmVuY2Vfd2FpdF9lbmQocmRldi0+ZGRldiwgaSwgdGFyZ2V0X3NlcVtpXSk7CiAJfQogCi0J cmV0dXJuIHIgPCAwID8gciA6IDA7CisJcmV0dXJuIHI7CiB9CiAKIC8qKgogICogcmFkZW9uX2Zl bmNlX3dhaXQgLSB3YWl0IGZvciBhIGZlbmNlIHRvIHNpZ25hbAogICoKICAqIEBmZW5jZTogcmFk ZW9uIGZlbmNlIG9iamVjdAotICogQGludHI6IHVzZSBpbnRlcnJ1cHRhYmxlIHNsZWVwCisgKiBA aW50cjogdXNlIGludGVycnVwdGlibGUgc2xlZXAKICAqCiAgKiBXYWl0IGZvciB0aGUgcmVxdWVz dGVkIGZlbmNlIHRvIHNpZ25hbCAoYWxsIGFzaWNzKS4KICAqIEBpbnRyIHNlbGVjdHMgd2hldGhl ciB0byB1c2UgaW50ZXJydXB0YWJsZSAodHJ1ZSkgb3Igbm9uLWludGVycnVwdGFibGUKQEAgLTQy Niw3ICs0MjksNyBAQCBzdGF0aWMgaW50IHJhZGVvbl9mZW5jZV93YWl0X3NlcShzdHJ1Y3QgcmFk ZW9uX2RldmljZSAqcmRldiwgdTY0ICp0YXJnZXRfc2VxLAogaW50IHJhZGVvbl9mZW5jZV93YWl0 KHN0cnVjdCByYWRlb25fZmVuY2UgKmZlbmNlLCBib29sIGludHIpCiB7CiAJdWludDY0X3Qgc2Vx W1JBREVPTl9OVU1fUklOR1NdID0ge307Ci0JaW50IHI7CisJbG9uZyByOwogCiAJaWYgKGZlbmNl ID09IE5VTEwpIHsKIAkJV0FSTigxLCAiUXVlcnlpbmcgYW4gaW52YWxpZCBmZW5jZSA6ICVwICFc biIsIGZlbmNlKTsKQEAgLTQzNyw5ICs0NDAsMTAgQEAgaW50IHJhZGVvbl9mZW5jZV93YWl0KHN0 cnVjdCByYWRlb25fZmVuY2UgKmZlbmNlLCBib29sIGludHIpCiAJaWYgKHNlcVtmZW5jZS0+cmlu Z10gPT0gUkFERU9OX0ZFTkNFX1NJR05BTEVEX1NFUSkKIAkJcmV0dXJuIDA7CiAKLQlyID0gcmFk ZW9uX2ZlbmNlX3dhaXRfc2VxKGZlbmNlLT5yZGV2LCBzZXEsIGludHIpOwotCWlmIChyKQorCXIg PSByYWRlb25fZmVuY2Vfd2FpdF9zZXFfdGltZW91dChmZW5jZS0+cmRldiwgc2VxLCBpbnRyLCBN QVhfU0NIRURVTEVfVElNRU9VVCk7CisJaWYgKHIgPCAwKSB7CiAJCXJldHVybiByOworCX0KIAog CWZlbmNlLT5zZXEgPSBSQURFT05fRkVOQ0VfU0lHTkFMRURfU0VROwogCXJldHVybiAwOwpAQCAt NDY0LDcgKzQ2OCw3IEBAIGludCByYWRlb25fZmVuY2Vfd2FpdF9hbnkoc3RydWN0IHJhZGVvbl9k ZXZpY2UgKnJkZXYsCiB7CiAJdWludDY0X3Qgc2VxW1JBREVPTl9OVU1fUklOR1NdOwogCXVuc2ln bmVkIGksIG51bV9yaW5ncyA9IDA7Ci0JaW50IHI7CisJbG9uZyByOwogCiAJZm9yIChpID0gMDsg aSA8IFJBREVPTl9OVU1fUklOR1M7ICsraSkgewogCQlzZXFbaV0gPSAwOwpAQCAtNDg1LDggKzQ4 OSw4IEBAIGludCByYWRlb25fZmVuY2Vfd2FpdF9hbnkoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJk ZXYsCiAJaWYgKG51bV9yaW5ncyA9PSAwKQogCQlyZXR1cm4gLUVOT0VOVDsKIAotCXIgPSByYWRl b25fZmVuY2Vfd2FpdF9zZXEocmRldiwgc2VxLCBpbnRyKTsKLQlpZiAocikgeworCXIgPSByYWRl b25fZmVuY2Vfd2FpdF9zZXFfdGltZW91dChyZGV2LCBzZXEsIGludHIsIE1BWF9TQ0hFRFVMRV9U SU1FT1VUKTsKKwlpZiAociA8IDApIHsKIAkJcmV0dXJuIHI7CiAJfQogCXJldHVybiAwOwpAQCAt NTA1LDYgKzUwOSw3IEBAIGludCByYWRlb25fZmVuY2Vfd2FpdF9hbnkoc3RydWN0IHJhZGVvbl9k ZXZpY2UgKnJkZXYsCiBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfbmV4dChzdHJ1Y3QgcmFkZW9uX2Rl dmljZSAqcmRldiwgaW50IHJpbmcpCiB7CiAJdWludDY0X3Qgc2VxW1JBREVPTl9OVU1fUklOR1Nd ID0ge307CisJbG9uZyByOwogCiAJc2VxW3JpbmddID0gYXRvbWljNjRfcmVhZCgmcmRldi0+ZmVu Y2VfZHJ2W3JpbmddLmxhc3Rfc2VxKSArIDFVTEw7CiAJaWYgKHNlcVtyaW5nXSA+PSByZGV2LT5m ZW5jZV9kcnZbcmluZ10uc3luY19zZXFbcmluZ10pIHsKQEAgLTUxMiw3ICs1MTcsMTAgQEAgaW50 IHJhZGVvbl9mZW5jZV93YWl0X25leHQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCBy aW5nKQogCQkgICBhbHJlYWR5IHRoZSBsYXN0IGVtaXRlZCBmZW5jZSAqLwogCQlyZXR1cm4gLUVO T0VOVDsKIAl9Ci0JcmV0dXJuIHJhZGVvbl9mZW5jZV93YWl0X3NlcShyZGV2LCBzZXEsIGZhbHNl KTsKKwlyID0gcmFkZW9uX2ZlbmNlX3dhaXRfc2VxX3RpbWVvdXQocmRldiwgc2VxLCBmYWxzZSwg TUFYX1NDSEVEVUxFX1RJTUVPVVQpOworCWlmIChyIDwgMCkKKwkJcmV0dXJuIHI7CisJcmV0dXJu IDA7CiB9CiAKIC8qKgpAQCAtNTI4LDE4ICs1MzYsMTggQEAgaW50IHJhZGVvbl9mZW5jZV93YWl0 X25leHQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKQogaW50IHJhZGVvbl9m ZW5jZV93YWl0X2VtcHR5KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZykKIHsK IAl1aW50NjRfdCBzZXFbUkFERU9OX05VTV9SSU5HU10gPSB7fTsKLQlpbnQgcjsKKwlsb25nIHI7 CiAKIAlzZXFbcmluZ10gPSByZGV2LT5mZW5jZV9kcnZbcmluZ10uc3luY19zZXFbcmluZ107CiAJ aWYgKCFzZXFbcmluZ10pCiAJCXJldHVybiAwOwogCi0JciA9IHJhZGVvbl9mZW5jZV93YWl0X3Nl cShyZGV2LCBzZXEsIGZhbHNlKTsKLQlpZiAocikgeworCXIgPSByYWRlb25fZmVuY2Vfd2FpdF9z ZXFfdGltZW91dChyZGV2LCBzZXEsIGZhbHNlLCBNQVhfU0NIRURVTEVfVElNRU9VVCk7CisJaWYg KHIgPCAwKSB7CiAJCWlmIChyID09IC1FREVBRExLKQogCQkJcmV0dXJuIC1FREVBRExLOwogCi0J CWRldl9lcnIocmRldi0+ZGV2LCAiZXJyb3Igd2FpdGluZyBmb3IgcmluZ1slZF0gdG8gYmVjb21l IGlkbGUgKCVkKVxuIiwKKwkJZGV2X2VycihyZGV2LT5kZXYsICJlcnJvciB3YWl0aW5nIGZvciBy aW5nWyVkXSB0byBiZWNvbWUgaWRsZSAoJWxkKVxuIiwKIAkJCXJpbmcsIHIpOwogCX0KIAlyZXR1 cm4gMDsKLS0gCjIuMC40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK