* [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value
@ 2019-07-05 17:15 Lucas Stach
2019-07-05 17:15 ` [PATCH 2/2] drm/etnaviv: remove unused function etnaviv_gem_mapping_reference Lucas Stach
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Lucas Stach @ 2019-07-05 17:15 UTC (permalink / raw)
To: etnaviv; +Cc: patchwork-lst, kernel, dri-devel, Russell King
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>
---
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)
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] drm/etnaviv: remove unused function etnaviv_gem_mapping_reference
2019-07-05 17:15 [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value Lucas Stach
@ 2019-07-05 17:15 ` Lucas Stach
2019-07-24 10:51 ` Philipp Zabel
2019-08-02 8:20 ` Guido Günther
2019-07-24 10:51 ` [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value Philipp Zabel
2019-08-02 8:19 ` Guido Günther
2 siblings, 2 replies; 6+ messages in thread
From: Lucas Stach @ 2019-07-05 17:15 UTC (permalink / raw)
To: etnaviv; +Cc: patchwork-lst, kernel, dri-devel, Russell King
Hasn't been used for quite a while. There is no point in keeping
unused code around.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 12 ------------
drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 -
2 files changed, 13 deletions(-)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 727bb3f5ceb2..e199a6833ff0 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -235,18 +235,6 @@ etnaviv_gem_get_vram_mapping(struct etnaviv_gem_object *obj,
return NULL;
}
-void etnaviv_gem_mapping_reference(struct etnaviv_vram_mapping *mapping)
-{
- struct etnaviv_gem_object *etnaviv_obj = mapping->object;
-
- drm_gem_object_get(&etnaviv_obj->base);
-
- mutex_lock(&etnaviv_obj->lock);
- WARN_ON(mapping->use == 0);
- mapping->use += 1;
- mutex_unlock(&etnaviv_obj->lock);
-}
-
void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)
{
struct etnaviv_gem_object *etnaviv_obj = mapping->object;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
index 753c458497d0..d7d8a835f379 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
@@ -120,7 +120,6 @@ void etnaviv_gem_put_pages(struct etnaviv_gem_object *obj);
struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
struct drm_gem_object *obj, struct etnaviv_gpu *gpu);
-void etnaviv_gem_mapping_reference(struct etnaviv_vram_mapping *mapping);
void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping);
#endif /* __ETNAVIV_GEM_H__ */
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value
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:19 ` Guido Günther
2 siblings, 0 replies; 6+ messages in thread
From: Philipp Zabel @ 2019-07-24 10:51 UTC (permalink / raw)
To: Lucas Stach, etnaviv; +Cc: Russell King, dri-devel, kernel, patchwork-lst
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/etnaviv: remove unused function etnaviv_gem_mapping_reference
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
1 sibling, 0 replies; 6+ messages in thread
From: Philipp Zabel @ 2019-07-24 10:51 UTC (permalink / raw)
To: Lucas Stach, etnaviv; +Cc: Russell King, dri-devel, kernel, patchwork-lst
On Fri, 2019-07-05 at 19:15 +0200, Lucas Stach wrote:
> Hasn't been used for quite a while. There is no point in keeping
> unused code around.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
regards
Philipp
> ---
> drivers/gpu/drm/etnaviv/etnaviv_gem.c | 12 ------------
> drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 -
> 2 files changed, 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> index 727bb3f5ceb2..e199a6833ff0 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> @@ -235,18 +235,6 @@ etnaviv_gem_get_vram_mapping(struct etnaviv_gem_object *obj,
> return NULL;
> }
>
> -void etnaviv_gem_mapping_reference(struct etnaviv_vram_mapping *mapping)
> -{
> - struct etnaviv_gem_object *etnaviv_obj = mapping->object;
> -
> - drm_gem_object_get(&etnaviv_obj->base);
> -
> - mutex_lock(&etnaviv_obj->lock);
> - WARN_ON(mapping->use == 0);
> - mapping->use += 1;
> - mutex_unlock(&etnaviv_obj->lock);
> -}
> -
> void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)
> {
> struct etnaviv_gem_object *etnaviv_obj = mapping->object;
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> index 753c458497d0..d7d8a835f379 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> @@ -120,7 +120,6 @@ void etnaviv_gem_put_pages(struct etnaviv_gem_object *obj);
>
> struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
> struct drm_gem_object *obj, struct etnaviv_gpu *gpu);
> -void etnaviv_gem_mapping_reference(struct etnaviv_vram_mapping *mapping);
> void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping);
>
> #endif /* __ETNAVIV_GEM_H__ */
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value
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 ` [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value Philipp Zabel
@ 2019-08-02 8:19 ` Guido Günther
2 siblings, 0 replies; 6+ messages in thread
From: Guido Günther @ 2019-08-02 8:19 UTC (permalink / raw)
To: Lucas Stach; +Cc: etnaviv, dri-devel, patchwork-lst, kernel, Russell King
Hi,
On Fri, Jul 05, 2019 at 07:15:35PM +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>
> ---
> 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)
Reviewed-by: Guido Günther <agx@sigxcpu.org>
Cheers,
-- Guido
> --
> 2.20.1
>
> _______________________________________________
> etnaviv mailing list
> etnaviv@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/etnaviv
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/etnaviv: remove unused function etnaviv_gem_mapping_reference
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
1 sibling, 0 replies; 6+ messages in thread
From: Guido Günther @ 2019-08-02 8:20 UTC (permalink / raw)
To: Lucas Stach; +Cc: etnaviv, dri-devel, patchwork-lst, kernel, Russell King
Hi,
On Fri, Jul 05, 2019 at 07:15:36PM +0200, Lucas Stach wrote:
> Hasn't been used for quite a while. There is no point in keeping
> unused code around.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> drivers/gpu/drm/etnaviv/etnaviv_gem.c | 12 ------------
> drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 -
> 2 files changed, 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> index 727bb3f5ceb2..e199a6833ff0 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> @@ -235,18 +235,6 @@ etnaviv_gem_get_vram_mapping(struct etnaviv_gem_object *obj,
> return NULL;
> }
>
> -void etnaviv_gem_mapping_reference(struct etnaviv_vram_mapping *mapping)
> -{
> - struct etnaviv_gem_object *etnaviv_obj = mapping->object;
> -
> - drm_gem_object_get(&etnaviv_obj->base);
> -
> - mutex_lock(&etnaviv_obj->lock);
> - WARN_ON(mapping->use == 0);
> - mapping->use += 1;
> - mutex_unlock(&etnaviv_obj->lock);
> -}
> -
> void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)
> {
> struct etnaviv_gem_object *etnaviv_obj = mapping->object;
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> index 753c458497d0..d7d8a835f379 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> @@ -120,7 +120,6 @@ void etnaviv_gem_put_pages(struct etnaviv_gem_object *obj);
>
> struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
> struct drm_gem_object *obj, struct etnaviv_gpu *gpu);
> -void etnaviv_gem_mapping_reference(struct etnaviv_vram_mapping *mapping);
> void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping);
>
> #endif /* __ETNAVIV_GEM_H__ */
Reviewed-by: Guido Günther <agx@sigxcpu.org>
cheers,
-- Guido
> --
> 2.20.1
>
> _______________________________________________
> etnaviv mailing list
> etnaviv@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/etnaviv
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-08-02 8:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 1/2] drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value Philipp Zabel
2019-08-02 8:19 ` Guido Günther
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).