From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [RFC 8/8] drm/fence: add out-fences support Date: Fri, 15 Apr 2016 10:18:08 +0200 Message-ID: <20160415081808.GU2510@phenom.ffwll.local> References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> <1460683781-22535-9-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id E12426E1DE for ; Fri, 15 Apr 2016 08:18:12 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id n3so3984855wmn.1 for ; Fri, 15 Apr 2016 01:18:12 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1460683781-22535-9-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gustavo Padovan Cc: marcheu@google.com, Daniel Stone , seanpaul@google.com, Daniel Vetter , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Riley Andrews , m.chehab@samsung.com, Gustavo Padovan , John Harrison , laurent.pinchart@ideasonboard.com List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBBcHIgMTQsIDIwMTYgYXQgMDY6Mjk6NDFQTSAtMDcwMCwgR3VzdGF2byBQYWRvdmFu IHdyb3RlOgo+IEZyb206IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9y YS5jby51az4KPiAKPiBTdXBwb3J0IERSTSBvdXQtZmVuY2VzIGNyZWF0aW5nIGEgc3luY19maWxl IHdpdGggYSBmZW5jZSBmb3IgZWFjaCBjcnRjCj4gdXBkYXRlIHdpdGggdGhlIERSTV9NT0RFX0FU T01JQ19PVVRfRkVOQ0UgZmxhZy4KPiAKPiBXZSB0aGVuIHNlbmQgYW4gc3RydWN0IGRybV9vdXRf ZmVuY2VzIGFycmF5IHdpdGggdGhlIG91dC1mZW5jZXMgZmRzIGJhY2sgaW4KPiB0aGUgZHJtX2F0 b21pY19pb2N0bCgpIGFzIGFuIG91dCBhcmcgaW4gdGhlIG91dF9mZW5jZXNfcHRyIGZpZWxkLgo+ IAo+IHN0cnVjdCBkcm1fb3V0X2ZlbmNlcyB7Cj4gCV9fdTMyICAgY3J0Y19pZDsKPiAJX191MzIg ICBmZDsKPiB9Owo+IAo+IFNpZ25lZC1vZmYtYnk6IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5w YWRvdmFuQGNvbGxhYm9yYS5jby51az4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWMuYyAgICAgICAgfCAxMDkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCj4g IGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIHwgICAxICsKPiAgaW5jbHVkZS9k cm0vZHJtX2NydGMuaCAgICAgICAgICAgICAgfCAgIDMgKwo+ICBpbmNsdWRlL3VhcGkvZHJtL2Ry bV9tb2RlLmggICAgICAgICB8ICAgNyArKysKPiAgNCBmaWxlcyBjaGFuZ2VkLCAxMTkgaW5zZXJ0 aW9ucygrKSwgMSBkZWxldGlvbigtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+IGluZGV4IDBiOTU1 MjYuLmFmNmUwNTEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPiBAQCAtMTU2MCw2ICsxNTYwLDEw MyBAQCB2b2lkIGRybV9hdG9taWNfY2xlYW5fb2xkX2ZiKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs Cj4gIH0KPiAgRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2NsZWFuX29sZF9mYik7Cj4gIAo+ICtz dGF0aWMgaW50IGRybV9hdG9taWNfZ2V0X291dF9mZW5jZXMoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKPiArCQkJCSAgICAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ICsJCQkJICAg ICB1aW50MzJfdCBfX3VzZXIgKm91dF9mZW5jZXNfcHRyLAo+ICsJCQkJICAgICB1aW50NjRfdCBj b3VudF9vdXRfZmVuY2VzLAo+ICsJCQkJICAgICB1aW50NjRfdCB1c2VyX2RhdGEpCj4gK3sKPiAr CXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKPiArCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZTsKPiArCXN0cnVjdCBkcm1fb3V0X2ZlbmNlcyAqb3V0X2ZlbmNlczsKPiArCXN0cnVjdCBz eW5jX2ZpbGUgKipzeW5jX2ZpbGU7Cj4gKwlpbnQgbnVtX2ZlbmNlcyA9IDA7Cj4gKwlpbnQgaSwg cmV0Owo+ICsKPiArCW91dF9mZW5jZXMgPSBrY2FsbG9jKGNvdW50X291dF9mZW5jZXMsIHNpemVv Zigqb3V0X2ZlbmNlcyksCj4gKwkJCSAgICAgR0ZQX0tFUk5FTCk7Cj4gKwlpZiAoIW91dF9mZW5j ZXMpCj4gKwkJcmV0dXJuIC1FTk9NRU07Cj4gKwo+ICsJc3luY19maWxlID0ga2NhbGxvYyhjb3Vu dF9vdXRfZmVuY2VzLCBzaXplb2YoKnN5bmNfZmlsZSksCj4gKwkJCSAgICAgR0ZQX0tFUk5FTCk7 Cj4gKwlpZiAoIXN5bmNfZmlsZSkgewo+ICsJCWtmcmVlKG91dF9mZW5jZXMpOwo+ICsJCXJldHVy biAtRU5PTUVNOwo+ICsJfQo+ICsKPiArCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNy dGMsIGNydGNfc3RhdGUsIGkpIHsKPiArCQlzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50 ICplOwo+ICsJCXN0cnVjdCBmZW5jZSAqZmVuY2U7Cj4gKwkJY2hhciBuYW1lWzMyXTsKPiArCQlp bnQgZmQ7Cj4gKwo+ICsJCWZlbmNlID0gc3luY190aW1lbGluZV9jcmVhdGVfZmVuY2UoY3J0Yy0+ dGltZWxpbmUsCj4gKwkJCQkJCSAgIGNydGMtPmZlbmNlX3NlcW5vKTsKPiArCQlpZiAoIWZlbmNl KSB7Cj4gKwkJCXJldCA9IC1FTk9NRU07Cj4gKwkJCWdvdG8gb3V0Owo+ICsJCX0KPiArCj4gKwkJ c25wcmludGYobmFtZSwgc2l6ZW9mKG5hbWUpLCAiY3J0Yy0lZF8lbHUiLAo+ICsJCQkgZHJtX2Ny dGNfaW5kZXgoY3J0YyksIGNydGMtPmZlbmNlX3NlcW5vKyspOwo+ICsKPiArCQlzeW5jX2ZpbGVb aV0gPSBzeW5jX2ZpbGVfY3JlYXRlKG5hbWUsIGZlbmNlKTsKPiArCQlpZighc3luY19maWxlW2ld KSB7Cj4gKwkJCXJldCA9IC1FTk9NRU07Cj4gKwkJCWdvdG8gb3V0Owo+ICsJCX0KPiArCj4gKwkJ ZmQgPSBnZXRfdW51c2VkX2ZkX2ZsYWdzKE9fQ0xPRVhFQyk7Cj4gKwkJaWYgKGZkIDwgMCkgewo+ ICsJCQlyZXQgPSBmZDsKPiArCQkJZ290byBvdXQ7Cj4gKwkJfQo+ICsKPiArCQlzeW5jX2ZpbGVf aW5zdGFsbChzeW5jX2ZpbGVbaV0sIGZkKTsKPiArCj4gKwkJaWYgKGNydGNfc3RhdGUtPmV2ZW50 KSB7Cj4gKwkJCWNydGNfc3RhdGUtPmV2ZW50LT5iYXNlLmZlbmNlID0gZmVuY2U7Cj4gKwkJfSBl bHNlIHsKPiArCQkJZSA9IGNyZWF0ZV92YmxhbmtfZXZlbnQoZGV2LCBOVUxMLCBmZW5jZSwgdXNl cl9kYXRhKTsKPiArCQkJaWYgKCFlKSB7Cj4gKwkJCQlwdXRfdW51c2VkX2ZkKGZkKTsKPiArCQkJ CXJldCA9IC1FTk9NRU07Cj4gKwkJCQlnb3RvIG91dDsKPiArCQkJfQo+ICsKPiArCQkJY3J0Y19z dGF0ZS0+ZXZlbnQgPSBlOwo+ICsJCX0KPiArCQlpZiAobnVtX2ZlbmNlcyA+IGNvdW50X291dF9m ZW5jZXMpIHsKPiArCQkJcHV0X3VudXNlZF9mZChmZCk7Cj4gKwkJCXJldCA9IC1FSU5WQUw7Cj4g KwkJCWdvdG8gb3V0Owo+ICsJCX0KPiArCj4gKwkJZmVuY2VfZ2V0KGZlbmNlKTsKPiArCj4gKwkJ b3V0X2ZlbmNlc1tudW1fZmVuY2VzXS5jcnRjX2lkID0gY3J0Yy0+YmFzZS5pZDsKPiArCQlvdXRf ZmVuY2VzW251bV9mZW5jZXNdLmZkID0gZmQ7Cj4gKwkJbnVtX2ZlbmNlcysrOwo+ICsJfQo+ICsK PiArCWlmIChjb3B5X3RvX3VzZXIob3V0X2ZlbmNlc19wdHIsIG91dF9mZW5jZXMsCj4gKwkJCSBu dW1fZmVuY2VzICogc2l6ZW9mKCpvdXRfZmVuY2VzKSkpIHsKPiArCQlyZXQgPSAtRUZBVUxUOwo+ ICsJCWdvdG8gb3V0Owo+ICsJfQo+ICsKPiArCXJldHVybiAwOwo+ICsKPiArb3V0Ogo+ICsJZm9y IChpID0gMCA7IGkgPCBjb3VudF9vdXRfZmVuY2VzIDsgaSsrKSB7Cj4gKwkJaWYgKHN5bmNfZmls ZVtpXSkKPiArCQkJc3luY19maWxlX3B1dChzeW5jX2ZpbGVbaV0pOwo+ICsJfQo+ICsKPiArCXJl dHVybiByZXQ7Cj4gK30KPiArCj4gIGludCBkcm1fbW9kZV9hdG9taWNfaW9jdGwoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKPiAgCQkJICB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVf cHJpdikKPiAgewo+IEBAIC0xNTY4LDYgKzE2NjUsNyBAQCBpbnQgZHJtX21vZGVfYXRvbWljX2lv Y3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAl1aW50MzJfdCBfX3VzZXIgKmNvdW50X3By b3BzX3B0ciA9ICh1aW50MzJfdCBfX3VzZXIgKikodW5zaWduZWQgbG9uZykoYXJnLT5jb3VudF9w cm9wc19wdHIpOwo+ICAJdWludDMyX3QgX191c2VyICpwcm9wc19wdHIgPSAodWludDMyX3QgX191 c2VyICopKHVuc2lnbmVkIGxvbmcpKGFyZy0+cHJvcHNfcHRyKTsKPiAgCXVpbnQ2NF90IF9fdXNl ciAqcHJvcF92YWx1ZXNfcHRyID0gKHVpbnQ2NF90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKShh cmctPnByb3BfdmFsdWVzX3B0cik7Cj4gKwl1aW50MzJfdCBfX3VzZXIgKm91dF9mZW5jZXNfcHRy ID0gKHVpbnQzMl90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKShhcmctPm91dF9mZW5jZXNfcHRy KTsKPiAgCXVuc2lnbmVkIGludCBjb3BpZWRfb2JqcywgY29waWVkX3Byb3BzOwo+ICAJc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwo+ICAJc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVf Y3R4IGN0eDsKPiBAQCAtMTYwMSw3ICsxNjk5LDggQEAgaW50IGRybV9tb2RlX2F0b21pY19pb2N0 bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAKPiAgCS8qIGNhbid0IHRlc3QgYW5kIGV4cGVj dCBhbiBldmVudCBhdCB0aGUgc2FtZSB0aW1lLiAqLwo+ICAJaWYgKChhcmctPmZsYWdzICYgRFJN X01PREVfQVRPTUlDX1RFU1RfT05MWSkgJiYKPiAtCQkJKGFyZy0+ZmxhZ3MgJiBEUk1fTU9ERV9Q QUdFX0ZMSVBfRVZFTlQpKQo+ICsJCQkoYXJnLT5mbGFncyAmIChEUk1fTU9ERV9QQUdFX0ZMSVBf RVZFTlQKPiArCQkJIHwgRFJNX01PREVfQVRPTUlDX09VVF9GRU5DRSkpKQo+ICAJCXJldHVybiAt RUlOVkFMOwo+ICAKPiAgCWRybV9tb2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4LCAwKTsKPiBAQCAt MTY5Myw2ICsxNzkyLDE0IEBAIHJldHJ5Ogo+ICAJCX0KPiAgCX0KPiAgCj4gKwlpZiAoYXJnLT5m bGFncyAmIERSTV9NT0RFX0FUT01JQ19PVVRfRkVOQ0UpIHsKCk9VVF9GRU5DRSBhbmQgVEVTVF9P TkxZIHByb2JhYmx5IGRvbid0IG1ha2Ugc2Vuc2UsIGFuZCBuZWVkIHRvIGJlCnJlamVjdGVkLiBO ZWVkcyBhIHRlc3RjYXNlLCB0b28uCgo+ICsJCXJldCA9IGRybV9hdG9taWNfZ2V0X291dF9mZW5j ZXMoZGV2LCBzdGF0ZSwgb3V0X2ZlbmNlc19wdHIsCj4gKwkJCQkJCWFyZy0+Y291bnRfb3V0X2Zl bmNlcywKPiArCQkJCQkJYXJnLT51c2VyX2RhdGEpOwo+ICsJCWlmIChyZXQgPCAwKQo+ICsJCQln b3RvIG91dDsKPiArCX0KPiArCj4gIAlpZiAoYXJnLT5mbGFncyAmIERSTV9NT0RFX0FUT01JQ19U RVNUX09OTFkpIHsKCklmIGFueXRoaW5nIGZhaWxzIGJlbG93IHRoaXMgcG9pbnQgd2UgbmVlZCB0 byBjbGVhbiB1cCB0aGUgc3luY19maWxlL2ZkCm1lc3MuIE1pZ2h0IGJlIGVhc2llciB0byBmaXJz dCBjcmVhdGUgc3luY19maWxlIG9iamVjdHMgb25seSwgYW5kIG9ubHkKaW5zdGFsbCB0aGUgZmQg b25jZSBhdG9taWMgaGFzIHN1Y2NlZWRlZC4gWW91IHByb2JhYmx5IHdhbnQgdG8gcmVzZXJ2ZSB0 aGUKZmQgc2xvdHMgYmVmb3JlaGFuZCB0aG91Z2guCgpUaGF0IG1lYW5zIGEgYnVuY2ggbW9yZSBw ZXItY3J0YyBzdGF0ZSBpbiBkcm1fYXRvbWljX3N0YXRlLiBXZSBzaG91bGQKcHJvYmFibHkgdGFr ZSBhbGwgdGhlIHBlci1jcnRjIHBvaW50ZXJzIGFuZCB0aHJvdyB0aGVtIGludG8gYSBzbWFsbApz dHJ1Y3QsIHRvIGF2b2lkIGFsbG9jYXRpbmcgaW5kaXZpZHVhbCBhcnJheXMgZm9yIGV2ZXJ5dGhp bmcuIFNvCgpzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZV9wZXJfY3J0YyB7CglzdHJ1Y3QgZHJtX2Ny dGMgKmNydGM7CglzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlOwoJc3RydWN0IHN5bmNfZmls ZSAqc3luY19maWxlOwoJaW50IGZkOwp9OwoKU29ycnkgaWYgdGhpcyBtZWFucyBhIGJpdCBhIHNw cmF3bGluZyB1cGZyb250IHJlZmFjdG9yIDooCgpXcnQgdGVzdGNhc2U6IE5lZWQgZXZpbCBvbmVz IHRoYXQgcGFzcyBpbnZhbGlkIHBvaW50ZXIgdG8gb3V0X2ZlbmNlc19wdHIKb3IgdG9vIHNtYWxs IGFycmF5IHNpemUgaW4gY291bnRfb3V0X2ZlbmNlcyBhbmQgYWxsIHRoYXQgb2ZjLgotRGFuaWVs Cgo+ICAJCS8qCj4gIAkJICogVW5saWtlIGNvbW1pdCwgY2hlY2tfb25seSBkb2VzIG5vdCBjbGVh biB1cCBzdGF0ZS4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVs cGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+IGluZGV4IDZlZDgz MzkuLjE1YmEzYTggMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVs cGVyLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+IEBAIC0z MSw2ICszMSw3IEBACj4gICNpbmNsdWRlIDxkcm0vZHJtX2NydGNfaGVscGVyLmg+Cj4gICNpbmNs dWRlIDxkcm0vZHJtX2F0b21pY19oZWxwZXIuaD4KPiAgI2luY2x1ZGUgPGxpbnV4L2ZlbmNlLmg+ Cj4gKyNpbmNsdWRlIDxsaW51eC9zeW5jX2ZpbGUuaD4KPiAgCj4gIC8qKgo+ICAgKiBET0M6IG92 ZXJ2aWV3Cj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9jcnRjLmggYi9pbmNsdWRlL2Ry bS9kcm1fY3J0Yy5oCj4gaW5kZXggNzkzNDE3OC4uNTNlNGU3MSAxMDA2NDQKPiAtLS0gYS9pbmNs dWRlL2RybS9kcm1fY3J0Yy5oCj4gKysrIGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaAo+IEBAIC03 MTcsNiArNzE3LDcgQEAgc3RydWN0IGRybV9jcnRjX2Z1bmNzIHsKPiAgICogQHByb3BlcnRpZXM6 IHByb3BlcnR5IHRyYWNraW5nIGZvciB0aGlzIENSVEMKPiAgICogQHN0YXRlOiBjdXJyZW50IGF0 b21pYyBzdGF0ZSBmb3IgdGhpcyBDUlRDCj4gICAqIEB0aW1lbGluZTogc3luYyB0aW1lbGluZSBm b3IgZmVuY2Ugc2lnYWxsaW5nCj4gKyAqIEBmZW5jZV9zZXFubzogc2Vxbm8gdmFyaWFibGUgdG8g Y3JlYXRlIGZlbmNlcwo+ICAgKiBAYWNxdWlyZV9jdHg6IHBlci1DUlRDIGltcGxpY2l0IGFjcXVp cmUgY29udGV4dCB1c2VkIGJ5IGF0b21pYyBkcml2ZXJzIGZvcgo+ICAgKiAJbGVnYWN5IElPQ1RM cwo+ICAgKgo+IEBAIC03NzMsNyArNzc0LDkgQEAgc3RydWN0IGRybV9jcnRjIHsKPiAgCj4gIAlz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlOwo+ICAKPiArCS8qIGZvciBvdXQtZmVuY2VzICov Cj4gIAlzdHJ1Y3Qgc3luY190aW1lbGluZSAqdGltZWxpbmU7Cj4gKwl1bnNpZ25lZCBsb25nIGZl bmNlX3NlcW5vOwo+ICAKPiAgCS8qCj4gIAkgKiBGb3IgbGVnYWN5IGNydGMgSU9DVExzIHNvIHRo YXQgYXRvbWljIGRyaXZlcnMgY2FuIGdldCBhdCB0aGUgbG9ja2luZwo+IGRpZmYgLS1naXQgYS9p bmNsdWRlL3VhcGkvZHJtL2RybV9tb2RlLmggYi9pbmNsdWRlL3VhcGkvZHJtL2RybV9tb2RlLmgK PiBpbmRleCAzOTkwNWNjLi40Y2RjZDIyIDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvdWFwaS9kcm0v ZHJtX21vZGUuaAo+ICsrKyBiL2luY2x1ZGUvdWFwaS9kcm0vZHJtX21vZGUuaAo+IEBAIC01OTIs NiArNTkyLDExIEBAIHN0cnVjdCBkcm1fbW9kZV9kZXN0cm95X2R1bWIgewo+ICAJCURSTV9NT0RF X0FUT01JQ19BTExPV19NT0RFU0VUIHxcCj4gIAkJRFJNX01PREVfQVRPTUlDX09VVF9GRU5DRSkK PiAgCj4gK3N0cnVjdCBkcm1fb3V0X2ZlbmNlcyB7Cj4gKwlfX3UzMgljcnRjX2lkOwo+ICsJX191 MzIJZmQ7Cj4gK307Cj4gKwo+ICBzdHJ1Y3QgZHJtX21vZGVfYXRvbWljIHsKPiAgCV9fdTMyIGZs YWdzOwo+ICAJX191MzIgY291bnRfb2JqczsKPiBAQCAtNjAxLDYgKzYwNiw4IEBAIHN0cnVjdCBk cm1fbW9kZV9hdG9taWMgewo+ICAJX191NjQgcHJvcF92YWx1ZXNfcHRyOwo+ICAJX191NjQgcmVz ZXJ2ZWQ7Cj4gIAlfX3U2NCB1c2VyX2RhdGE7Cj4gKwlfX3U2NCBjb3VudF9vdXRfZmVuY2VzOwo+ ICsJX191NjQgb3V0X2ZlbmNlc19wdHI7Cj4gIH07Cj4gIAo+ICAvKioKPiAtLSAKPiAyLjUuNQo+ IAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9u Cmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753414AbcDOIST (ORCPT ); Fri, 15 Apr 2016 04:18:19 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33577 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753299AbcDOISN (ORCPT ); Fri, 15 Apr 2016 04:18:13 -0400 Date: Fri, 15 Apr 2016 10:18:08 +0200 From: Daniel Vetter To: Gustavo Padovan Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Maarten Lankhorst , Gustavo Padovan Subject: Re: [RFC 8/8] drm/fence: add out-fences support Message-ID: <20160415081808.GU2510@phenom.ffwll.local> Mail-Followup-To: Gustavo Padovan , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Riley Andrews , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Maarten Lankhorst , Gustavo Padovan References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> <1460683781-22535-9-git-send-email-gustavo@padovan.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1460683781-22535-9-git-send-email-gustavo@padovan.org> X-Operating-System: Linux phenom 4.4.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 14, 2016 at 06:29:41PM -0700, Gustavo Padovan wrote: > From: Gustavo Padovan > > Support DRM out-fences creating a sync_file with a fence for each crtc > update with the DRM_MODE_ATOMIC_OUT_FENCE flag. > > We then send an struct drm_out_fences array with the out-fences fds back in > the drm_atomic_ioctl() as an out arg in the out_fences_ptr field. > > struct drm_out_fences { > __u32 crtc_id; > __u32 fd; > }; > > Signed-off-by: Gustavo Padovan > --- > drivers/gpu/drm/drm_atomic.c | 109 +++++++++++++++++++++++++++++++++++- > drivers/gpu/drm/drm_atomic_helper.c | 1 + > include/drm/drm_crtc.h | 3 + > include/uapi/drm/drm_mode.h | 7 +++ > 4 files changed, 119 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 0b95526..af6e051 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -1560,6 +1560,103 @@ void drm_atomic_clean_old_fb(struct drm_device *dev, > } > EXPORT_SYMBOL(drm_atomic_clean_old_fb); > > +static int drm_atomic_get_out_fences(struct drm_device *dev, > + struct drm_atomic_state *state, > + uint32_t __user *out_fences_ptr, > + uint64_t count_out_fences, > + uint64_t user_data) > +{ > + struct drm_crtc *crtc; > + struct drm_crtc_state *crtc_state; > + struct drm_out_fences *out_fences; > + struct sync_file **sync_file; > + int num_fences = 0; > + int i, ret; > + > + out_fences = kcalloc(count_out_fences, sizeof(*out_fences), > + GFP_KERNEL); > + if (!out_fences) > + return -ENOMEM; > + > + sync_file = kcalloc(count_out_fences, sizeof(*sync_file), > + GFP_KERNEL); > + if (!sync_file) { > + kfree(out_fences); > + return -ENOMEM; > + } > + > + for_each_crtc_in_state(state, crtc, crtc_state, i) { > + struct drm_pending_vblank_event *e; > + struct fence *fence; > + char name[32]; > + int fd; > + > + fence = sync_timeline_create_fence(crtc->timeline, > + crtc->fence_seqno); > + if (!fence) { > + ret = -ENOMEM; > + goto out; > + } > + > + snprintf(name, sizeof(name), "crtc-%d_%lu", > + drm_crtc_index(crtc), crtc->fence_seqno++); > + > + sync_file[i] = sync_file_create(name, fence); > + if(!sync_file[i]) { > + ret = -ENOMEM; > + goto out; > + } > + > + fd = get_unused_fd_flags(O_CLOEXEC); > + if (fd < 0) { > + ret = fd; > + goto out; > + } > + > + sync_file_install(sync_file[i], fd); > + > + if (crtc_state->event) { > + crtc_state->event->base.fence = fence; > + } else { > + e = create_vblank_event(dev, NULL, fence, user_data); > + if (!e) { > + put_unused_fd(fd); > + ret = -ENOMEM; > + goto out; > + } > + > + crtc_state->event = e; > + } > + if (num_fences > count_out_fences) { > + put_unused_fd(fd); > + ret = -EINVAL; > + goto out; > + } > + > + fence_get(fence); > + > + out_fences[num_fences].crtc_id = crtc->base.id; > + out_fences[num_fences].fd = fd; > + num_fences++; > + } > + > + if (copy_to_user(out_fences_ptr, out_fences, > + num_fences * sizeof(*out_fences))) { > + ret = -EFAULT; > + goto out; > + } > + > + return 0; > + > +out: > + for (i = 0 ; i < count_out_fences ; i++) { > + if (sync_file[i]) > + sync_file_put(sync_file[i]); > + } > + > + return ret; > +} > + > int drm_mode_atomic_ioctl(struct drm_device *dev, > void *data, struct drm_file *file_priv) > { > @@ -1568,6 +1665,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, > uint32_t __user *count_props_ptr = (uint32_t __user *)(unsigned long)(arg->count_props_ptr); > uint32_t __user *props_ptr = (uint32_t __user *)(unsigned long)(arg->props_ptr); > uint64_t __user *prop_values_ptr = (uint64_t __user *)(unsigned long)(arg->prop_values_ptr); > + uint32_t __user *out_fences_ptr = (uint32_t __user *)(unsigned long)(arg->out_fences_ptr); > unsigned int copied_objs, copied_props; > struct drm_atomic_state *state; > struct drm_modeset_acquire_ctx ctx; > @@ -1601,7 +1699,8 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, > > /* can't test and expect an event at the same time. */ > if ((arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) && > - (arg->flags & DRM_MODE_PAGE_FLIP_EVENT)) > + (arg->flags & (DRM_MODE_PAGE_FLIP_EVENT > + | DRM_MODE_ATOMIC_OUT_FENCE))) > return -EINVAL; > > drm_modeset_acquire_init(&ctx, 0); > @@ -1693,6 +1792,14 @@ retry: > } > } > > + if (arg->flags & DRM_MODE_ATOMIC_OUT_FENCE) { OUT_FENCE and TEST_ONLY probably don't make sense, and need to be rejected. Needs a testcase, too. > + ret = drm_atomic_get_out_fences(dev, state, out_fences_ptr, > + arg->count_out_fences, > + arg->user_data); > + if (ret < 0) > + goto out; > + } > + > if (arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) { If anything fails below this point we need to clean up the sync_file/fd mess. Might be easier to first create sync_file objects only, and only install the fd once atomic has succeeded. You probably want to reserve the fd slots beforehand though. That means a bunch more per-crtc state in drm_atomic_state. We should probably take all the per-crtc pointers and throw them into a small struct, to avoid allocating individual arrays for everything. So struct drm_atomic_state_per_crtc { struct drm_crtc *crtc; struct drm_crtc_state *state; struct sync_file *sync_file; int fd; }; Sorry if this means a bit a sprawling upfront refactor :( Wrt testcase: Need evil ones that pass invalid pointer to out_fences_ptr or too small array size in count_out_fences and all that ofc. -Daniel > /* > * Unlike commit, check_only does not clean up state. > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index 6ed8339..15ba3a8 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -31,6 +31,7 @@ > #include > #include > #include > +#include > > /** > * DOC: overview > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 7934178..53e4e71 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -717,6 +717,7 @@ struct drm_crtc_funcs { > * @properties: property tracking for this CRTC > * @state: current atomic state for this CRTC > * @timeline: sync timeline for fence sigalling > + * @fence_seqno: seqno variable to create fences > * @acquire_ctx: per-CRTC implicit acquire context used by atomic drivers for > * legacy IOCTLs > * > @@ -773,7 +774,9 @@ struct drm_crtc { > > struct drm_crtc_state *state; > > + /* for out-fences */ > struct sync_timeline *timeline; > + unsigned long fence_seqno; > > /* > * For legacy crtc IOCTLs so that atomic drivers can get at the locking > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h > index 39905cc..4cdcd22 100644 > --- a/include/uapi/drm/drm_mode.h > +++ b/include/uapi/drm/drm_mode.h > @@ -592,6 +592,11 @@ struct drm_mode_destroy_dumb { > DRM_MODE_ATOMIC_ALLOW_MODESET |\ > DRM_MODE_ATOMIC_OUT_FENCE) > > +struct drm_out_fences { > + __u32 crtc_id; > + __u32 fd; > +}; > + > struct drm_mode_atomic { > __u32 flags; > __u32 count_objs; > @@ -601,6 +606,8 @@ struct drm_mode_atomic { > __u64 prop_values_ptr; > __u64 reserved; > __u64 user_data; > + __u64 count_out_fences; > + __u64 out_fences_ptr; > }; > > /** > -- > 2.5.5 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch