dma_alloc_attrs() returns NULL if it cannot allocate a dma buffer (or mapping), not a negative error code.
Rerported-by: Pawel Osciak posciak@chromium.org Signed-off-by: Daniel Kurtz djkurtz@chromium.org --- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index bc98a22..7ca8799e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -34,12 +34,9 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj) rk_obj->kvaddr = dma_alloc_attrs(drm->dev, obj->size, &rk_obj->dma_addr, GFP_KERNEL, &rk_obj->dma_attrs); - if (IS_ERR(rk_obj->kvaddr)) { - int ret = PTR_ERR(rk_obj->kvaddr); - - DRM_ERROR("failed to allocate %#x byte dma buffer, %d", - obj->size, ret); - return ret; + if (!rk_obj->kvaddr) { + DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size); + return -ENOMEM; }
return 0;
Hi Dave fix that: dma_alloc_attrs() returns NULL if it cannot allocate a dma buffer (or mapping), not a negative error code.
The following changes since commit c93546a5e32bd788c22aefa072385f3784551c13:
Merge tag 'topic/atomic-core-2015-01-05' of git://anongit.freedesktop.org/drm-intel into drm-next (2015-01-09 09:22:40 +1000)
are available in the git repository at:
https://github.com/markyzq/kernel-drm-rockchip.git drm-next
for you to fetch changes up to 4b9a90c0b374f8f7b3ceabe3c202424c98a6c5a4:
drm/rockchip: fix dma_alloc_attrs() error check (2015-01-09 11:29:06 +0800)
---------------------------------------------------------------- Daniel Kurtz (1): drm/rockchip: fix dma_alloc_attrs() error check
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
On Wed, Jan 7, 2015 at 5:27 PM, Daniel Kurtz djkurtz@chromium.org wrote:
dma_alloc_attrs() returns NULL if it cannot allocate a dma buffer (or mapping), not a negative error code.
Rerported-by: Pawel Osciak posciak@chromium.org
Oops! I just noticed that this is spelled wrong. Should be "Reported-by".
Mark, could you fix up on your tree, or is it too late?
Signed-off-by: Daniel Kurtz djkurtz@chromium.org
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index bc98a22..7ca8799e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -34,12 +34,9 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj) rk_obj->kvaddr = dma_alloc_attrs(drm->dev, obj->size, &rk_obj->dma_addr, GFP_KERNEL, &rk_obj->dma_attrs);
if (IS_ERR(rk_obj->kvaddr)) {int ret = PTR_ERR(rk_obj->kvaddr);DRM_ERROR("failed to allocate %#x byte dma buffer, %d",obj->size, ret);return ret;
if (!rk_obj->kvaddr) {DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);return -ENOMEM; } return 0;-- 2.2.0.rc0.207.ga3a616c
Mark: did you get a chance to fixup the "Reported-by" line? It's not a bit deal if you didn't.
Dave: did you pick up this pull request? Did Mark request properly?
On Fri, Jan 9, 2015 at 12:01 PM, Daniel Kurtz djkurtz@chromium.org wrote:
On Wed, Jan 7, 2015 at 5:27 PM, Daniel Kurtz djkurtz@chromium.org wrote:
dma_alloc_attrs() returns NULL if it cannot allocate a dma buffer (or mapping), not a negative error code.
Rerported-by: Pawel Osciak posciak@chromium.org
Oops! I just noticed that this is spelled wrong. Should be "Reported-by".
Mark, could you fix up on your tree, or is it too late?
Signed-off-by: Daniel Kurtz djkurtz@chromium.org
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index bc98a22..7ca8799e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -34,12 +34,9 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj) rk_obj->kvaddr = dma_alloc_attrs(drm->dev, obj->size, &rk_obj->dma_addr, GFP_KERNEL, &rk_obj->dma_attrs);
if (IS_ERR(rk_obj->kvaddr)) {int ret = PTR_ERR(rk_obj->kvaddr);DRM_ERROR("failed to allocate %#x byte dma buffer, %d",obj->size, ret);return ret;
if (!rk_obj->kvaddr) {DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);return -ENOMEM; } return 0;-- 2.2.0.rc0.207.ga3a616c
On 21 January 2015 at 12:43, Daniel Kurtz djkurtz@chromium.org wrote:
Mark: did you get a chance to fixup the "Reported-by" line? It's not a bit deal if you didn't.
Dave: did you pick up this pull request? Did Mark request properly?
I was waiting for the fixed reported-by but it isn't that urgent, I'll get it in the next fixes round.
Dave.
dri-devel@lists.freedesktop.org
-
Daniel Kurtz -
Dave Airlie -
Mark yao