From patchwork Tue Oct 2 14:27:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Stanislawski X-Patchwork-Id: 1537261 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7CDC9DFFAD for ; Tue, 2 Oct 2012 14:29:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754112Ab2JBO3f (ORCPT ); Tue, 2 Oct 2012 10:29:35 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:32548 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754053Ab2JBO3e (ORCPT ); Tue, 2 Oct 2012 10:29:34 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MB9001VAS99FGL0@mailout4.samsung.com> for linux-media@vger.kernel.org; Tue, 02 Oct 2012 23:29:33 +0900 (KST) X-AuditID: cbfee61b-b7f2b6d000000f14-3a-506afa4dbf0c Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 60.A1.03860.D4AFA605; Tue, 02 Oct 2012 23:29:33 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MB9005A7S65K790@mmp2.samsung.com> for linux-media@vger.kernel.org; Tue, 02 Oct 2012 23:29:33 +0900 (KST) From: Tomasz Stanislawski To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: airlied@redhat.com, m.szyprowski@samsung.com, t.stanislaws@samsung.com, kyungmin.park@samsung.com, laurent.pinchart@ideasonboard.com, sumit.semwal@ti.com, daeinki@gmail.com, daniel.vetter@ffwll.ch, robdclark@gmail.com, pawel@osciak.com, linaro-mm-sig@lists.linaro.org, hverkuil@xs4all.nl, remi@remlab.net, subashrp@gmail.com, mchehab@redhat.com, zhangfei.gao@gmail.com, s.nawrocki@samsung.com, k.debski@samsung.com Subject: [PATCHv9 14/25] v4l: s5p-tv: mixer: support for dmabuf importing Date: Tue, 02 Oct 2012 16:27:25 +0200 Message-id: <1349188056-4886-15-git-send-email-t.stanislaws@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1349188056-4886-1-git-send-email-t.stanislaws@samsung.com> References: <1349188056-4886-1-git-send-email-t.stanislaws@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIJMWRmVeSWpSXmKPExsVy+t9jQV3fX1kBBhsnCFr0bNjK6sDo8XmT XABjFJdNSmpOZllqkb5dAlfGjhP/mAs2sld8bexhb2BcxtbFyMEhIWAi0fnFvIuRE8gUk7hw bz1QmItDSGA6o8SLyb8ZIZxVTBKvH35kAqliA2o4tuQzI4gtIuAgcfruLGaQImaBNcwSL1be YANJCAt4Srzf1ssEsoFFQFXi4ldnkDCvgIdE9/NprBDb5CWe3u8DK+cEiv98coEFxBYScJfY s7yJbQIj7wJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5uZsYwR5/Jr2DcVWDxSFGAQ5GJR7e XSczA4RYE8uKK3MPMUpwMCuJ8FrfzwoQ4k1JrKxKLcqPLyrNSS0+xCjNwaIkztvskRIgJJCe WJKanZpakFoEk2Xi4JRqYCxm2/HVNEqOcYrCDYnm/cXZl4+zfzysv9XIPrz7yisPwa2eGRJ7 pr0+dclJcHFf1pbFNfdm/I/88kZbumPO5vcWZmrzMvvV78+8ffedc93miq16zbfNUn99SuJp X35704e6vqVrJnt4n+TPNl90cZMPv+hSblvetnienaonNLjNDjB2X61PE1NiKc5INNRiLipO BAC786IS9AEAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This patch enhances s5p-tv with support for DMABUF importing via V4L2_MEMORY_DMABUF memory type. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/s5p-tv/mixer_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c index 6c74b05..2c299db 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/video/s5p-tv/mixer_video.c @@ -1078,7 +1078,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev, layer->vb_queue = (struct vb2_queue) { .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - .io_modes = VB2_MMAP | VB2_USERPTR, + .io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF, .drv_priv = layer, .buf_struct_size = sizeof(struct mxr_buffer), .ops = &mxr_video_qops,