From mboxrd@z Thu Jan 1 00:00:00 1970 From: j.glisse@gmail.com Subject: [PATCH 16/18] drm/radeon: move the semaphore from the fence into the ib Date: Fri, 4 May 2012 18:43:57 -0400 Message-ID: <1336171439-7672-17-git-send-email-j.glisse@gmail.com> References: <1336171439-7672-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-qc0-f177.google.com (mail-qc0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 784A19F50D for ; Fri, 4 May 2012 15:44:37 -0700 (PDT) Received: by mail-qc0-f177.google.com with SMTP id u28so2491993qcs.36 for ; Fri, 04 May 2012 15:44:37 -0700 (PDT) In-Reply-To: <1336171439-7672-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: Jerome Glisse , =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org RnJvbTogSmVyb21lIEdsaXNzZSA8amdsaXNzZUByZWRoYXQuY29tPgoKSXQgbmV2ZXIgcmVhbGx5 IGJlbG9uZ2VkIHRoZXJlIGluIHRoZSBmaXJzdCBwbGFjZS4KClNpZ25lZC1vZmYtYnk6IENocmlz dGlhbiBLw7ZuaWcgPGRlYXRoc2ltcGxlQHZvZGFmb25lLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uLmggICAgICAgfCAgIDE2ICsrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2NzLmMgICAgfCAgICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2Ry bS9yYWRlb24vcmFkZW9uX2ZlbmNlLmMgfCAgICAzIC0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fcmluZy5jICB8ICAgIDIgKysKIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9u cygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb24uaCBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKaW5kZXggMjQyMjBk MS4uM2I5ZTJkMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCkBAIC0yNzIsNyArMjcyLDYgQEAg c3RydWN0IHJhZGVvbl9mZW5jZSB7CiAJdWludDY0X3QJCQlzZXE7CiAJLyogUkIsIERNQSwgZXRj LiAqLwogCXVuc2lnbmVkCQkJcmluZzsKLQlzdHJ1Y3QgcmFkZW9uX3NlbWFwaG9yZQkJKnNlbWFw aG9yZTsKIH07CiAKIGludCByYWRlb25fZmVuY2VfZHJpdmVyX3N0YXJ0X3Jpbmcoc3RydWN0IHJh ZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nKTsKQEAgLTYxNSwxMyArNjE0LDE0IEBAIHZvaWQg cmFkZW9uX2lycV9rbXNfcGZsaXBfaXJxX3B1dChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwg aW50IGNydGMpOwogICovCiAKIHN0cnVjdCByYWRlb25faWIgewotCXN0cnVjdCByYWRlb25fc2Ff Ym8JKnNhX2JvOwotCXVpbnQzMl90CQlsZW5ndGhfZHc7Ci0JdWludDY0X3QJCWdwdV9hZGRyOwot CXVpbnQzMl90CQkqcHRyOwotCXN0cnVjdCByYWRlb25fZmVuY2UJKmZlbmNlOwotCXVuc2lnbmVk CQl2bV9pZDsKLQlib29sCQkJaXNfY29uc3RfaWI7CisJc3RydWN0IHJhZGVvbl9zYV9ibwkJKnNh X2JvOworCXVpbnQzMl90CQkJbGVuZ3RoX2R3OworCXVpbnQ2NF90CQkJZ3B1X2FkZHI7CisJdWlu dDMyX3QJCQkqcHRyOworCXN0cnVjdCByYWRlb25fZmVuY2UJCSpmZW5jZTsKKwl1bnNpZ25lZAkJ CXZtX2lkOworCWJvb2wJCQkJaXNfY29uc3RfaWI7CisJc3RydWN0IHJhZGVvbl9zZW1hcGhvcmUJ CSpzZW1hcGhvcmU7CiB9OwogCiBzdHJ1Y3QgcmFkZW9uX3JpbmcgewpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uX2NzLmMKaW5kZXggMmFhM2Y4OS4uN2RiZjYzMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9yYWRlb25fY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9jcy5jCkBAIC0xMzgsMTIgKzEzOCwxMiBAQCBzdGF0aWMgaW50IHJhZGVvbl9jc19zeW5j X3JpbmdzKHN0cnVjdCByYWRlb25fY3NfcGFyc2VyICpwKQogCQlyZXR1cm4gMDsKIAl9CiAKLQly ID0gcmFkZW9uX3NlbWFwaG9yZV9jcmVhdGUocC0+cmRldiwgJnAtPmliLT5mZW5jZS0+c2VtYXBo b3JlKTsKKwlyID0gcmFkZW9uX3NlbWFwaG9yZV9jcmVhdGUocC0+cmRldiwgJnAtPmliLT5zZW1h cGhvcmUpOwogCWlmIChyKSB7CiAJCXJldHVybiByOwogCX0KIAotCXJldHVybiByYWRlb25fc2Vt YXBob3JlX3N5bmNfcmluZ3MocC0+cmRldiwgcC0+aWItPmZlbmNlLT5zZW1hcGhvcmUsCisJcmV0 dXJuIHJhZGVvbl9zZW1hcGhvcmVfc3luY19yaW5ncyhwLT5yZGV2LCBwLT5pYi0+c2VtYXBob3Jl LAogCQkJCQkgICBzeW5jX3RvX3JpbmcsIHAtPnJpbmcpOwogfQogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVv bi9yYWRlb25fZmVuY2UuYwppbmRleCA4YjQ3NzhmLi41NDFhZTkyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9mZW5jZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX2ZlbmNlLmMKQEAgLTEzNyw4ICsxMzcsNiBAQCBzdGF0aWMgdm9pZCByYWRl b25fZmVuY2VfZGVzdHJveShzdHJ1Y3Qga3JlZiAqa3JlZikKIAogCWZlbmNlID0gY29udGFpbmVy X29mKGtyZWYsIHN0cnVjdCByYWRlb25fZmVuY2UsIGtyZWYpOwogCWZlbmNlLT5zZXEgPSBSQURF T05fRkVOQ0VfTk9URU1JVEVEX1NFUTsKLQlpZiAoZmVuY2UtPnNlbWFwaG9yZSkKLQkJcmFkZW9u X3NlbWFwaG9yZV9mcmVlKGZlbmNlLT5yZGV2LCBmZW5jZS0+c2VtYXBob3JlLCBOVUxMKTsKIAlr ZnJlZShmZW5jZSk7CiB9CiAKQEAgLTE1NCw3ICsxNTIsNiBAQCBpbnQgcmFkZW9uX2ZlbmNlX2Ny ZWF0ZShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwKIAkoKmZlbmNlKS0+cmRldiA9IHJkZXY7 CiAJKCpmZW5jZSktPnNlcSA9IFJBREVPTl9GRU5DRV9OT1RFTUlURURfU0VROwogCSgqZmVuY2Up LT5yaW5nID0gcmluZzsKLQkoKmZlbmNlKS0+c2VtYXBob3JlID0gTlVMTDsKIAlyZXR1cm4gMDsK IH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fcmluZy5jIGIv ZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fcmluZy5jCmluZGV4IGM3MGEzYjcuLmI0MWFh ODIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3JpbmcuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9yaW5nLmMKQEAgLTkzLDYgKzkzLDcgQEAg aW50IHJhZGVvbl9pYl9nZXQoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYsIGludCByaW5nLAog CSgqaWIpLT5ncHVfYWRkciA9IHJhZGVvbl9zYV9ib19ncHVfYWRkcigoKmliKS0+c2FfYm8pOwog CSgqaWIpLT52bV9pZCA9IDA7CiAJKCppYiktPmlzX2NvbnN0X2liID0gZmFsc2U7CisJKCppYikt PnNlbWFwaG9yZSA9IE5VTEw7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTEwNSw2ICsxMDYsNyBAQCB2 b2lkIHJhZGVvbl9pYl9mcmVlKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2LCBzdHJ1Y3QgcmFk ZW9uX2liICoqaWIpCiAJaWYgKHRtcCA9PSBOVUxMKSB7CiAJCXJldHVybjsKIAl9CisJcmFkZW9u X3NlbWFwaG9yZV9mcmVlKHJkZXYsIHRtcC0+c2VtYXBob3JlLCB0bXAtPmZlbmNlKTsKIAlyYWRl b25fc2FfYm9fZnJlZShyZGV2LCAmdG1wLT5zYV9ibywgdG1wLT5mZW5jZSk7CiAJcmFkZW9uX2Zl bmNlX3VucmVmKCZ0bXAtPmZlbmNlKTsKIAlrZnJlZSh0bXApOwotLSAKMS43LjcuNgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK