From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61B68C48BE5 for ; Wed, 23 Jun 2021 16:51:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2921B611AD for ; Wed, 23 Jun 2021 16:51:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2921B611AD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BBD7F6E959; Wed, 23 Jun 2021 16:51:26 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3A6E6E959; Wed, 23 Jun 2021 16:51:25 +0000 (UTC) Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 0E5DB1F438B6; Wed, 23 Jun 2021 17:51:24 +0100 (BST) Date: Wed, 23 Jun 2021 18:51:21 +0200 From: Boris Brezillon To: Daniel Vetter Message-ID: <20210623185121.73437307@collabora.com> In-Reply-To: <20210622165511.3169559-6-daniel.vetter@ffwll.ch> References: <20210622165511.3169559-1-daniel.vetter@ffwll.ch> <20210622165511.3169559-6-daniel.vetter@ffwll.ch> Organization: Collabora X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 05/15] drm/panfrost: Use xarray and helpers for depedency tracking X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomeu Vizoso , Intel Graphics Development , DRI Development , Steven Price , linaro-mm-sig@lists.linaro.org, Luben Tuikov , Alyssa Rosenzweig , Alex Deucher , Daniel Vetter , Lee Jones , Christian =?UTF-8?B?S8O2bmln?= , linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" T24gVHVlLCAyMiBKdW4gMjAyMSAxODo1NTowMSArMDIwMApEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGZmd2xsLmNoPiB3cm90ZToKCj4gTW9yZSBjb25zaXN0ZW5jeSBhbmQgcHJlcCB3b3Jr IGZvciB0aGUgbmV4dCBwYXRjaC4KPiAKPiBBc2lkZTogSSB3b25kZXIgd2hldGhlciB3ZSBzaG91 bGRuJ3QganVzdCBtb3ZlIHRoaXMgZW50aXJlIHhhcnJheQo+IGJ1c2luZXNzIGludG8gdGhlIHNj aGVkdWxlciBzbyB0aGF0IG5vdCBldmVyeW9uZSBoYXMgdG8gcmVpbnZlbnQgdGhlCj4gc2FtZSB3 aGVlbHMuIENjJ2luZyBzb21lIHNjaGVkdWxlciBwZW9wbGUgZm9yIHRoaXMgdG9vLgo+IAo+IHYy OiBDb3JyZWN0bHkgaGFuZGxlIHNjaGVkX2xvY2sgc2luY2UgTHVjYXMgcG9pbnRlZCBvdXQgaXQn cyBuZWVkZWQuCj4gCj4gdjM6IFJlYmFzZSwgZG1hX3Jlc3ZfZ2V0X2V4Y2xfdW5sb2NrZWQgZ290 IHJlbmFtZWQKPiAKPiB2NDogRG9uJ3QgbGVhayBqb2IgcmVmZXJlbmNlcyBvbiBmYWlsdXJlIChT dGV2ZW4pLgoKSGVoZSwgSSBoYWQgcHJldHR5IG11Y2ggdGhlIHNhbWUgcGF0Y2ggaGVyZSBbMV0u CgpSZXZpZXdlZC1ieTogQm9yaXMgQnJlemlsbG9uIDxib3Jpcy5icmV6aWxsb25AY29sbGFib3Jh LmNvbT4KClsxXWh0dHBzOi8vcGF0Y2h3b3JrLmtlcm5lbC5vcmcvcHJvamVjdC9kcmktZGV2ZWwv cGF0Y2gvMjAyMTAzMTEwOTI1MzkuMjQwNTU5Ni0zLWJvcmlzLmJyZXppbGxvbkBjb2xsYWJvcmEu Y29tLwoKPiAKPiBDYzogTHVjYXMgU3RhY2ggPGwuc3RhY2hAcGVuZ3V0cm9uaXguZGU+Cj4gQ2M6 ICJDaHJpc3RpYW4gS8O2bmlnIiA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgo+IENjOiBMdWJl biBUdWlrb3YgPGx1YmVuLnR1aWtvdkBhbWQuY29tPgo+IENjOiBBbGV4IERldWNoZXIgPGFsZXhh bmRlci5kZXVjaGVyQGFtZC5jb20+Cj4gQ2M6IExlZSBKb25lcyA8bGVlLmpvbmVzQGxpbmFyby5v cmc+Cj4gQ2M6IFN0ZXZlbiBQcmljZSA8c3RldmVuLnByaWNlQGFybS5jb20+Cj4gQ2M6IFJvYiBI ZXJyaW5nIDxyb2JoQGtlcm5lbC5vcmc+Cj4gQ2M6IFRvbWV1IFZpem9zbyA8dG9tZXUudml6b3Nv QGNvbGxhYm9yYS5jb20+Cj4gQ2M6IEFseXNzYSBSb3Nlbnp3ZWlnIDxhbHlzc2Eucm9zZW56d2Vp Z0Bjb2xsYWJvcmEuY29tPgo+IENjOiBTdW1pdCBTZW13YWwgPHN1bWl0LnNlbXdhbEBsaW5hcm8u b3JnPgo+IENjOiBsaW51eC1tZWRpYUB2Z2VyLmtlcm5lbC5vcmcKPiBDYzogbGluYXJvLW1tLXNp Z0BsaXN0cy5saW5hcm8ub3JnCj4gU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVs LnZldHRlckBpbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5m cm9zdF9kcnYuYyB8IDQxICsrKysrKystLS0tLS0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL3BhbmZy b3N0L3BhbmZyb3N0X2pvYi5jIHwgNjUgKysrKysrKysrKystLS0tLS0tLS0tLS0tLQo+ICBkcml2 ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3Rfam9iLmggfCAgOCArKy0KPiAgMyBmaWxlcyBj aGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCA2NSBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2Rydi5jIGIvZHJpdmVycy9ncHUv ZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2Rydi5jCj4gaW5kZXggMDc1ZWMwZWY3NDZjLi4zZWU4Mjhm MWU3YTUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2Ry di5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2Rydi5jCj4gQEAg LTEzOCwxMiArMTM4LDYgQEAgcGFuZnJvc3RfbG9va3VwX2JvcyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAo+ICAJaWYgKCFqb2ItPmJvX2NvdW50KQo+ICAJCXJldHVybiAwOwo+ICAKPiAtCWpvYi0+ aW1wbGljaXRfZmVuY2VzID0ga3ZtYWxsb2NfYXJyYXkoam9iLT5ib19jb3VudCwKPiAtCQkJCSAg c2l6ZW9mKHN0cnVjdCBkbWFfZmVuY2UgKiksCj4gLQkJCQkgIEdGUF9LRVJORUwgfCBfX0dGUF9a RVJPKTsKPiAtCWlmICgham9iLT5pbXBsaWNpdF9mZW5jZXMpCj4gLQkJcmV0dXJuIC1FTk9NRU07 Cj4gLQo+ICAJcmV0ID0gZHJtX2dlbV9vYmplY3RzX2xvb2t1cChmaWxlX3ByaXYsCj4gIAkJCQkg ICAgICh2b2lkIF9fdXNlciAqKSh1aW50cHRyX3QpYXJncy0+Ym9faGFuZGxlcywKPiAgCQkJCSAg ICAgam9iLT5ib19jb3VudCwgJmpvYi0+Ym9zKTsKPiBAQCAtMTc0LDcgKzE2OCw3IEBAIHBhbmZy b3N0X2xvb2t1cF9ib3Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgfQo+ICAKPiAgLyoqCj4g LSAqIHBhbmZyb3N0X2NvcHlfaW5fc3luYygpIC0gU2V0cyB1cCBqb2ItPmluX2ZlbmNlc1tdIHdp dGggdGhlIHN5bmMgb2JqZWN0cwo+ICsgKiBwYW5mcm9zdF9jb3B5X2luX3N5bmMoKSAtIFNldHMg dXAgam9iLT5kZXBzIHdpdGggdGhlIHN5bmMgb2JqZWN0cwo+ICAgKiByZWZlcmVuY2VkIGJ5IHRo ZSBqb2IuCj4gICAqIEBkZXY6IERSTSBkZXZpY2UKPiAgICogQGZpbGVfcHJpdjogRFJNIGZpbGUg Zm9yIHRoaXMgZmQKPiBAQCAtMTk0LDIyICsxODgsMTQgQEAgcGFuZnJvc3RfY29weV9pbl9zeW5j KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIHsKPiAgCXUzMiAqaGFuZGxlczsKPiAgCWludCBy ZXQgPSAwOwo+IC0JaW50IGk7Cj4gKwlpbnQgaSwgaW5fZmVuY2VfY291bnQ7Cj4gIAo+IC0Jam9i LT5pbl9mZW5jZV9jb3VudCA9IGFyZ3MtPmluX3N5bmNfY291bnQ7Cj4gKwlpbl9mZW5jZV9jb3Vu dCA9IGFyZ3MtPmluX3N5bmNfY291bnQ7Cj4gIAo+IC0JaWYgKCFqb2ItPmluX2ZlbmNlX2NvdW50 KQo+ICsJaWYgKCFpbl9mZW5jZV9jb3VudCkKPiAgCQlyZXR1cm4gMDsKPiAgCj4gLQlqb2ItPmlu X2ZlbmNlcyA9IGt2bWFsbG9jX2FycmF5KGpvYi0+aW5fZmVuY2VfY291bnQsCj4gLQkJCQkJc2l6 ZW9mKHN0cnVjdCBkbWFfZmVuY2UgKiksCj4gLQkJCQkJR0ZQX0tFUk5FTCB8IF9fR0ZQX1pFUk8p Owo+IC0JaWYgKCFqb2ItPmluX2ZlbmNlcykgewo+IC0JCURSTV9ERUJVRygiRmFpbGVkIHRvIGFs bG9jYXRlIGpvYiBpbiBmZW5jZXNcbiIpOwo+IC0JCXJldHVybiAtRU5PTUVNOwo+IC0JfQo+IC0K PiAtCWhhbmRsZXMgPSBrdm1hbGxvY19hcnJheShqb2ItPmluX2ZlbmNlX2NvdW50LCBzaXplb2Yo dTMyKSwgR0ZQX0tFUk5FTCk7Cj4gKwloYW5kbGVzID0ga3ZtYWxsb2NfYXJyYXkoaW5fZmVuY2Vf Y291bnQsIHNpemVvZih1MzIpLCBHRlBfS0VSTkVMKTsKPiAgCWlmICghaGFuZGxlcykgewo+ICAJ CXJldCA9IC1FTk9NRU07Cj4gIAkJRFJNX0RFQlVHKCJGYWlsZWQgdG8gYWxsb2NhdGUgaW5jb21p bmcgc3luY29iaiBoYW5kbGVzXG4iKTsKPiBAQCAtMjE4LDE2ICsyMDQsMjMgQEAgcGFuZnJvc3Rf Y29weV9pbl9zeW5jKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAo+ICAJaWYgKGNvcHlfZnJv bV91c2VyKGhhbmRsZXMsCj4gIAkJCSAgICh2b2lkIF9fdXNlciAqKSh1aW50cHRyX3QpYXJncy0+ aW5fc3luY3MsCj4gLQkJCSAgIGpvYi0+aW5fZmVuY2VfY291bnQgKiBzaXplb2YodTMyKSkpIHsK PiArCQkJICAgaW5fZmVuY2VfY291bnQgKiBzaXplb2YodTMyKSkpIHsKPiAgCQlyZXQgPSAtRUZB VUxUOwo+ICAJCURSTV9ERUJVRygiRmFpbGVkIHRvIGNvcHkgaW4gc3luY29iaiBoYW5kbGVzXG4i KTsKPiAgCQlnb3RvIGZhaWw7Cj4gIAl9Cj4gIAo+IC0JZm9yIChpID0gMDsgaSA8IGpvYi0+aW5f ZmVuY2VfY291bnQ7IGkrKykgewo+ICsJZm9yIChpID0gMDsgaSA8IGluX2ZlbmNlX2NvdW50OyBp KyspIHsKPiArCQlzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZTsKPiArCj4gIAkJcmV0ID0gZHJtX3N5 bmNvYmpfZmluZF9mZW5jZShmaWxlX3ByaXYsIGhhbmRsZXNbaV0sIDAsIDAsCj4gLQkJCQkJICAg ICAmam9iLT5pbl9mZW5jZXNbaV0pOwo+IC0JCWlmIChyZXQgPT0gLUVJTlZBTCkKPiArCQkJCQkg ICAgICZmZW5jZSk7Cj4gKwkJaWYgKHJldCkKPiArCQkJZ290byBmYWlsOwo+ICsKPiArCQlyZXQg PSBkcm1fZ2VtX2ZlbmNlX2FycmF5X2FkZCgmam9iLT5kZXBzLCBmZW5jZSk7Cj4gKwo+ICsJCWlm IChyZXQpCj4gIAkJCWdvdG8gZmFpbDsKPiAgCX0KPiAgCj4gQEAgLTI2NSw2ICsyNTgsOCBAQCBz dGF0aWMgaW50IHBhbmZyb3N0X2lvY3RsX3N1Ym1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLAo+ICAKPiAgCWtyZWZfaW5pdCgmam9iLT5yZWZjb3VudCk7Cj4gIAo+ICsJeGFf aW5pdF9mbGFncygmam9iLT5kZXBzLCBYQV9GTEFHU19BTExPQyk7Cj4gKwo+ICAJam9iLT5wZmRl diA9IHBmZGV2Owo+ICAJam9iLT5qYyA9IGFyZ3MtPmpjOwo+ICAJam9iLT5yZXF1aXJlbWVudHMg PSBhcmdzLT5yZXF1aXJlbWVudHM7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9wYW5m cm9zdC9wYW5mcm9zdF9qb2IuYyBiL2RyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9q b2IuYwo+IGluZGV4IDM4Zjg1ODBjMTlmMS4uNzFjZDQzZmExYjM2IDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9qb2IuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9qb2IuYwo+IEBAIC0xOTYsMTQgKzE5NiwyMSBAQCBzdGF0 aWMgdm9pZCBwYW5mcm9zdF9qb2JfaHdfc3VibWl0KHN0cnVjdCBwYW5mcm9zdF9qb2IgKmpvYiwg aW50IGpzKQo+ICAJam9iX3dyaXRlKHBmZGV2LCBKU19DT01NQU5EX05FWFQoanMpLCBKU19DT01N QU5EX1NUQVJUKTsKPiAgfQo+ICAKPiAtc3RhdGljIHZvaWQgcGFuZnJvc3RfYWNxdWlyZV9vYmpl Y3RfZmVuY2VzKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqKmJvcywKPiAtCQkJCQkgICBpbnQgYm9f Y291bnQsCj4gLQkJCQkJICAgc3RydWN0IGRtYV9mZW5jZSAqKmltcGxpY2l0X2ZlbmNlcykKPiAr c3RhdGljIGludCBwYW5mcm9zdF9hY3F1aXJlX29iamVjdF9mZW5jZXMoc3RydWN0IGRybV9nZW1f b2JqZWN0ICoqYm9zLAo+ICsJCQkJCSAgaW50IGJvX2NvdW50LAo+ICsJCQkJCSAgc3RydWN0IHhh cnJheSAqZGVwcykKPiAgewo+IC0JaW50IGk7Cj4gKwlpbnQgaSwgcmV0Owo+ICAKPiAtCWZvciAo aSA9IDA7IGkgPCBib19jb3VudDsgaSsrKQo+IC0JCWltcGxpY2l0X2ZlbmNlc1tpXSA9IGRtYV9y ZXN2X2dldF9leGNsX3VubG9ja2VkKGJvc1tpXS0+cmVzdik7Cj4gKwlmb3IgKGkgPSAwOyBpIDwg Ym9fY291bnQ7IGkrKykgewo+ICsJCXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlID0gZG1hX3Jlc3Zf Z2V0X2V4Y2xfdW5sb2NrZWQoYm9zW2ldLT5yZXN2KTsKPiArCj4gKwkJcmV0ID0gZHJtX2dlbV9m ZW5jZV9hcnJheV9hZGQoZGVwcywgZmVuY2UpOwo+ICsJCWlmIChyZXQpCj4gKwkJCXJldHVybiBy ZXQ7Cj4gKwl9Cj4gKwo+ICsJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkIHBhbmZy b3N0X2F0dGFjaF9vYmplY3RfZmVuY2VzKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqKmJvcywKPiBA QCAtMjQwLDEwICsyNDcsMTQgQEAgaW50IHBhbmZyb3N0X2pvYl9wdXNoKHN0cnVjdCBwYW5mcm9z dF9qb2IgKmpvYikKPiAgCj4gIAlqb2ItPnJlbmRlcl9kb25lX2ZlbmNlID0gZG1hX2ZlbmNlX2dl dCgmam9iLT5iYXNlLnNfZmVuY2UtPmZpbmlzaGVkKTsKPiAgCj4gLQlrcmVmX2dldCgmam9iLT5y ZWZjb3VudCk7IC8qIHB1dCBieSBzY2hlZHVsZXIgam9iIGNvbXBsZXRpb24gKi8KPiArCXJldCA9 IHBhbmZyb3N0X2FjcXVpcmVfb2JqZWN0X2ZlbmNlcyhqb2ItPmJvcywgam9iLT5ib19jb3VudCwK PiArCQkJCQkgICAgICZqb2ItPmRlcHMpOwo+ICsJaWYgKHJldCkgewo+ICsJCW11dGV4X3VubG9j aygmcGZkZXYtPnNjaGVkX2xvY2spOwo+ICsJCWdvdG8gdW5sb2NrOwo+ICsJfQo+ICAKPiAtCXBh bmZyb3N0X2FjcXVpcmVfb2JqZWN0X2ZlbmNlcyhqb2ItPmJvcywgam9iLT5ib19jb3VudCwKPiAt CQkJCSAgICAgICBqb2ItPmltcGxpY2l0X2ZlbmNlcyk7Cj4gKwlrcmVmX2dldCgmam9iLT5yZWZj b3VudCk7IC8qIHB1dCBieSBzY2hlZHVsZXIgam9iIGNvbXBsZXRpb24gKi8KPiAgCj4gIAlkcm1f c2NoZWRfZW50aXR5X3B1c2hfam9iKCZqb2ItPmJhc2UsIGVudGl0eSk7Cj4gIAo+IEBAIC0yNjIs MTggKzI3MywxNSBAQCBzdGF0aWMgdm9pZCBwYW5mcm9zdF9qb2JfY2xlYW51cChzdHJ1Y3Qga3Jl ZiAqcmVmKQo+ICB7Cj4gIAlzdHJ1Y3QgcGFuZnJvc3Rfam9iICpqb2IgPSBjb250YWluZXJfb2Yo cmVmLCBzdHJ1Y3QgcGFuZnJvc3Rfam9iLAo+ICAJCQkJCQlyZWZjb3VudCk7Cj4gKwlzdHJ1Y3Qg ZG1hX2ZlbmNlICpmZW5jZTsKPiArCXVuc2lnbmVkIGxvbmcgaW5kZXg7Cj4gIAl1bnNpZ25lZCBp bnQgaTsKPiAgCj4gLQlpZiAoam9iLT5pbl9mZW5jZXMpIHsKPiAtCQlmb3IgKGkgPSAwOyBpIDwg am9iLT5pbl9mZW5jZV9jb3VudDsgaSsrKQo+IC0JCQlkbWFfZmVuY2VfcHV0KGpvYi0+aW5fZmVu Y2VzW2ldKTsKPiAtCQlrdmZyZWUoam9iLT5pbl9mZW5jZXMpOwo+IC0JfQo+IC0JaWYgKGpvYi0+ aW1wbGljaXRfZmVuY2VzKSB7Cj4gLQkJZm9yIChpID0gMDsgaSA8IGpvYi0+Ym9fY291bnQ7IGkr KykKPiAtCQkJZG1hX2ZlbmNlX3B1dChqb2ItPmltcGxpY2l0X2ZlbmNlc1tpXSk7Cj4gLQkJa3Zm cmVlKGpvYi0+aW1wbGljaXRfZmVuY2VzKTsKPiArCXhhX2Zvcl9lYWNoKCZqb2ItPmRlcHMsIGlu ZGV4LCBmZW5jZSkgewo+ICsJCWRtYV9mZW5jZV9wdXQoZmVuY2UpOwo+ICAJfQo+ICsJeGFfZGVz dHJveSgmam9iLT5kZXBzKTsKPiArCj4gIAlkbWFfZmVuY2VfcHV0KGpvYi0+ZG9uZV9mZW5jZSk7 Cj4gIAlkbWFfZmVuY2VfcHV0KGpvYi0+cmVuZGVyX2RvbmVfZmVuY2UpOwo+ICAKPiBAQCAtMzE2 LDI2ICszMjQsOSBAQCBzdGF0aWMgc3RydWN0IGRtYV9mZW5jZSAqcGFuZnJvc3Rfam9iX2RlcGVu ZGVuY3koc3RydWN0IGRybV9zY2hlZF9qb2IgKnNjaGVkX2pvYgo+ICAJCQkJCQkgc3RydWN0IGRy bV9zY2hlZF9lbnRpdHkgKnNfZW50aXR5KQo+ICB7Cj4gIAlzdHJ1Y3QgcGFuZnJvc3Rfam9iICpq b2IgPSB0b19wYW5mcm9zdF9qb2Ioc2NoZWRfam9iKTsKPiAtCXN0cnVjdCBkbWFfZmVuY2UgKmZl bmNlOwo+IC0JdW5zaWduZWQgaW50IGk7Cj4gLQo+IC0JLyogRXhwbGljaXQgZmVuY2VzICovCj4g LQlmb3IgKGkgPSAwOyBpIDwgam9iLT5pbl9mZW5jZV9jb3VudDsgaSsrKSB7Cj4gLQkJaWYgKGpv Yi0+aW5fZmVuY2VzW2ldKSB7Cj4gLQkJCWZlbmNlID0gam9iLT5pbl9mZW5jZXNbaV07Cj4gLQkJ CWpvYi0+aW5fZmVuY2VzW2ldID0gTlVMTDsKPiAtCQkJcmV0dXJuIGZlbmNlOwo+IC0JCX0KPiAt CX0KPiAgCj4gLQkvKiBJbXBsaWNpdCBmZW5jZXMsIG1heC4gb25lIHBlciBCTyAqLwo+IC0JZm9y IChpID0gMDsgaSA8IGpvYi0+Ym9fY291bnQ7IGkrKykgewo+IC0JCWlmIChqb2ItPmltcGxpY2l0 X2ZlbmNlc1tpXSkgewo+IC0JCQlmZW5jZSA9IGpvYi0+aW1wbGljaXRfZmVuY2VzW2ldOwo+IC0J CQlqb2ItPmltcGxpY2l0X2ZlbmNlc1tpXSA9IE5VTEw7Cj4gLQkJCXJldHVybiBmZW5jZTsKPiAt CQl9Cj4gLQl9Cj4gKwlpZiAoIXhhX2VtcHR5KCZqb2ItPmRlcHMpKQo+ICsJCXJldHVybiB4YV9l cmFzZSgmam9iLT5kZXBzLCBqb2ItPmxhc3RfZGVwKyspOwo+ICAKPiAgCXJldHVybiBOVUxMOwo+ ICB9Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9qb2Iu aCBiL2RyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9qb2IuaAo+IGluZGV4IGJiZDNi YTk3ZmY2Ny4uODIzMDZhMDNiNTdlIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9wYW5m cm9zdC9wYW5mcm9zdF9qb2IuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5m cm9zdF9qb2IuaAo+IEBAIC0xOSw5ICsxOSw5IEBAIHN0cnVjdCBwYW5mcm9zdF9qb2Igewo+ICAJ c3RydWN0IHBhbmZyb3N0X2RldmljZSAqcGZkZXY7Cj4gIAlzdHJ1Y3QgcGFuZnJvc3RfZmlsZV9w cml2ICpmaWxlX3ByaXY7Cj4gIAo+IC0JLyogT3B0aW9uYWwgZmVuY2VzIHVzZXJzcGFjZSBjYW4g cGFzcyBpbiBmb3IgdGhlIGpvYiB0byBkZXBlbmQgb24uICovCj4gLQlzdHJ1Y3QgZG1hX2ZlbmNl ICoqaW5fZmVuY2VzOwo+IC0JdTMyIGluX2ZlbmNlX2NvdW50Owo+ICsJLyogQ29udGFpbnMgYm90 aCBleHBsaWNpdCBhbmQgaW1wbGljaXQgZmVuY2VzICovCj4gKwlzdHJ1Y3QgeGFycmF5IGRlcHM7 Cj4gKwl1bnNpZ25lZCBsb25nIGxhc3RfZGVwOwo+ICAKPiAgCS8qIEZlbmNlIHRvIGJlIHNpZ25h bGVkIGJ5IElSUSBoYW5kbGVyIHdoZW4gdGhlIGpvYiBpcyBjb21wbGV0ZS4gKi8KPiAgCXN0cnVj dCBkbWFfZmVuY2UgKmRvbmVfZmVuY2U7Cj4gQEAgLTMwLDggKzMwLDYgQEAgc3RydWN0IHBhbmZy b3N0X2pvYiB7Cj4gIAlfX3UzMiByZXF1aXJlbWVudHM7Cj4gIAlfX3UzMiBmbHVzaF9pZDsKPiAg Cj4gLQkvKiBFeGNsdXNpdmUgZmVuY2VzIHdlIGhhdmUgdGFrZW4gZnJvbSB0aGUgQk9zIHRvIHdh aXQgZm9yICovCj4gLQlzdHJ1Y3QgZG1hX2ZlbmNlICoqaW1wbGljaXRfZmVuY2VzOwo+ICAJc3Ry dWN0IHBhbmZyb3N0X2dlbV9tYXBwaW5nICoqbWFwcGluZ3M7Cj4gIAlzdHJ1Y3QgZHJtX2dlbV9v YmplY3QgKipib3M7Cj4gIAl1MzIgYm9fY291bnQ7CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69920C4743C for ; Wed, 23 Jun 2021 16:51:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B9C2610C7 for ; Wed, 23 Jun 2021 16:51:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B9C2610C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D02376E95A; Wed, 23 Jun 2021 16:51:27 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3A6E6E959; Wed, 23 Jun 2021 16:51:25 +0000 (UTC) Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 0E5DB1F438B6; Wed, 23 Jun 2021 17:51:24 +0100 (BST) Date: Wed, 23 Jun 2021 18:51:21 +0200 From: Boris Brezillon To: Daniel Vetter Subject: Re: [PATCH 05/15] drm/panfrost: Use xarray and helpers for depedency tracking Message-ID: <20210623185121.73437307@collabora.com> In-Reply-To: <20210622165511.3169559-6-daniel.vetter@ffwll.ch> References: <20210622165511.3169559-1-daniel.vetter@ffwll.ch> <20210622165511.3169559-6-daniel.vetter@ffwll.ch> Organization: Collabora X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomeu Vizoso , Intel Graphics Development , DRI Development , Steven Price , linaro-mm-sig@lists.linaro.org, Luben Tuikov , Alyssa Rosenzweig , Alex Deucher , Daniel Vetter , Lee Jones , Christian =?UTF-8?B?S8O2bmln?= , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, 22 Jun 2021 18:55:01 +0200 Daniel Vetter wrote: > More consistency and prep work for the next patch. >=20 > Aside: I wonder whether we shouldn't just move this entire xarray > business into the scheduler so that not everyone has to reinvent the > same wheels. Cc'ing some scheduler people for this too. >=20 > v2: Correctly handle sched_lock since Lucas pointed out it's needed. >=20 > v3: Rebase, dma_resv_get_excl_unlocked got renamed >=20 > v4: Don't leak job references on failure (Steven). Hehe, I had pretty much the same patch here [1]. Reviewed-by: Boris Brezillon [1]https://patchwork.kernel.org/project/dri-devel/patch/20210311092539.2405= 596-3-boris.brezillon@collabora.com/ >=20 > Cc: Lucas Stach > Cc: "Christian K=C3=B6nig" > Cc: Luben Tuikov > Cc: Alex Deucher > Cc: Lee Jones > Cc: Steven Price > Cc: Rob Herring > Cc: Tomeu Vizoso > Cc: Alyssa Rosenzweig > Cc: Sumit Semwal > Cc: linux-media@vger.kernel.org > Cc: linaro-mm-sig@lists.linaro.org > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/panfrost/panfrost_drv.c | 41 +++++++--------- > drivers/gpu/drm/panfrost/panfrost_job.c | 65 +++++++++++-------------- > drivers/gpu/drm/panfrost/panfrost_job.h | 8 ++- > 3 files changed, 49 insertions(+), 65 deletions(-) >=20 > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/pa= nfrost/panfrost_drv.c > index 075ec0ef746c..3ee828f1e7a5 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > @@ -138,12 +138,6 @@ panfrost_lookup_bos(struct drm_device *dev, > if (!job->bo_count) > return 0; > =20 > - job->implicit_fences =3D kvmalloc_array(job->bo_count, > - sizeof(struct dma_fence *), > - GFP_KERNEL | __GFP_ZERO); > - if (!job->implicit_fences) > - return -ENOMEM; > - > ret =3D drm_gem_objects_lookup(file_priv, > (void __user *)(uintptr_t)args->bo_handles, > job->bo_count, &job->bos); > @@ -174,7 +168,7 @@ panfrost_lookup_bos(struct drm_device *dev, > } > =20 > /** > - * panfrost_copy_in_sync() - Sets up job->in_fences[] with the sync obje= cts > + * panfrost_copy_in_sync() - Sets up job->deps with the sync objects > * referenced by the job. > * @dev: DRM device > * @file_priv: DRM file for this fd > @@ -194,22 +188,14 @@ panfrost_copy_in_sync(struct drm_device *dev, > { > u32 *handles; > int ret =3D 0; > - int i; > + int i, in_fence_count; > =20 > - job->in_fence_count =3D args->in_sync_count; > + in_fence_count =3D args->in_sync_count; > =20 > - if (!job->in_fence_count) > + if (!in_fence_count) > return 0; > =20 > - job->in_fences =3D kvmalloc_array(job->in_fence_count, > - sizeof(struct dma_fence *), > - GFP_KERNEL | __GFP_ZERO); > - if (!job->in_fences) { > - DRM_DEBUG("Failed to allocate job in fences\n"); > - return -ENOMEM; > - } > - > - handles =3D kvmalloc_array(job->in_fence_count, sizeof(u32), GFP_KERNEL= ); > + handles =3D kvmalloc_array(in_fence_count, sizeof(u32), GFP_KERNEL); > if (!handles) { > ret =3D -ENOMEM; > DRM_DEBUG("Failed to allocate incoming syncobj handles\n"); > @@ -218,16 +204,23 @@ panfrost_copy_in_sync(struct drm_device *dev, > =20 > if (copy_from_user(handles, > (void __user *)(uintptr_t)args->in_syncs, > - job->in_fence_count * sizeof(u32))) { > + in_fence_count * sizeof(u32))) { > ret =3D -EFAULT; > DRM_DEBUG("Failed to copy in syncobj handles\n"); > goto fail; > } > =20 > - for (i =3D 0; i < job->in_fence_count; i++) { > + for (i =3D 0; i < in_fence_count; i++) { > + struct dma_fence *fence; > + > ret =3D drm_syncobj_find_fence(file_priv, handles[i], 0, 0, > - &job->in_fences[i]); > - if (ret =3D=3D -EINVAL) > + &fence); > + if (ret) > + goto fail; > + > + ret =3D drm_gem_fence_array_add(&job->deps, fence); > + > + if (ret) > goto fail; > } > =20 > @@ -265,6 +258,8 @@ static int panfrost_ioctl_submit(struct drm_device *d= ev, void *data, > =20 > kref_init(&job->refcount); > =20 > + xa_init_flags(&job->deps, XA_FLAGS_ALLOC); > + > job->pfdev =3D pfdev; > job->jc =3D args->jc; > job->requirements =3D args->requirements; > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/pa= nfrost/panfrost_job.c > index 38f8580c19f1..71cd43fa1b36 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_job.c > +++ b/drivers/gpu/drm/panfrost/panfrost_job.c > @@ -196,14 +196,21 @@ static void panfrost_job_hw_submit(struct panfrost_= job *job, int js) > job_write(pfdev, JS_COMMAND_NEXT(js), JS_COMMAND_START); > } > =20 > -static void panfrost_acquire_object_fences(struct drm_gem_object **bos, > - int bo_count, > - struct dma_fence **implicit_fences) > +static int panfrost_acquire_object_fences(struct drm_gem_object **bos, > + int bo_count, > + struct xarray *deps) > { > - int i; > + int i, ret; > =20 > - for (i =3D 0; i < bo_count; i++) > - implicit_fences[i] =3D dma_resv_get_excl_unlocked(bos[i]->resv); > + for (i =3D 0; i < bo_count; i++) { > + struct dma_fence *fence =3D dma_resv_get_excl_unlocked(bos[i]->resv); > + > + ret =3D drm_gem_fence_array_add(deps, fence); > + if (ret) > + return ret; > + } > + > + return 0; > } > =20 > static void panfrost_attach_object_fences(struct drm_gem_object **bos, > @@ -240,10 +247,14 @@ int panfrost_job_push(struct panfrost_job *job) > =20 > job->render_done_fence =3D dma_fence_get(&job->base.s_fence->finished); > =20 > - kref_get(&job->refcount); /* put by scheduler job completion */ > + ret =3D panfrost_acquire_object_fences(job->bos, job->bo_count, > + &job->deps); > + if (ret) { > + mutex_unlock(&pfdev->sched_lock); > + goto unlock; > + } > =20 > - panfrost_acquire_object_fences(job->bos, job->bo_count, > - job->implicit_fences); > + kref_get(&job->refcount); /* put by scheduler job completion */ > =20 > drm_sched_entity_push_job(&job->base, entity); > =20 > @@ -262,18 +273,15 @@ static void panfrost_job_cleanup(struct kref *ref) > { > struct panfrost_job *job =3D container_of(ref, struct panfrost_job, > refcount); > + struct dma_fence *fence; > + unsigned long index; > unsigned int i; > =20 > - if (job->in_fences) { > - for (i =3D 0; i < job->in_fence_count; i++) > - dma_fence_put(job->in_fences[i]); > - kvfree(job->in_fences); > - } > - if (job->implicit_fences) { > - for (i =3D 0; i < job->bo_count; i++) > - dma_fence_put(job->implicit_fences[i]); > - kvfree(job->implicit_fences); > + xa_for_each(&job->deps, index, fence) { > + dma_fence_put(fence); > } > + xa_destroy(&job->deps); > + > dma_fence_put(job->done_fence); > dma_fence_put(job->render_done_fence); > =20 > @@ -316,26 +324,9 @@ static struct dma_fence *panfrost_job_dependency(str= uct drm_sched_job *sched_job > struct drm_sched_entity *s_entity) > { > struct panfrost_job *job =3D to_panfrost_job(sched_job); > - struct dma_fence *fence; > - unsigned int i; > - > - /* Explicit fences */ > - for (i =3D 0; i < job->in_fence_count; i++) { > - if (job->in_fences[i]) { > - fence =3D job->in_fences[i]; > - job->in_fences[i] =3D NULL; > - return fence; > - } > - } > =20 > - /* Implicit fences, max. one per BO */ > - for (i =3D 0; i < job->bo_count; i++) { > - if (job->implicit_fences[i]) { > - fence =3D job->implicit_fences[i]; > - job->implicit_fences[i] =3D NULL; > - return fence; > - } > - } > + if (!xa_empty(&job->deps)) > + return xa_erase(&job->deps, job->last_dep++); > =20 > return NULL; > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.h b/drivers/gpu/drm/pa= nfrost/panfrost_job.h > index bbd3ba97ff67..82306a03b57e 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_job.h > +++ b/drivers/gpu/drm/panfrost/panfrost_job.h > @@ -19,9 +19,9 @@ struct panfrost_job { > struct panfrost_device *pfdev; > struct panfrost_file_priv *file_priv; > =20 > - /* Optional fences userspace can pass in for the job to depend on. */ > - struct dma_fence **in_fences; > - u32 in_fence_count; > + /* Contains both explicit and implicit fences */ > + struct xarray deps; > + unsigned long last_dep; > =20 > /* Fence to be signaled by IRQ handler when the job is complete. */ > struct dma_fence *done_fence; > @@ -30,8 +30,6 @@ struct panfrost_job { > __u32 requirements; > __u32 flush_id; > =20 > - /* Exclusive fences we have taken from the BOs to wait for */ > - struct dma_fence **implicit_fences; > struct panfrost_gem_mapping **mappings; > struct drm_gem_object **bos; > u32 bo_count; From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63115C4743C for ; Wed, 23 Jun 2021 16:51:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D0DF610C7 for ; Wed, 23 Jun 2021 16:51:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229755AbhFWQxn convert rfc822-to-8bit (ORCPT ); Wed, 23 Jun 2021 12:53:43 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:53648 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbhFWQxm (ORCPT ); Wed, 23 Jun 2021 12:53:42 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 0E5DB1F438B6; Wed, 23 Jun 2021 17:51:24 +0100 (BST) Date: Wed, 23 Jun 2021 18:51:21 +0200 From: Boris Brezillon To: Daniel Vetter Cc: DRI Development , Tomeu Vizoso , Intel Graphics Development , Steven Price , linaro-mm-sig@lists.linaro.org, Luben Tuikov , Alyssa Rosenzweig , Alex Deucher , Daniel Vetter , linux-media@vger.kernel.org, Lee Jones , Christian =?UTF-8?B?S8O2bmln?= Subject: Re: [PATCH 05/15] drm/panfrost: Use xarray and helpers for depedency tracking Message-ID: <20210623185121.73437307@collabora.com> In-Reply-To: <20210622165511.3169559-6-daniel.vetter@ffwll.ch> References: <20210622165511.3169559-1-daniel.vetter@ffwll.ch> <20210622165511.3169559-6-daniel.vetter@ffwll.ch> Organization: Collabora X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Tue, 22 Jun 2021 18:55:01 +0200 Daniel Vetter wrote: > More consistency and prep work for the next patch. > > Aside: I wonder whether we shouldn't just move this entire xarray > business into the scheduler so that not everyone has to reinvent the > same wheels. Cc'ing some scheduler people for this too. > > v2: Correctly handle sched_lock since Lucas pointed out it's needed. > > v3: Rebase, dma_resv_get_excl_unlocked got renamed > > v4: Don't leak job references on failure (Steven). Hehe, I had pretty much the same patch here [1]. Reviewed-by: Boris Brezillon [1]https://patchwork.kernel.org/project/dri-devel/patch/20210311092539.2405596-3-boris.brezillon@collabora.com/ > > Cc: Lucas Stach > Cc: "Christian König" > Cc: Luben Tuikov > Cc: Alex Deucher > Cc: Lee Jones > Cc: Steven Price > Cc: Rob Herring > Cc: Tomeu Vizoso > Cc: Alyssa Rosenzweig > Cc: Sumit Semwal > Cc: linux-media@vger.kernel.org > Cc: linaro-mm-sig@lists.linaro.org > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/panfrost/panfrost_drv.c | 41 +++++++--------- > drivers/gpu/drm/panfrost/panfrost_job.c | 65 +++++++++++-------------- > drivers/gpu/drm/panfrost/panfrost_job.h | 8 ++- > 3 files changed, 49 insertions(+), 65 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c > index 075ec0ef746c..3ee828f1e7a5 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > @@ -138,12 +138,6 @@ panfrost_lookup_bos(struct drm_device *dev, > if (!job->bo_count) > return 0; > > - job->implicit_fences = kvmalloc_array(job->bo_count, > - sizeof(struct dma_fence *), > - GFP_KERNEL | __GFP_ZERO); > - if (!job->implicit_fences) > - return -ENOMEM; > - > ret = drm_gem_objects_lookup(file_priv, > (void __user *)(uintptr_t)args->bo_handles, > job->bo_count, &job->bos); > @@ -174,7 +168,7 @@ panfrost_lookup_bos(struct drm_device *dev, > } > > /** > - * panfrost_copy_in_sync() - Sets up job->in_fences[] with the sync objects > + * panfrost_copy_in_sync() - Sets up job->deps with the sync objects > * referenced by the job. > * @dev: DRM device > * @file_priv: DRM file for this fd > @@ -194,22 +188,14 @@ panfrost_copy_in_sync(struct drm_device *dev, > { > u32 *handles; > int ret = 0; > - int i; > + int i, in_fence_count; > > - job->in_fence_count = args->in_sync_count; > + in_fence_count = args->in_sync_count; > > - if (!job->in_fence_count) > + if (!in_fence_count) > return 0; > > - job->in_fences = kvmalloc_array(job->in_fence_count, > - sizeof(struct dma_fence *), > - GFP_KERNEL | __GFP_ZERO); > - if (!job->in_fences) { > - DRM_DEBUG("Failed to allocate job in fences\n"); > - return -ENOMEM; > - } > - > - handles = kvmalloc_array(job->in_fence_count, sizeof(u32), GFP_KERNEL); > + handles = kvmalloc_array(in_fence_count, sizeof(u32), GFP_KERNEL); > if (!handles) { > ret = -ENOMEM; > DRM_DEBUG("Failed to allocate incoming syncobj handles\n"); > @@ -218,16 +204,23 @@ panfrost_copy_in_sync(struct drm_device *dev, > > if (copy_from_user(handles, > (void __user *)(uintptr_t)args->in_syncs, > - job->in_fence_count * sizeof(u32))) { > + in_fence_count * sizeof(u32))) { > ret = -EFAULT; > DRM_DEBUG("Failed to copy in syncobj handles\n"); > goto fail; > } > > - for (i = 0; i < job->in_fence_count; i++) { > + for (i = 0; i < in_fence_count; i++) { > + struct dma_fence *fence; > + > ret = drm_syncobj_find_fence(file_priv, handles[i], 0, 0, > - &job->in_fences[i]); > - if (ret == -EINVAL) > + &fence); > + if (ret) > + goto fail; > + > + ret = drm_gem_fence_array_add(&job->deps, fence); > + > + if (ret) > goto fail; > } > > @@ -265,6 +258,8 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data, > > kref_init(&job->refcount); > > + xa_init_flags(&job->deps, XA_FLAGS_ALLOC); > + > job->pfdev = pfdev; > job->jc = args->jc; > job->requirements = args->requirements; > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c > index 38f8580c19f1..71cd43fa1b36 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_job.c > +++ b/drivers/gpu/drm/panfrost/panfrost_job.c > @@ -196,14 +196,21 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) > job_write(pfdev, JS_COMMAND_NEXT(js), JS_COMMAND_START); > } > > -static void panfrost_acquire_object_fences(struct drm_gem_object **bos, > - int bo_count, > - struct dma_fence **implicit_fences) > +static int panfrost_acquire_object_fences(struct drm_gem_object **bos, > + int bo_count, > + struct xarray *deps) > { > - int i; > + int i, ret; > > - for (i = 0; i < bo_count; i++) > - implicit_fences[i] = dma_resv_get_excl_unlocked(bos[i]->resv); > + for (i = 0; i < bo_count; i++) { > + struct dma_fence *fence = dma_resv_get_excl_unlocked(bos[i]->resv); > + > + ret = drm_gem_fence_array_add(deps, fence); > + if (ret) > + return ret; > + } > + > + return 0; > } > > static void panfrost_attach_object_fences(struct drm_gem_object **bos, > @@ -240,10 +247,14 @@ int panfrost_job_push(struct panfrost_job *job) > > job->render_done_fence = dma_fence_get(&job->base.s_fence->finished); > > - kref_get(&job->refcount); /* put by scheduler job completion */ > + ret = panfrost_acquire_object_fences(job->bos, job->bo_count, > + &job->deps); > + if (ret) { > + mutex_unlock(&pfdev->sched_lock); > + goto unlock; > + } > > - panfrost_acquire_object_fences(job->bos, job->bo_count, > - job->implicit_fences); > + kref_get(&job->refcount); /* put by scheduler job completion */ > > drm_sched_entity_push_job(&job->base, entity); > > @@ -262,18 +273,15 @@ static void panfrost_job_cleanup(struct kref *ref) > { > struct panfrost_job *job = container_of(ref, struct panfrost_job, > refcount); > + struct dma_fence *fence; > + unsigned long index; > unsigned int i; > > - if (job->in_fences) { > - for (i = 0; i < job->in_fence_count; i++) > - dma_fence_put(job->in_fences[i]); > - kvfree(job->in_fences); > - } > - if (job->implicit_fences) { > - for (i = 0; i < job->bo_count; i++) > - dma_fence_put(job->implicit_fences[i]); > - kvfree(job->implicit_fences); > + xa_for_each(&job->deps, index, fence) { > + dma_fence_put(fence); > } > + xa_destroy(&job->deps); > + > dma_fence_put(job->done_fence); > dma_fence_put(job->render_done_fence); > > @@ -316,26 +324,9 @@ static struct dma_fence *panfrost_job_dependency(struct drm_sched_job *sched_job > struct drm_sched_entity *s_entity) > { > struct panfrost_job *job = to_panfrost_job(sched_job); > - struct dma_fence *fence; > - unsigned int i; > - > - /* Explicit fences */ > - for (i = 0; i < job->in_fence_count; i++) { > - if (job->in_fences[i]) { > - fence = job->in_fences[i]; > - job->in_fences[i] = NULL; > - return fence; > - } > - } > > - /* Implicit fences, max. one per BO */ > - for (i = 0; i < job->bo_count; i++) { > - if (job->implicit_fences[i]) { > - fence = job->implicit_fences[i]; > - job->implicit_fences[i] = NULL; > - return fence; > - } > - } > + if (!xa_empty(&job->deps)) > + return xa_erase(&job->deps, job->last_dep++); > > return NULL; > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.h b/drivers/gpu/drm/panfrost/panfrost_job.h > index bbd3ba97ff67..82306a03b57e 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_job.h > +++ b/drivers/gpu/drm/panfrost/panfrost_job.h > @@ -19,9 +19,9 @@ struct panfrost_job { > struct panfrost_device *pfdev; > struct panfrost_file_priv *file_priv; > > - /* Optional fences userspace can pass in for the job to depend on. */ > - struct dma_fence **in_fences; > - u32 in_fence_count; > + /* Contains both explicit and implicit fences */ > + struct xarray deps; > + unsigned long last_dep; > > /* Fence to be signaled by IRQ handler when the job is complete. */ > struct dma_fence *done_fence; > @@ -30,8 +30,6 @@ struct panfrost_job { > __u32 requirements; > __u32 flush_id; > > - /* Exclusive fences we have taken from the BOs to wait for */ > - struct dma_fence **implicit_fences; > struct panfrost_gem_mapping **mappings; > struct drm_gem_object **bos; > u32 bo_count;