From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 08/17] drm/radeon: add timeout argument to radeon_fence_wait_seq Date: Wed, 09 Jul 2014 14:29:48 +0200 Message-ID: <20140709122948.11354.35297.stgit@patser> References: <20140709093124.11354.3774.stgit@patser> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20140709093124.11354.3774.stgit@patser> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: airlied@linux.ie Cc: thellstrom@vmware.com, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, bskeggs@redhat.com, alexander.deucher@amd.com, christian.koenig@amd.com List-Id: nouveau.vger.kernel.org VGhpcyBtYWtlcyBpdCBwb3NzaWJsZSB0byB3YWl0IGZvciBhIHNwZWNpZmljIGFtb3VudCBvZiB0 aW1lLApyYXRoZXIgdGhhbiB3YWl0IHVudGlsIGluZmluaXR5LgoKU2lnbmVkLW9mZi1ieTogTWFh cnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGNhbm9uaWNhbC5jb20+ClJldmlld2Vk LWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxkZWF0aHNpbXBsZUB2b2RhZm9uZS5kZT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jIHwgICA2MCArKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAyMCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9m ZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZmVuY2UuYwppbmRleCA5MTM3 ODcwODVkZmEuLjY0MzU3MTlmZDQ1YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fZmVuY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5j ZS5jCkBAIC0yODMsMjggKzI4MywzNSBAQCBzdGF0aWMgYm9vbCByYWRlb25fZmVuY2VfYW55X3Nl cV9zaWduYWxlZChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgdTY0ICpzZXEpCiB9CiAKIC8q KgotICogcmFkZW9uX2ZlbmNlX3dhaXRfc2VxIC0gd2FpdCBmb3IgYSBzcGVjaWZpYyBzZXF1ZW5j ZSBudW1iZXJzCisgKiByYWRlb25fZmVuY2Vfd2FpdF9zZXFfdGltZW91dCAtIHdhaXQgZm9yIGEg c3BlY2lmaWMgc2VxdWVuY2UgbnVtYmVycwogICoKICAqIEByZGV2OiByYWRlb24gZGV2aWNlIHBv aW50ZXIKICAqIEB0YXJnZXRfc2VxOiBzZXF1ZW5jZSBudW1iZXIocykgd2Ugd2FudCB0byB3YWl0 IGZvcgogICogQGludHI6IHVzZSBpbnRlcnJ1cHRhYmxlIHNsZWVwCisgKiBAdGltZW91dDogbWF4 aW11bSB0aW1lIHRvIHdhaXQsIG9yIE1BWF9TQ0hFRFVMRV9USU1FT1VUIGZvciBpbmZpbml0ZSB3 YWl0CiAgKgogICogV2FpdCBmb3IgdGhlIHJlcXVlc3RlZCBzZXF1ZW5jZSBudW1iZXIocykgdG8g YmUgd3JpdHRlbiBieSBhbnkgcmluZwogICogKGFsbCBhc2ljcykuICBTZXF1bmNlIG51bWJlciBh cnJheSBpcyBpbmRleGVkIGJ5IHJpbmcgaWQuCiAgKiBAaW50ciBzZWxlY3RzIHdoZXRoZXIgdG8g dXNlIGludGVycnVwdGFibGUgKHRydWUpIG9yIG5vbi1pbnRlcnJ1cHRhYmxlCiAgKiAoZmFsc2Up IHNsZWVwIHdoZW4gd2FpdGluZyBmb3IgdGhlIHNlcXVlbmNlIG51bWJlci4gIEhlbHBlciBmdW5j dGlvbgogICogZm9yIHJhZGVvbl9mZW5jZV93YWl0XyooKS4KLSAqIFJldHVybnMgMCBpZiB0aGUg c2VxdWVuY2UgbnVtYmVyIGhhcyBwYXNzZWQsIGVycm9yIGZvciBhbGwgb3RoZXIgY2FzZXMuCisg KiBSZXR1cm5zIHJlbWFpbmluZyB0aW1lIGlmIHRoZSBzZXF1ZW5jZSBudW1iZXIgaGFzIHBhc3Nl ZCwgMCB3aGVuCisgKiB0aGUgd2FpdCB0aW1lb3V0LCBvciBhbiBlcnJvciBmb3IgYWxsIG90aGVy IGNhc2VzLgogICogLUVERUFETEsgaXMgcmV0dXJuZWQgd2hlbiBhIEdQVSBsb2NrdXAgaGFzIGJl ZW4gZGV0ZWN0ZWQuCiAgKi8KLXN0YXRpYyBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfc2VxKHN0cnVj dCByYWRlb25fZGV2aWNlICpyZGV2LCB1NjQgKnRhcmdldF9zZXEsCi0JCQkJIGJvb2wgaW50cikK K3N0YXRpYyBsb25nIHJhZGVvbl9mZW5jZV93YWl0X3NlcV90aW1lb3V0KHN0cnVjdCByYWRlb25f ZGV2aWNlICpyZGV2LAorCQkJCQkgIHU2NCAqdGFyZ2V0X3NlcSwgYm9vbCBpbnRyLAorCQkJCQkg IGxvbmcgdGltZW91dCkKIHsKIAl1aW50NjRfdCBsYXN0X3NlcVtSQURFT05fTlVNX1JJTkdTXTsK IAlib29sIHNpZ25hbGVkOwotCWludCBpLCByOworCWludCBpOwogCiAJd2hpbGUgKCFyYWRlb25f ZmVuY2VfYW55X3NlcV9zaWduYWxlZChyZGV2LCB0YXJnZXRfc2VxKSkgeworCQlsb25nIHIsIHdh aXRlZDsKKworCQl3YWl0ZWQgPSB0aW1lb3V0IDwgUkFERU9OX0ZFTkNFX0pJRkZJRVNfVElNRU9V VCA/CisJCQkgdGltZW91dCA6IFJBREVPTl9GRU5DRV9KSUZGSUVTX1RJTUVPVVQ7CiAKIAkJLyog U2F2ZSBjdXJyZW50IHNlcXVlbmNlIHZhbHVlcywgdXNlZCB0byBjaGVjayBmb3IgR1BVIGxvY2t1 cHMgKi8KIAkJZm9yIChpID0gMDsgaSA8IFJBREVPTl9OVU1fUklOR1M7ICsraSkgewpAQCAtMzE5 LDExICszMjYsMTEgQEAgc3RhdGljIGludCByYWRlb25fZmVuY2Vfd2FpdF9zZXEoc3RydWN0IHJh ZGVvbl9kZXZpY2UgKnJkZXYsIHU2NCAqdGFyZ2V0X3NlcSwKIAkJaWYgKGludHIpIHsKIAkJCXIg PSB3YWl0X2V2ZW50X2ludGVycnVwdGlibGVfdGltZW91dChyZGV2LT5mZW5jZV9xdWV1ZSwgKAog CQkJCShzaWduYWxlZCA9IHJhZGVvbl9mZW5jZV9hbnlfc2VxX3NpZ25hbGVkKHJkZXYsIHRhcmdl dF9zZXEpKQotCQkJCSB8fCByZGV2LT5uZWVkc19yZXNldCksIFJBREVPTl9GRU5DRV9KSUZGSUVT X1RJTUVPVVQpOworCQkJCSB8fCByZGV2LT5uZWVkc19yZXNldCksIHdhaXRlZCk7CiAJCX0gZWxz ZSB7CiAJCQlyID0gd2FpdF9ldmVudF90aW1lb3V0KHJkZXYtPmZlbmNlX3F1ZXVlLCAoCiAJCQkJ KHNpZ25hbGVkID0gcmFkZW9uX2ZlbmNlX2FueV9zZXFfc2lnbmFsZWQocmRldiwgdGFyZ2V0X3Nl cSkpCi0JCQkJIHx8IHJkZXYtPm5lZWRzX3Jlc2V0KSwgUkFERU9OX0ZFTkNFX0pJRkZJRVNfVElN RU9VVCk7CisJCQkJIHx8IHJkZXYtPm5lZWRzX3Jlc2V0KSwgd2FpdGVkKTsKIAkJfQogCiAJCWZv ciAoaSA9IDA7IGkgPCBSQURFT05fTlVNX1JJTkdTOyArK2kpIHsKQEAgLTMzNyw2ICszNDQsMTQg QEAgc3RhdGljIGludCByYWRlb25fZmVuY2Vfd2FpdF9zZXEoc3RydWN0IHJhZGVvbl9kZXZpY2Ug KnJkZXYsIHU2NCAqdGFyZ2V0X3NlcSwKIAkJaWYgKHVubGlrZWx5KHIgPCAwKSkKIAkJCXJldHVy biByOwogCisJCXRpbWVvdXQgLT0gd2FpdGVkIC0gcjsKKworCQkvKgorCQkgKiBJZiB0aGlzIGlz IGEgdGltZWQgd2FpdCBhbmQgdGhlIHdhaXQgY29tcGxldGVseSB0aW1lZCBvdXQganVzdCByZXR1 cm4uCisJCSAqLworCQlpZiAoIXRpbWVvdXQpCisJCQlicmVhazsKKwogCQlpZiAodW5saWtlbHko IXNpZ25hbGVkKSkgewogCQkJaWYgKHJkZXYtPm5lZWRzX3Jlc2V0KQogCQkJCXJldHVybiAtRURF QURMSzsKQEAgLTM3OSwxNCArMzk0LDE0IEBAIHN0YXRpYyBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRf c2VxKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCB1NjQgKnRhcmdldF9zZXEsCiAJCQl9CiAJ CX0KIAl9Ci0JcmV0dXJuIDA7CisJcmV0dXJuIHRpbWVvdXQ7CiB9CiAKIC8qKgogICogcmFkZW9u X2ZlbmNlX3dhaXQgLSB3YWl0IGZvciBhIGZlbmNlIHRvIHNpZ25hbAogICoKICAqIEBmZW5jZTog cmFkZW9uIGZlbmNlIG9iamVjdAotICogQGludHI6IHVzZSBpbnRlcnJ1cHRhYmxlIHNsZWVwCisg KiBAaW50cjogdXNlIGludGVycnVwdGlibGUgc2xlZXAKICAqCiAgKiBXYWl0IGZvciB0aGUgcmVx dWVzdGVkIGZlbmNlIHRvIHNpZ25hbCAoYWxsIGFzaWNzKS4KICAqIEBpbnRyIHNlbGVjdHMgd2hl dGhlciB0byB1c2UgaW50ZXJydXB0YWJsZSAodHJ1ZSkgb3Igbm9uLWludGVycnVwdGFibGUKQEAg LTM5Niw3ICs0MTEsNyBAQCBzdGF0aWMgaW50IHJhZGVvbl9mZW5jZV93YWl0X3NlcShzdHJ1Y3Qg cmFkZW9uX2RldmljZSAqcmRldiwgdTY0ICp0YXJnZXRfc2VxLAogaW50IHJhZGVvbl9mZW5jZV93 YWl0KHN0cnVjdCByYWRlb25fZmVuY2UgKmZlbmNlLCBib29sIGludHIpCiB7CiAJdWludDY0X3Qg c2VxW1JBREVPTl9OVU1fUklOR1NdID0ge307Ci0JaW50IHI7CisJbG9uZyByOwogCiAJaWYgKGZl bmNlID09IE5VTEwpIHsKIAkJV0FSTigxLCAiUXVlcnlpbmcgYW4gaW52YWxpZCBmZW5jZSA6ICVw ICFcbiIsIGZlbmNlKTsKQEAgLTQwNyw5ICs0MjIsMTAgQEAgaW50IHJhZGVvbl9mZW5jZV93YWl0 KHN0cnVjdCByYWRlb25fZmVuY2UgKmZlbmNlLCBib29sIGludHIpCiAJaWYgKHNlcVtmZW5jZS0+ cmluZ10gPT0gUkFERU9OX0ZFTkNFX1NJR05BTEVEX1NFUSkKIAkJcmV0dXJuIDA7CiAKLQlyID0g cmFkZW9uX2ZlbmNlX3dhaXRfc2VxKGZlbmNlLT5yZGV2LCBzZXEsIGludHIpOwotCWlmIChyKQor CXIgPSByYWRlb25fZmVuY2Vfd2FpdF9zZXFfdGltZW91dChmZW5jZS0+cmRldiwgc2VxLCBpbnRy LCBNQVhfU0NIRURVTEVfVElNRU9VVCk7CisJaWYgKHIgPCAwKSB7CiAJCXJldHVybiByOworCX0K IAogCWZlbmNlLT5zZXEgPSBSQURFT05fRkVOQ0VfU0lHTkFMRURfU0VROwogCXJldHVybiAwOwpA QCAtNDM0LDcgKzQ1MCw3IEBAIGludCByYWRlb25fZmVuY2Vfd2FpdF9hbnkoc3RydWN0IHJhZGVv bl9kZXZpY2UgKnJkZXYsCiB7CiAJdWludDY0X3Qgc2VxW1JBREVPTl9OVU1fUklOR1NdOwogCXVu c2lnbmVkIGksIG51bV9yaW5ncyA9IDA7Ci0JaW50IHI7CisJbG9uZyByOwogCiAJZm9yIChpID0g MDsgaSA8IFJBREVPTl9OVU1fUklOR1M7ICsraSkgewogCQlzZXFbaV0gPSAwOwpAQCAtNDU1LDgg KzQ3MSw4IEBAIGludCByYWRlb25fZmVuY2Vfd2FpdF9hbnkoc3RydWN0IHJhZGVvbl9kZXZpY2Ug KnJkZXYsCiAJaWYgKG51bV9yaW5ncyA9PSAwKQogCQlyZXR1cm4gLUVOT0VOVDsKIAotCXIgPSBy YWRlb25fZmVuY2Vfd2FpdF9zZXEocmRldiwgc2VxLCBpbnRyKTsKLQlpZiAocikgeworCXIgPSBy YWRlb25fZmVuY2Vfd2FpdF9zZXFfdGltZW91dChyZGV2LCBzZXEsIGludHIsIE1BWF9TQ0hFRFVM RV9USU1FT1VUKTsKKwlpZiAociA8IDApIHsKIAkJcmV0dXJuIHI7CiAJfQogCXJldHVybiAwOwpA QCAtNDc1LDYgKzQ5MSw3IEBAIGludCByYWRlb25fZmVuY2Vfd2FpdF9hbnkoc3RydWN0IHJhZGVv bl9kZXZpY2UgKnJkZXYsCiBpbnQgcmFkZW9uX2ZlbmNlX3dhaXRfbmV4dChzdHJ1Y3QgcmFkZW9u X2RldmljZSAqcmRldiwgaW50IHJpbmcpCiB7CiAJdWludDY0X3Qgc2VxW1JBREVPTl9OVU1fUklO R1NdID0ge307CisJbG9uZyByOwogCiAJc2VxW3JpbmddID0gYXRvbWljNjRfcmVhZCgmcmRldi0+ ZmVuY2VfZHJ2W3JpbmddLmxhc3Rfc2VxKSArIDFVTEw7CiAJaWYgKHNlcVtyaW5nXSA+PSByZGV2 LT5mZW5jZV9kcnZbcmluZ10uc3luY19zZXFbcmluZ10pIHsKQEAgLTQ4Miw3ICs0OTksMTAgQEAg aW50IHJhZGVvbl9mZW5jZV93YWl0X25leHQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGlu dCByaW5nKQogCQkgICBhbHJlYWR5IHRoZSBsYXN0IGVtaXRlZCBmZW5jZSAqLwogCQlyZXR1cm4g LUVOT0VOVDsKIAl9Ci0JcmV0dXJuIHJhZGVvbl9mZW5jZV93YWl0X3NlcShyZGV2LCBzZXEsIGZh bHNlKTsKKwlyID0gcmFkZW9uX2ZlbmNlX3dhaXRfc2VxX3RpbWVvdXQocmRldiwgc2VxLCBmYWxz ZSwgTUFYX1NDSEVEVUxFX1RJTUVPVVQpOworCWlmIChyIDwgMCkKKwkJcmV0dXJuIHI7CisJcmV0 dXJuIDA7CiB9CiAKIC8qKgpAQCAtNDk4LDE4ICs1MTgsMTggQEAgaW50IHJhZGVvbl9mZW5jZV93 YWl0X25leHQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKQogaW50IHJhZGVv bl9mZW5jZV93YWl0X2VtcHR5KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZykK IHsKIAl1aW50NjRfdCBzZXFbUkFERU9OX05VTV9SSU5HU10gPSB7fTsKLQlpbnQgcjsKKwlsb25n IHI7CiAKIAlzZXFbcmluZ10gPSByZGV2LT5mZW5jZV9kcnZbcmluZ10uc3luY19zZXFbcmluZ107 CiAJaWYgKCFzZXFbcmluZ10pCiAJCXJldHVybiAwOwogCi0JciA9IHJhZGVvbl9mZW5jZV93YWl0 X3NlcShyZGV2LCBzZXEsIGZhbHNlKTsKLQlpZiAocikgeworCXIgPSByYWRlb25fZmVuY2Vfd2Fp dF9zZXFfdGltZW91dChyZGV2LCBzZXEsIGZhbHNlLCBNQVhfU0NIRURVTEVfVElNRU9VVCk7CisJ aWYgKHIgPCAwKSB7CiAJCWlmIChyID09IC1FREVBRExLKQogCQkJcmV0dXJuIC1FREVBRExLOwog Ci0JCWRldl9lcnIocmRldi0+ZGV2LCAiZXJyb3Igd2FpdGluZyBmb3IgcmluZ1slZF0gdG8gYmVj b21lIGlkbGUgKCVkKVxuIiwKKwkJZGV2X2VycihyZGV2LT5kZXYsICJlcnJvciB3YWl0aW5nIGZv ciByaW5nWyVkXSB0byBiZWNvbWUgaWRsZSAoJWxkKVxuIiwKIAkJCXJpbmcsIHIpOwogCX0KIAly ZXR1cm4gMDsKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==