From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
To: linux-media@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org,
Pawel Osciak <posciak@chromium.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Hans Verkuil <hverkuil@xs4all.nl>,
Sumit Semwal <sumit.semwal@linaro.org>,
Rob Clark <robdclark@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Laura Abbott <labbott@redhat.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [RFC v2 08/11] vb2: dma-contig: Don't warn on failure in obtaining scatterlist
Date: Fri, 16 Dec 2016 03:24:22 +0200 [thread overview]
Message-ID: <20161216012425.11179-9-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <20161216012425.11179-1-laurent.pinchart+renesas@ideasonboard.com>
From: Sakari Ailus <sakari.ailus@linux.intel.com>
vb2_dc_get_base_sgt() which obtains the scatterlist already prints
information on why the scatterlist could not be obtained.
Also, remove the useless warning of a failed kmalloc().
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/v4l2-core/videobuf2-dma-contig.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index 2a00d12ffee2..d59f107f0457 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -370,10 +370,8 @@ static struct sg_table *vb2_dc_get_base_sgt(struct vb2_dc_buf *buf)
struct sg_table *sgt;
sgt = kmalloc(sizeof(*sgt), GFP_KERNEL);
- if (!sgt) {
- dev_err(buf->dev, "failed to alloc sg table\n");
+ if (!sgt)
return NULL;
- }
ret = dma_get_sgtable_attrs(buf->dev, sgt, buf->cookie, buf->dma_addr,
buf->size, buf->attrs);
@@ -400,7 +398,7 @@ static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv, unsigned long flags)
if (!buf->dma_sgt)
buf->dma_sgt = vb2_dc_get_base_sgt(buf);
- if (WARN_ON(!buf->dma_sgt))
+ if (!buf->dma_sgt)
return NULL;
dbuf = dma_buf_export(&exp_info);
--
Regards,
Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
To: linux-media@vger.kernel.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
dri-devel@lists.freedesktop.org,
Hans Verkuil <hverkuil@xs4all.nl>,
Kyungmin Park <kyungmin.park@samsung.com>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Pawel Osciak <posciak@chromium.org>,
Marek Szyprowski <m.szyprowski@samsung.com>
Subject: [RFC v2 08/11] vb2: dma-contig: Don't warn on failure in obtaining scatterlist
Date: Fri, 16 Dec 2016 03:24:22 +0200 [thread overview]
Message-ID: <20161216012425.11179-9-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <20161216012425.11179-1-laurent.pinchart+renesas@ideasonboard.com>
From: Sakari Ailus <sakari.ailus@linux.intel.com>
vb2_dc_get_base_sgt() which obtains the scatterlist already prints
information on why the scatterlist could not be obtained.
Also, remove the useless warning of a failed kmalloc().
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/v4l2-core/videobuf2-dma-contig.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index 2a00d12ffee2..d59f107f0457 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -370,10 +370,8 @@ static struct sg_table *vb2_dc_get_base_sgt(struct vb2_dc_buf *buf)
struct sg_table *sgt;
sgt = kmalloc(sizeof(*sgt), GFP_KERNEL);
- if (!sgt) {
- dev_err(buf->dev, "failed to alloc sg table\n");
+ if (!sgt)
return NULL;
- }
ret = dma_get_sgtable_attrs(buf->dev, sgt, buf->cookie, buf->dma_addr,
buf->size, buf->attrs);
@@ -400,7 +398,7 @@ static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv, unsigned long flags)
if (!buf->dma_sgt)
buf->dma_sgt = vb2_dc_get_base_sgt(buf);
- if (WARN_ON(!buf->dma_sgt))
+ if (!buf->dma_sgt)
return NULL;
dbuf = dma_buf_export(&exp_info);
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-12-16 1:24 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-16 1:24 [RFC v2 00/11] vb2: Handle user cache hints, allow drivers to choose cache coherency Laurent Pinchart
2016-12-16 1:24 ` Laurent Pinchart
2016-12-16 1:24 ` [RFC v2 01/11] vb2: Rename confusingly named internal buffer preparation functions Laurent Pinchart
2016-12-16 1:24 ` [RFC v2 02/11] vb2: Move buffer cache synchronisation to prepare from queue Laurent Pinchart
2016-12-16 1:24 ` [RFC v2 03/11] vb2: Move cache synchronisation from buffer done to dqbuf handler Laurent Pinchart
2017-03-27 21:27 ` Shuah Khan
2017-03-28 12:31 ` Laurent Pinchart
2017-03-28 12:31 ` Laurent Pinchart
2016-12-16 1:24 ` [RFC v2 04/11] v4l: Unify cache management hint buffer flags Laurent Pinchart
2016-12-16 1:24 ` [RFC v2 05/11] v4l2-core: Don't sync cache for a buffer if so requested Laurent Pinchart
2017-03-27 22:08 ` Shuah Khan
2016-12-16 1:24 ` [RFC v2 06/11] vb2: Improve struct vb2_mem_ops documentation; alloc and put are for MMAP Laurent Pinchart
2016-12-16 1:24 ` [RFC v2 07/11] vb2: dma-contig: Remove redundant sgt_base field Laurent Pinchart
2017-03-27 22:51 ` Shuah Khan
2017-04-07 12:37 ` Sakari Ailus
2016-12-16 1:24 ` Laurent Pinchart [this message]
2016-12-16 1:24 ` [RFC v2 08/11] vb2: dma-contig: Don't warn on failure in obtaining scatterlist Laurent Pinchart
2016-12-16 1:24 ` [RFC v2 09/11] vb2: dma-contig: Move vb2_dc_get_base_sgt() up Laurent Pinchart
2016-12-16 1:24 ` [RFC v2 10/11] vb2: dma-contig: Let drivers decide DMA attrs of MMAP and USERPTR bufs Laurent Pinchart
2016-12-26 7:58 ` [RFC, v2, " Ricky Liang
2017-04-05 13:13 ` Sakari Ailus
2017-04-07 11:42 ` Laurent Pinchart
2016-12-16 1:24 ` [RFC v2 11/11] vb2: dma-contig: Add WARN_ON_ONCE() to check for potential bugs Laurent Pinchart
2016-12-16 12:06 ` [RFC v2 00/11] vb2: Handle user cache hints, allow drivers to choose cache coherency Hans Verkuil
2016-12-16 12:06 ` Hans Verkuil
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=20161216012425.11179-9-laurent.pinchart+renesas@ideasonboard.com \
--to=laurent.pinchart+renesas@ideasonboard.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hverkuil@xs4all.nl \
--cc=kyungmin.park@samsung.com \
--cc=labbott@redhat.com \
--cc=linux-media@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=posciak@chromium.org \
--cc=robdclark@gmail.com \
--cc=sakari.ailus@linux.intel.com \
--cc=sumit.semwal@linaro.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.