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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 875CFC432C0 for ; Fri, 29 Nov 2019 14:32:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BD4421736 for ; Fri, 29 Nov 2019 14:32:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726975AbfK2OcA (ORCPT ); Fri, 29 Nov 2019 09:32:00 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:35926 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726902AbfK2Ob7 (ORCPT ); Fri, 29 Nov 2019 09:31:59 -0500 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 B1F3A2929F0; Fri, 29 Nov 2019 14:31:58 +0000 (GMT) Date: Fri, 29 Nov 2019 15:31:55 +0100 From: Boris Brezillon To: Steven Price Cc: Rob Herring , Tomeu Vizoso , Alyssa Rosenzweig , stable@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH 1/8] drm/panfrost: Make panfrost_job_run() return an ERR_PTR() instead of NULL Message-ID: <20191129153155.78003c4e@collabora.com> In-Reply-To: <7444054c-52b4-32d1-70c2-52bf9c5f2871@arm.com> References: <20191129135908.2439529-1-boris.brezillon@collabora.com> <20191129135908.2439529-2-boris.brezillon@collabora.com> <7444054c-52b4-32d1-70c2-52bf9c5f2871@arm.com> Organization: Collabora X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Fri, 29 Nov 2019 14:19:50 +0000 Steven Price wrote: > On 29/11/2019 13:59, Boris Brezillon wrote: > > If we don't do that, dma_fence_set_error() complains (called from > > drm_sched_main()). > > > > Fixes: f3ba91228e8e ("drm/panfrost: Add initial panfrost driver") > > Cc: > > Signed-off-by: Boris Brezillon > > This might be worth doing, but actually it's not Panfrost that is broken > it's the callers, see [1] and [2]. So I don't think we want the > Fixes/stable tag. Okay. > > [1] https://patchwork.kernel.org/patch/11218399/ > [2] https://patchwork.kernel.org/patch/11267073/ > > > --- > > drivers/gpu/drm/panfrost/panfrost_job.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c > > index 21f34d44aac2..cdd9448fbbdd 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_job.c > > +++ b/drivers/gpu/drm/panfrost/panfrost_job.c > > @@ -328,13 +328,13 @@ static struct dma_fence *panfrost_job_run(struct drm_sched_job *sched_job) > > struct dma_fence *fence = NULL; > > > > if (unlikely(job->base.s_fence->finished.error)) > > - return NULL; > > + return ERR_PTR(job->base.s_fence->finished.error); Hm, so we can keep the return NULL here if [1] is applied (the error is preserved), but I'm not sure it's clearer that way. > > > > pfdev->jobs[slot] = job; > > > > fence = panfrost_fence_create(pfdev, slot); > > if (IS_ERR(fence)) > > - return NULL; > > + return ERR_PTR(-ENOMEM); This one should be fixed though, otherwise the error is never updated, so I'm wondering if it doesn't deserve a Fixes tag in the end... > > Why override the error from panfrost_fence_create? In this case we can just: > > return fence; Indeed. > > Steve > > > > > if (job->done_fence) > > dma_fence_put(job->done_fence); > > > 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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 AB267C432C0 for ; Fri, 29 Nov 2019 14:32:02 +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 8C32421736 for ; Fri, 29 Nov 2019 14:32:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C32421736 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 081D86E91C; Fri, 29 Nov 2019 14:32:02 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 240106E91C for ; Fri, 29 Nov 2019 14:32:00 +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 B1F3A2929F0; Fri, 29 Nov 2019 14:31:58 +0000 (GMT) Date: Fri, 29 Nov 2019 15:31:55 +0100 From: Boris Brezillon To: Steven Price Subject: Re: [PATCH 1/8] drm/panfrost: Make panfrost_job_run() return an ERR_PTR() instead of NULL Message-ID: <20191129153155.78003c4e@collabora.com> In-Reply-To: <7444054c-52b4-32d1-70c2-52bf9c5f2871@arm.com> References: <20191129135908.2439529-1-boris.brezillon@collabora.com> <20191129135908.2439529-2-boris.brezillon@collabora.com> <7444054c-52b4-32d1-70c2-52bf9c5f2871@arm.com> Organization: Collabora X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable@vger.kernel.org, dri-devel@lists.freedesktop.org, Rob Herring , Alyssa Rosenzweig Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191129143155.PnxNsDD3d0f6LpbGrC319B7C2IceQgZvbpt9QiDV7eU@z> T24gRnJpLCAyOSBOb3YgMjAxOSAxNDoxOTo1MCArMDAwMApTdGV2ZW4gUHJpY2UgPHN0ZXZlbi5w cmljZUBhcm0uY29tPiB3cm90ZToKCj4gT24gMjkvMTEvMjAxOSAxMzo1OSwgQm9yaXMgQnJlemls bG9uIHdyb3RlOgo+ID4gSWYgd2UgZG9uJ3QgZG8gdGhhdCwgZG1hX2ZlbmNlX3NldF9lcnJvcigp IGNvbXBsYWlucyAoY2FsbGVkIGZyb20KPiA+IGRybV9zY2hlZF9tYWluKCkpLgo+ID4gCj4gPiBG aXhlczogZjNiYTkxMjI4ZThlICgiZHJtL3BhbmZyb3N0OiBBZGQgaW5pdGlhbCBwYW5mcm9zdCBk cml2ZXIiKQo+ID4gQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPgo+ID4gU2lnbmVkLW9mZi1i eTogQm9yaXMgQnJlemlsbG9uIDxib3Jpcy5icmV6aWxsb25AY29sbGFib3JhLmNvbT4gIAo+IAo+ IFRoaXMgbWlnaHQgYmUgd29ydGggZG9pbmcsIGJ1dCBhY3R1YWxseSBpdCdzIG5vdCBQYW5mcm9z dCB0aGF0IGlzIGJyb2tlbgo+IGl0J3MgdGhlIGNhbGxlcnMsIHNlZSBbMV0gYW5kIFsyXS4gU28g SSBkb24ndCB0aGluayB3ZSB3YW50IHRoZQo+IEZpeGVzL3N0YWJsZSB0YWcuCgpPa2F5LgoKPiAK PiBbMV0gaHR0cHM6Ly9wYXRjaHdvcmsua2VybmVsLm9yZy9wYXRjaC8xMTIxODM5OS8KPiBbMl0g aHR0cHM6Ly9wYXRjaHdvcmsua2VybmVsLm9yZy9wYXRjaC8xMTI2NzA3My8KPiAKPiA+IC0tLQo+ ID4gIGRyaXZlcnMvZ3B1L2RybS9wYW5mcm9zdC9wYW5mcm9zdF9qb2IuYyB8IDQgKystLQo+ID4g IDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4gPiAKPiA+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3Rfam9iLmMgYi9k cml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3Rfam9iLmMKPiA+IGluZGV4IDIxZjM0ZDQ0 YWFjMi4uY2RkOTQ0OGZiYmRkIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3BhbmZy b3N0L3BhbmZyb3N0X2pvYi5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFu ZnJvc3Rfam9iLmMKPiA+IEBAIC0zMjgsMTMgKzMyOCwxMyBAQCBzdGF0aWMgc3RydWN0IGRtYV9m ZW5jZSAqcGFuZnJvc3Rfam9iX3J1bihzdHJ1Y3QgZHJtX3NjaGVkX2pvYiAqc2NoZWRfam9iKQo+ ID4gIAlzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZSA9IE5VTEw7Cj4gPiAgCj4gPiAgCWlmICh1bmxp a2VseShqb2ItPmJhc2Uuc19mZW5jZS0+ZmluaXNoZWQuZXJyb3IpKQo+ID4gLQkJcmV0dXJuIE5V TEw7Cj4gPiArCQlyZXR1cm4gRVJSX1BUUihqb2ItPmJhc2Uuc19mZW5jZS0+ZmluaXNoZWQuZXJy b3IpOwoKSG0sIHNvIHdlIGNhbiBrZWVwIHRoZSByZXR1cm4gTlVMTCBoZXJlIGlmIFsxXSBpcyBh cHBsaWVkICh0aGUgZXJyb3IKaXMgcHJlc2VydmVkKSwgYnV0IEknbSBub3Qgc3VyZSBpdCdzIGNs ZWFyZXIgdGhhdCB3YXkuCgo+ID4gIAo+ID4gIAlwZmRldi0+am9ic1tzbG90XSA9IGpvYjsKPiA+ ICAKPiA+ICAJZmVuY2UgPSBwYW5mcm9zdF9mZW5jZV9jcmVhdGUocGZkZXYsIHNsb3QpOwo+ID4g IAlpZiAoSVNfRVJSKGZlbmNlKSkKPiA+IC0JCXJldHVybiBOVUxMOwo+ID4gKwkJcmV0dXJuIEVS Ul9QVFIoLUVOT01FTSk7ICAKClRoaXMgb25lIHNob3VsZCBiZSBmaXhlZCB0aG91Z2gsIG90aGVy d2lzZSB0aGUgZXJyb3IgaXMgbmV2ZXIgdXBkYXRlZCwKc28gSSdtIHdvbmRlcmluZyBpZiBpdCBk b2Vzbid0IGRlc2VydmUgYSBGaXhlcyB0YWcgaW4gdGhlIGVuZC4uLgoKPiAKPiBXaHkgb3ZlcnJp ZGUgdGhlIGVycm9yIGZyb20gcGFuZnJvc3RfZmVuY2VfY3JlYXRlPyBJbiB0aGlzIGNhc2Ugd2Ug Y2FuIGp1c3Q6Cj4gCj4gCXJldHVybiBmZW5jZTsKCkluZGVlZC4KCj4gCj4gU3RldmUKPiAKPiA+ ICAKPiA+ICAJaWYgKGpvYi0+ZG9uZV9mZW5jZSkKPiA+ICAJCWRtYV9mZW5jZV9wdXQoam9iLT5k b25lX2ZlbmNlKTsKPiA+ICAgCj4gCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWw=