From: Philipp Zabel <p.zabel@pengutronix.de>
To: Lucas Stach <l.stach@pengutronix.de>, etnaviv@lists.freedesktop.org
Cc: Russell King <linux+etnaviv@armlinux.org.uk>,
dri-devel@lists.freedesktop.org, kernel@pengutronix.de,
patchwork-lst@pengutronix.de
Subject: Re: [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value
Date: Wed, 24 Jul 2019 12:51:29 +0200 [thread overview]
Message-ID: <1563965489.2914.4.camel@pengutronix.de> (raw)
In-Reply-To: <20190705171536.26727-1-l.stach@pengutronix.de>
On Fri, 2019-07-05 at 19:15 +0200, Lucas Stach wrote:
> The call site expects to get either a valid suballoc or an error
> pointer, so a NULL return will not be treated as an error. Make
> sure to always return a proper error pointer in case something goes
> wrong.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
regards
Philipp
> drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
> index bb4900bc1c4c..7b77992f31c4 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
> @@ -48,8 +48,10 @@ etnaviv_cmdbuf_suballoc_new(struct etnaviv_gpu * gpu)
>
> suballoc->vaddr = dma_alloc_wc(gpu->dev, SUBALLOC_SIZE,
> &suballoc->paddr, GFP_KERNEL);
> - if (!suballoc->vaddr)
> + if (!suballoc->vaddr) {
> + ret = -ENOMEM;
> goto free_suballoc;
> + }
>
> ret = etnaviv_iommu_get_suballoc_va(gpu, suballoc->paddr,
> &suballoc->vram_node, SUBALLOC_SIZE,
> @@ -64,7 +66,7 @@ etnaviv_cmdbuf_suballoc_new(struct etnaviv_gpu * gpu)
> free_suballoc:
> kfree(suballoc);
>
> - return NULL;
> + return ERR_PTR(ret);
> }
>
> void etnaviv_cmdbuf_suballoc_destroy(struct etnaviv_cmdbuf_suballoc *suballoc)
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-07-24 10:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-05 17:15 [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value Lucas Stach
2019-07-05 17:15 ` [PATCH 2/2] drm/etnaviv: remove unused function etnaviv_gem_mapping_reference Lucas Stach
2019-07-24 10:51 ` Philipp Zabel
2019-08-02 8:20 ` Guido Günther
2019-07-24 10:51 ` Philipp Zabel [this message]
2019-08-02 8:19 ` [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value Guido Günther
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1563965489.2914.4.camel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=etnaviv@lists.freedesktop.org \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=linux+etnaviv@armlinux.org.uk \
--cc=patchwork-lst@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox