From mboxrd@z Thu Jan 1 00:00:00 1970 From: j.glisse@gmail.com Subject: [PATCH 15/27] drm/radeon: add general purpose fence signaled callback Date: Tue, 1 May 2012 13:19:25 -0400 Message-ID: <1335892777-7357-16-git-send-email-j.glisse@gmail.com> References: <ยท> <1335892777-7357-1-git-send-email-j.glisse@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qa0-f42.google.com (mail-qa0-f42.google.com [209.85.216.42]) by gabe.freedesktop.org (Postfix) with ESMTP id A72ABA0900 for ; Tue, 1 May 2012 10:20:17 -0700 (PDT) Received: by mail-qa0-f42.google.com with SMTP id i31so1592646qaf.15 for ; Tue, 01 May 2012 10:20:17 -0700 (PDT) In-Reply-To: <1335892777-7357-1-git-send-email-j.glisse@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8ZGVhdGhzaW1wbGVAdm9kYWZvbmUuZGU+CgpTaG91bGQg YmUgdXNlZCB0byBmcmVlIHJlc291cmNlIHRoYXQgYXJlIHByb3RlY3RlZCBieSBhIGZlbmNlLgoK U2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8ZGVhdGhzaW1wbGVAdm9kYWZvbmUuZGU+ ClJldmlld2VkLWJ5OiBKZXJvbWUgR2xpc3NlIDxqZ2xpc3NlQHJlZGhhdC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCAgICAgICB8ICAgIDggKysrKy0KIGRyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMgfCAgIDUwICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDYgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCBiL2Ry aXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKaW5kZXggZmJiYmM1YS4uMTFjY2ViMyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbi5oCkBAIC0yNTksNyArMjU5LDYgQEAgc3RydWN0IHJhZGVvbl9m ZW5jZV9kcml2ZXIgewogCXdhaXRfcXVldWVfaGVhZF90CQlxdWV1ZTsKIAlzdHJ1Y3QgbGlzdF9o ZWFkCQljcmVhdGVkOwogCXN0cnVjdCBsaXN0X2hlYWQJCWVtaXR0ZWQ7Ci0Jc3RydWN0IGxpc3Rf aGVhZAkJc2lnbmFsZWQ7CiAJYm9vbAkJCQlpbml0aWFsaXplZDsKIH07CiAKQEAgLTI3NCw2ICsy NzMsMTAgQEAgc3RydWN0IHJhZGVvbl9mZW5jZSB7CiAJLyogUkIsIERNQSwgZXRjLiAqLwogCWlu dAkJCQlyaW5nOwogCXN0cnVjdCByYWRlb25fc2VtYXBob3JlCQkqc2VtYXBob3JlOworCisJLyog Y2FsbGVkIHdoZW4gZmVuY2UgaXMgc2lnbmFsZWQgKi8KKwl2b2lkCSgqc2lnbmFsX2NhbGxiYWNr KShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgdm9pZCAqZGF0YSk7CisJdm9pZAkqY2FsbGJh Y2tfZGF0YTsKIH07CiAKIGludCByYWRlb25fZmVuY2VfZHJpdmVyX3N0YXJ0X3Jpbmcoc3RydWN0 IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKTsKQEAgLTI4OSw2ICsyOTIsOSBAQCBpbnQg cmFkZW9uX2ZlbmNlX3dhaXRfZW1wdHkoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCBy aW5nKTsKIHN0cnVjdCByYWRlb25fZmVuY2UgKnJhZGVvbl9mZW5jZV9yZWYoc3RydWN0IHJhZGVv bl9mZW5jZSAqZmVuY2UpOwogdm9pZCByYWRlb25fZmVuY2VfdW5yZWYoc3RydWN0IHJhZGVvbl9m ZW5jZSAqKmZlbmNlKTsKIGludCByYWRlb25fZmVuY2VfY291bnRfZW1pdHRlZChzdHJ1Y3QgcmFk ZW9uX2RldmljZSAqcmRldiwgaW50IHJpbmcpOworYm9vbCByYWRlb25fZmVuY2Vfc2V0X3NpZ25h bF9jYWxsYmFjayhzdHJ1Y3QgcmFkZW9uX2ZlbmNlICpmZW5jZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdm9pZCAoKmNhbGxiYWNrKShzdHJ1Y3QgcmFkZW9uX2Rldmlj ZSAqLCB2b2lkICopLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2b2lk ICpkYXRhKTsKIAogLyoKICAqIFRpbGluZyByZWdpc3RlcnMKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9mZW5jZS5jCmluZGV4IDJkMTM4NDMuLmM1ODY2MGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fZmVuY2UuYwpAQCAtODMsNyArODMsOCBAQCBpbnQgcmFkZW9uX2ZlbmNlX2VtaXQo c3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIHN0cnVjdCByYWRlb25fZmVuY2UgKmZlbmNlKQog CXJldHVybiAwOwogfQogCi1zdGF0aWMgYm9vbCByYWRlb25fZmVuY2VfcG9sbF9sb2NrZWQoc3Ry dWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKQorc3RhdGljIGJvb2wgcmFkZW9uX2Zl bmNlX3BvbGxfbG9ja2VkKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZywKKwkJ CQkgICAgIHN0cnVjdCBsaXN0X2hlYWQgKnNpZ25hbGVkKQogewogCXN0cnVjdCByYWRlb25fZmVu Y2UgKmZlbmNlOwogCXN0cnVjdCBsaXN0X2hlYWQgKmksICpuOwpAQCAtMTEwLDcgKzExMSw3IEBA IHN0YXRpYyBib29sIHJhZGVvbl9mZW5jZV9wb2xsX2xvY2tlZChzdHJ1Y3QgcmFkZW9uX2Rldmlj ZSAqcmRldiwgaW50IHJpbmcpCiAJCWkgPSBuOwogCQlkbyB7CiAJCQluID0gaS0+cHJldjsKLQkJ CWxpc3RfbW92ZV90YWlsKGksICZyZGV2LT5mZW5jZV9kcnZbcmluZ10uc2lnbmFsZWQpOworCQkJ bGlzdF9tb3ZlX3RhaWwoaSwgc2lnbmFsZWQpOwogCQkJZmVuY2UgPSBsaXN0X2VudHJ5KGksIHN0 cnVjdCByYWRlb25fZmVuY2UsIGxpc3QpOwogCQkJZmVuY2UtPnNpZ25hbGVkID0gdHJ1ZTsKIAkJ CWkgPSBuOwpAQCAtMTIwLDYgKzEyMSwyMCBAQCBzdGF0aWMgYm9vbCByYWRlb25fZmVuY2VfcG9s bF9sb2NrZWQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKQogCXJldHVybiB3 YWtlOwogfQogCitzdGF0aWMgdm9pZCByYWRlb25fZmVuY2VfcHJvY2Vzc19zaWduYWxlZChzdHJ1 Y3QgcmFkZW9uX2RldmljZSAqcmRldiwgc3RydWN0IGxpc3RfaGVhZCAqc2lnbmFsZWQpCit7CisJ c3RydWN0IHJhZGVvbl9mZW5jZSAqZmVuY2U7CisJc3RydWN0IGxpc3RfaGVhZCAqaSwgKm47CisK KwlsaXN0X2Zvcl9lYWNoX3NhZmUoaSwgbiwgc2lnbmFsZWQpIHsKKwkJZmVuY2UgPSBsaXN0X2Vu dHJ5KGksIHN0cnVjdCByYWRlb25fZmVuY2UsIGxpc3QpOworCQlsaXN0X2RlbF9pbml0KCZmZW5j ZS0+bGlzdCk7CisJCWlmIChmZW5jZS0+c2lnbmFsX2NhbGxiYWNrKSB7CisJCQlmZW5jZS0+c2ln bmFsX2NhbGxiYWNrKHJkZXYsIGZlbmNlLT5jYWxsYmFja19kYXRhKTsKKwkJfQorCX0KK30KKwog c3RhdGljIHZvaWQgcmFkZW9uX2ZlbmNlX2Rlc3Ryb3koc3RydWN0IGtyZWYgKmtyZWYpCiB7CiAJ dW5zaWduZWQgbG9uZyBpcnFfZmxhZ3M7CkBAIC0xNTIsNiArMTY3LDggQEAgaW50IHJhZGVvbl9m ZW5jZV9jcmVhdGUoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsCiAJKCpmZW5jZSktPnNlcSA9 IDA7CiAJKCpmZW5jZSktPnJpbmcgPSByaW5nOwogCSgqZmVuY2UpLT5zZW1hcGhvcmUgPSBOVUxM OworCSgqZmVuY2UpLT5zaWduYWxfY2FsbGJhY2sgPSBOVUxMOworCSgqZmVuY2UpLT5jYWxsYmFj a19kYXRhID0gTlVMTDsKIAlJTklUX0xJU1RfSEVBRCgmKCpmZW5jZSktPmxpc3QpOwogCiAJd3Jp dGVfbG9ja19pcnFzYXZlKCZyZGV2LT5mZW5jZV9sb2NrLCBpcnFfZmxhZ3MpOwpAQCAtMTY0LDYg KzE4MSw3IEBAIGJvb2wgcmFkZW9uX2ZlbmNlX3NpZ25hbGVkKHN0cnVjdCByYWRlb25fZmVuY2Ug KmZlbmNlKQogewogCXVuc2lnbmVkIGxvbmcgaXJxX2ZsYWdzOwogCWJvb2wgc2lnbmFsZWQgPSBm YWxzZTsKKwlMSVNUX0hFQUQoc2lnbGlzdCk7CiAKIAlpZiAoIWZlbmNlKQogCQlyZXR1cm4gdHJ1 ZTsKQEAgLTE3OSwxMCArMTk3LDEyIEBAIGJvb2wgcmFkZW9uX2ZlbmNlX3NpZ25hbGVkKHN0cnVj dCByYWRlb25fZmVuY2UgKmZlbmNlKQogCQlzaWduYWxlZCA9IHRydWU7CiAJfQogCWlmICghc2ln bmFsZWQpIHsKLQkJcmFkZW9uX2ZlbmNlX3BvbGxfbG9ja2VkKGZlbmNlLT5yZGV2LCBmZW5jZS0+ cmluZyk7CisJCXJhZGVvbl9mZW5jZV9wb2xsX2xvY2tlZChmZW5jZS0+cmRldiwgZmVuY2UtPnJp bmcsICZzaWdsaXN0KTsKIAkJc2lnbmFsZWQgPSBmZW5jZS0+c2lnbmFsZWQ7CiAJfQogCXdyaXRl X3VubG9ja19pcnFyZXN0b3JlKCZmZW5jZS0+cmRldi0+ZmVuY2VfbG9jaywgaXJxX2ZsYWdzKTsK KwlyYWRlb25fZmVuY2VfcHJvY2Vzc19zaWduYWxlZChmZW5jZS0+cmRldiwgJnNpZ2xpc3QpOwor CiAJcmV0dXJuIHNpZ25hbGVkOwogfQogCkBAIC0zNDEsMTAgKzM2MSwxMiBAQCB2b2lkIHJhZGVv bl9mZW5jZV9wcm9jZXNzKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZykKIHsK IAl1bnNpZ25lZCBsb25nIGlycV9mbGFnczsKIAlib29sIHdha2U7CisJTElTVF9IRUFEKHNpZ25h bGVkKTsKIAogCXdyaXRlX2xvY2tfaXJxc2F2ZSgmcmRldi0+ZmVuY2VfbG9jaywgaXJxX2ZsYWdz KTsKLQl3YWtlID0gcmFkZW9uX2ZlbmNlX3BvbGxfbG9ja2VkKHJkZXYsIHJpbmcpOworCXdha2Ug PSByYWRlb25fZmVuY2VfcG9sbF9sb2NrZWQocmRldiwgcmluZywgJnNpZ25hbGVkKTsKIAl3cml0 ZV91bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ZmVuY2VfbG9jaywgaXJxX2ZsYWdzKTsKKwlyYWRl b25fZmVuY2VfcHJvY2Vzc19zaWduYWxlZChyZGV2LCAmc2lnbmFsZWQpOwogCWlmICh3YWtlKSB7 CiAJCXdha2VfdXBfYWxsKCZyZGV2LT5mZW5jZV9kcnZbcmluZ10ucXVldWUpOwogCX0KQEAgLTM3 Myw2ICszOTUsMjUgQEAgaW50IHJhZGVvbl9mZW5jZV9jb3VudF9lbWl0dGVkKHN0cnVjdCByYWRl b25fZGV2aWNlICpyZGV2LCBpbnQgcmluZykKIAlyZXR1cm4gbm90X3Byb2Nlc3NlZDsKIH0KIAor Ym9vbCByYWRlb25fZmVuY2Vfc2V0X3NpZ25hbF9jYWxsYmFjayhzdHJ1Y3QgcmFkZW9uX2ZlbmNl ICpmZW5jZSwKKwkJCQkgICAgICB2b2lkICgqY2FsbGJhY2spKHN0cnVjdCByYWRlb25fZGV2aWNl ICosIHZvaWQgKiksCisJCQkJICAgICAgdm9pZCAqZGF0YSkKK3sKKwlzdHJ1Y3QgcmFkZW9uX2Rl dmljZSAqcmRldiA9IGZlbmNlLT5yZGV2OworCXVuc2lnbmVkIGxvbmcgaXJxX2ZsYWdzOworCWJv b2wgaXNzZXQgPSBmYWxzZTsKKworCS8qIGEgcmVhZGxvY2sgaXMgc3VmaWNpZW50LCBjYXVzZSB0 aGlzIHNob3VsZCBiZSBjYWxsZWQgb25seSBvbmNlICovCisJcmVhZF9sb2NrX2lycXNhdmUoJnJk ZXYtPmZlbmNlX2xvY2ssIGlycV9mbGFncyk7CisJaWYgKGZlbmNlLT5lbWl0dGVkICYmICFmZW5j ZS0+c2lnbmFsZWQpIHsKKwkJZmVuY2UtPnNpZ25hbF9jYWxsYmFjayA9IGNhbGxiYWNrOworCQlm ZW5jZS0+Y2FsbGJhY2tfZGF0YSA9IGRhdGE7CisJCWlzc2V0ID0gdHJ1ZTsKKwl9CisJcmVhZF91 bmxvY2tfaXJxcmVzdG9yZSgmcmRldi0+ZmVuY2VfbG9jaywgaXJxX2ZsYWdzKTsKKwlyZXR1cm4g aXNzZXQ7Cit9CisKIGludCByYWRlb25fZmVuY2VfZHJpdmVyX3N0YXJ0X3Jpbmcoc3RydWN0IHJh ZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKQogewogCXVuc2lnbmVkIGxvbmcgaXJxX2ZsYWdz OwpAQCAtNDEzLDcgKzQ1NCw2IEBAIHN0YXRpYyB2b2lkIHJhZGVvbl9mZW5jZV9kcml2ZXJfaW5p dF9yaW5nKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBpbnQgcmluZykKIAlhdG9taWNfc2V0 KCZyZGV2LT5mZW5jZV9kcnZbcmluZ10uc2VxLCAwKTsKIAlJTklUX0xJU1RfSEVBRCgmcmRldi0+ ZmVuY2VfZHJ2W3JpbmddLmNyZWF0ZWQpOwogCUlOSVRfTElTVF9IRUFEKCZyZGV2LT5mZW5jZV9k cnZbcmluZ10uZW1pdHRlZCk7Ci0JSU5JVF9MSVNUX0hFQUQoJnJkZXYtPmZlbmNlX2RydltyaW5n XS5zaWduYWxlZCk7CiAJaW5pdF93YWl0cXVldWVfaGVhZCgmcmRldi0+ZmVuY2VfZHJ2W3Jpbmdd LnF1ZXVlKTsKIAlyZGV2LT5mZW5jZV9kcnZbcmluZ10uaW5pdGlhbGl6ZWQgPSBmYWxzZTsKIH0K LS0gCjEuNy43LjYKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg==