From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 093/111] staging: etnaviv: take gpu instead of pipe as input to fence wait function Date: Thu, 2 Apr 2015 17:30:35 +0200 Message-ID: <1427988653-754-94-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id ACC836EA79 for ; Thu, 2 Apr 2015 08:31:01 -0700 (PDT) In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> 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 Cc: Russell King , kernel@pengutronix.de List-Id: dri-devel@lists.freedesktop.org T3RoZXIgdXNlcnMgbWF5IG9ubHkgaGF2ZSB0aGUgZ3B1IHBvaW50ZXIgYXZhaWxhYmxlIGFuZCBp dCdzIGVhc3kgdG8gY29udmVydApmcm9tIHBpcGUgdG8gZ3B1IGluIHRoZSBpb2N0bCBwYXRoLgoK U2lnbmVkLW9mZi1ieTogTHVjYXMgU3RhY2ggPGwuc3RhY2hAcGVuZ3V0cm9uaXguZGU+Ci0tLQog ZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9kcnYuYyB8IDI0ICsrKysrKysrKysrKyst LS0tLS0tLS0tLQogZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9kcnYuaCB8ICA1ICsr Ky0tCiAyIGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZHJ2LmMgYi9kcml2 ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5jCmluZGV4IDgzY2FiMzYxNzBmMy4uMzA4 OTZmOWFmYTFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Ry di5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfZHJ2LmMKQEAgLTMwMSwy MCArMzAxLDEzIEBAIHN0YXRpYyB2b2lkIGV0bmF2aXZfZGVidWdmc19jbGVhbnVwKHN0cnVjdCBk cm1fbWlub3IgKm1pbm9yKQogLyoKICAqIEZlbmNlczoKICAqLwotaW50IGV0bmF2aXZfd2FpdF9m ZW5jZV9pbnRlcnJ1cHRhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQzMl90IHBpcGUs Ci0JCXVpbnQzMl90IGZlbmNlLCBzdHJ1Y3QgdGltZXNwZWMgKnRpbWVvdXQpCitpbnQgZXRuYXZp dl93YWl0X2ZlbmNlX2ludGVycnVwdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJc3Ry dWN0IGV0bmF2aXZfZ3B1ICpncHUsIHVpbnQzMl90IGZlbmNlLAorCQlzdHJ1Y3QgdGltZXNwZWMg KnRpbWVvdXQpCiB7CiAJc3RydWN0IGV0bmF2aXZfZHJtX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwotCXN0cnVjdCBldG5hdml2X2dwdSAqZ3B1OwogCWludCByZXQ7CiAKLQlpZiAo cGlwZSA+PSBFVE5BX01BWF9QSVBFUykKLQkJcmV0dXJuIC1FSU5WQUw7Ci0KLQlncHUgPSBwcml2 LT5ncHVbcGlwZV07Ci0JaWYgKCFncHUpCi0JCXJldHVybiAtRU5YSU87Ci0KIAlpZiAoZmVuY2Vf YWZ0ZXIoZmVuY2UsIGdwdS0+c3VibWl0dGVkX2ZlbmNlKSkgewogCQlEUk1fRVJST1IoIndhaXRp bmcgb24gaW52YWxpZCBmZW5jZTogJXUgKG9mICV1KVxuIiwKIAkJCQlmZW5jZSwgZ3B1LT5zdWJt aXR0ZWRfZmVuY2UpOwpAQCAtNDU4LDkgKzQ1MSwxOCBAQCBzdGF0aWMgaW50IGV0bmF2aXZfaW9j dGxfZ2VtX2luZm8oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIHN0YXRpYyBp bnQgZXRuYXZpdl9pb2N0bF93YWl0X2ZlbmNlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCiAJCXN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIHsKKwlzdHJ1Y3QgZXRuYXZpdl9kcm1f cHJpdmF0ZSAqcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGV0bmF2aXZfZ3B1ICpn cHU7CiAJc3RydWN0IGRybV9ldG5hdml2X3dhaXRfZmVuY2UgKmFyZ3MgPSBkYXRhOwogCi0JcmV0 dXJuIGV0bmF2aXZfd2FpdF9mZW5jZV9pbnRlcnJ1cHRhYmxlKGRldiwgYXJncy0+cGlwZSwgYXJn cy0+ZmVuY2UsCisJaWYgKGFyZ3MtPnBpcGUgPj0gRVROQV9NQVhfUElQRVMpCisJCXJldHVybiAt RUlOVkFMOworCisJZ3B1ID0gcHJpdi0+Z3B1W2FyZ3MtPnBpcGVdOworCWlmICghZ3B1KQorCQly ZXR1cm4gLUVOT0RFVjsKKworCXJldHVybiBldG5hdml2X3dhaXRfZmVuY2VfaW50ZXJydXB0YWJs ZShkZXYsIGdwdSwgYXJncy0+ZmVuY2UsCiAJCQkJCQkmVFMoYXJncy0+dGltZW91dCkpOwogfQog CmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5oIGIvZHJp dmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9kcnYuaAppbmRleCA0Yzg0OGFmYWI4NzYuLjVj MzI1MGI3NzJjYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9k cnYuaAorKysgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2Rydi5oCkBAIC02OCw4 ICs2OCw5IEBAIHN0cnVjdCBldG5hdml2X2RybV9wcml2YXRlIHsKIAogdm9pZCBldG5hdml2X3Jl Z2lzdGVyX21tdShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZXRuYXZpdl9pb21tdSAq bW11KTsKIAotaW50IGV0bmF2aXZfd2FpdF9mZW5jZV9pbnRlcnJ1cHRhYmxlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVpbnQzMl90IHBpcGUsCi0JCXVpbnQzMl90IGZlbmNlLAlzdHJ1Y3QgdGlt ZXNwZWMgKnRpbWVvdXQpOworaW50IGV0bmF2aXZfd2FpdF9mZW5jZV9pbnRlcnJ1cHRhYmxlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCXN0cnVjdCBldG5hdml2X2dwdSAqZ3B1LCB1aW50MzJf dCBmZW5jZSwKKwkJc3RydWN0IHRpbWVzcGVjICp0aW1lb3V0KTsKIHZvaWQgZXRuYXZpdl91cGRh dGVfZmVuY2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDMyX3QgZmVuY2UpOwogCiBpbnQg ZXRuYXZpdl9pb2N0bF9nZW1fc3VibWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsCi0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK