From patchwork Mon May 25 15:34:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 29827 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YwuOo-00076e-Ok; Mon, 25 May 2015 17:34:42 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.76/mailfrontend-8) with esmtp id 1YwuOm-0001Fp-ls; Mon, 25 May 2015 17:34:42 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751099AbbEYPei (ORCPT + 1 other); Mon, 25 May 2015 11:34:38 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:34604 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751088AbbEYPef (ORCPT ); Mon, 25 May 2015 11:34:35 -0400 Received: by wicmc15 with SMTP id mc15so43239178wic.1 for ; Mon, 25 May 2015 08:34:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1G553gA3QbXLkR0/1756laUsfpViZTqO1FHy/11eloc=; b=QMXbGzvLhXNgRkJANsJ6nz+8r/ejJJSf2OrLbOsyQOFv8GbLFdNgsB/26J+bu470A3 cP1MtW+eofxyA0kdFKNq8aL0RLKjFI3wK/ZHmPAksKxGz3DjpPP5eHgI1Ji7CDqyf2Vg 04sKZj2vmVf8kDD9e+O4eBd2hPt277lZMD0ZFuTZ+SOyUmYUzysG4tZpNtiex1sC12lz Wu5dgt4KPpGWYKURHSqQJ/XNdAaA+U9bSEWUNX2d6s/XgcDMY++QVP5/CDR+7p+FJjmK yzWf5UJgqoV8lmHoIanW+D2/1l+JGgYg9kBdLIPk+4RePS0HBxg+tBt8o6984qZTjfZu vWBA== X-Received: by 10.194.5.135 with SMTP id s7mr41419928wjs.115.1432568074736; Mon, 25 May 2015 08:34:34 -0700 (PDT) Received: from tango-charlie.Home ([94.1.38.236]) by mx.google.com with ESMTPSA id l6sm12404069wib.18.2015.05.25.08.34.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 May 2015 08:34:33 -0700 (PDT) From: Lad Prabhakar To: LMML , Hans Verkuil Cc: "Lad, Prabhakar" Subject: [PATCH 2/3] media: davinci_vpfe: set minimum required buffers to three Date: Mon, 25 May 2015 16:34:28 +0100 Message-Id: <1432568069-11349-3-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432568069-11349-1-git-send-email-prabhakar.csengg@gmail.com> References: <1432568069-11349-1-git-send-email-prabhakar.csengg@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.5.25.152416 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: "Lad, Prabhakar" this patch sets nbuffers to three or more and drops the unset member video_limit which just a copy paste from earlier driver. Signed-off-by: Lad, Prabhakar --- drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h | 2 -- drivers/staging/media/davinci_vpfe/vpfe_video.c | 15 +++------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h index 2632a80..8ad8d74 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h +++ b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.h @@ -67,8 +67,6 @@ struct vpfe_device { /* CCDC IRQs used when CCDC/ISIF output to SDRAM */ unsigned int ccdc_irq0; unsigned int ccdc_irq1; - /* maximum video memory that is available*/ - unsigned int video_limit; /* media device */ struct media_device media_dev; /* ccdc subdevice */ diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 06d48d5..6744192 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -27,9 +27,6 @@ #include "vpfe.h" #include "vpfe_mc_capture.h" -/* minimum number of buffers needed in cont-mode */ -#define MIN_NUM_BUFFERS 3 - static int debug; /* get v4l2 subdev pointer to external subdev which is active */ @@ -1088,20 +1085,14 @@ vpfe_buffer_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, struct vpfe_fh *fh = vb2_get_drv_priv(vq); struct vpfe_video_device *video = fh->video; struct vpfe_device *vpfe_dev = video->vpfe_dev; - struct vpfe_pipeline *pipe = &video->pipe; unsigned long size; v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_buffer_queue_setup\n"); size = video->fmt.fmt.pix.sizeimage; - if (vpfe_dev->video_limit) { - while (size * *nbuffers > vpfe_dev->video_limit) - (*nbuffers)--; - } - if (pipe->state == VPFE_PIPELINE_STREAM_CONTINUOUS) { - if (*nbuffers < MIN_NUM_BUFFERS) - *nbuffers = MIN_NUM_BUFFERS; - } + if (vq->num_buffers + *nbuffers < 3) + *nbuffers = 3 - vq->num_buffers; + *nplanes = 1; sizes[0] = size; alloc_ctxs[0] = video->alloc_ctx;