[v2] drm/gem-cma-helper: Change the level of the allocation failure message

Submitted by Boris Brezillon on Oct. 5, 2017, 11:29 a.m.

Details

Message ID 20171005112917.15949-1-boris.brezillon@free-electrons.com
State Accepted
Commit e0ad7c0f37478853f12a723f46f87cd672ca9d67
Headers show
Series "drm/gem-cma-helper: Change the level of the allocation failure message" ( rev: 2 ) in DRI devel

Not browsing as part of any series.

Commit Message

Boris Brezillon Oct. 5, 2017, 11:29 a.m.
drm_gem_cma_create() prints an error message when dma_alloc_wc() fails to
allocate the amount of memory we requested. This can lead to annoying
error messages when CMA is only one possible source of memory for the BO
allocation. Turn this error message into a debug one.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
---
Changes in v2:
- Remove __must_check attribute
---
 drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index 373e33f22be4..020e7668dfab 100644
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -112,7 +112,7 @@  struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,
 	cma_obj->vaddr = dma_alloc_wc(drm->dev, size, &cma_obj->paddr,
 				      GFP_KERNEL | __GFP_NOWARN);
 	if (!cma_obj->vaddr) {
-		dev_err(drm->dev, "failed to allocate buffer with size %zu\n",
+		dev_dbg(drm->dev, "failed to allocate buffer with size %zu\n",
 			size);
 		ret = -ENOMEM;
 		goto error;

Comments

Boris Brezillon <boris.brezillon@free-electrons.com> writes:

> drm_gem_cma_create() prints an error message when dma_alloc_wc() fails to
> allocate the amount of memory we requested. This can lead to annoying
> error messages when CMA is only one possible source of memory for the BO
> allocation. Turn this error message into a debug one.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

Reviewed-by: Eric Anholt <eric@anholt.net>
On Thu,  5 Oct 2017 13:29:17 +0200
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> drm_gem_cma_create() prints an error message when dma_alloc_wc() fails to
> allocate the amount of memory we requested. This can lead to annoying
> error messages when CMA is only one possible source of memory for the BO
> allocation. Turn this error message into a debug one.

Applied to drm-misc-next.

> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
> ---
> Changes in v2:
> - Remove __must_check attribute
> ---
>  drivers/gpu/drm/drm_gem_cma_helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
> index 373e33f22be4..020e7668dfab 100644
> --- a/drivers/gpu/drm/drm_gem_cma_helper.c
> +++ b/drivers/gpu/drm/drm_gem_cma_helper.c
> @@ -112,7 +112,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,
>  	cma_obj->vaddr = dma_alloc_wc(drm->dev, size, &cma_obj->paddr,
>  				      GFP_KERNEL | __GFP_NOWARN);
>  	if (!cma_obj->vaddr) {
> -		dev_err(drm->dev, "failed to allocate buffer with size %zu\n",
> +		dev_dbg(drm->dev, "failed to allocate buffer with size %zu\n",
>  			size);
>  		ret = -ENOMEM;
>  		goto error;