From patchwork Sat Oct 12 12:31:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 20359 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VUyN6-0005Fu-RC; Sat, 12 Oct 2013 14:32:40 +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.72/mailfrontend-7) with esmtp id 1VUyN4-0005z4-2w; Sat, 12 Oct 2013 14:32:40 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752816Ab3JLMcg (ORCPT + 1 other); Sat, 12 Oct 2013 08:32:36 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:48257 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752566Ab3JLMc0 (ORCPT ); Sat, 12 Oct 2013 08:32:26 -0400 Received: by mail-wi0-f171.google.com with SMTP id hq4so270596wib.4 for ; Sat, 12 Oct 2013 05:32:24 -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=fB6uuj011EFdtFFLhSvXPiTYB4Ju+x6U1f/5C22m2lg=; b=RNoBElbuzNKgGS0+m0KwTfyfUW3AICLGHGM0v3GuFdnWVUZrmbSfOw8oMZb2OAwPz9 OFFFrhVKe/v6b4RuyFqxMT4Ie/clGO2JNGezZfjZlE+VfttGOEJrSKnc6u7LA7Pv+Sgr q/HWTU3LFiqmdeXsyEg7UHzfDlsEP/BAAgS5Qr1RwtBfQ2/15tLrCqmfU917GzpCVeDQ FDWKpnWITBvMHyrUHJGjgdfrgFIPEWQrs5mK52N9L5kcFeHWg6uOVllBDBtxEidS72KY H9EbSQ8xOTm5pg9VzT8Kfy8dsmIVumyBJeekSvinJZINQcfAn6A3rfDT2F8pQtPWsWXE Bgaw== X-Received: by 10.180.10.8 with SMTP id e8mr7100979wib.65.1381581144878; Sat, 12 Oct 2013 05:32:24 -0700 (PDT) Received: from localhost.localdomain (093105185086.warszawa.vectranet.pl. [93.105.185.86]) by mx.google.com with ESMTPSA id q17sm14747025wiv.10.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 12 Oct 2013 05:32:24 -0700 (PDT) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, pawel@osciak.com, javier.martin@vista-silicon.com, m.szyprowski@samsung.com, shaik.ameer@samsung.com, arun.kk@samsung.com, k.debski@samsung.com, p.zabel@pengutronix.de, kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH RFC v2 07/10] exynos-gsc: Configure default image format at device open() Date: Sat, 12 Oct 2013 14:31:57 +0200 Message-Id: <1381581120-26883-8-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1381581120-26883-1-git-send-email-s.nawrocki@samsung.com> References: <1381581120-26883-1-git-send-email-s.nawrocki@samsung.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: 2013.10.12.122417 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 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, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 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, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' There should be always some valid image format set on a video device. Signed-off-by: Sylwester Nawrocki --- drivers/media/platform/exynos-gsc/gsc-m2m.c | 34 ++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c index e576ff2..48e1c34 100644 --- a/drivers/media/platform/exynos-gsc/gsc-m2m.c +++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c @@ -605,6 +605,32 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, return vb2_queue_init(dst_vq); } +static int gsc_m2m_set_default_format(struct gsc_ctx *ctx) +{ + struct v4l2_pix_format_mplane pixm = { + .pixelformat = V4L2_PIX_FMT_RGB32, + .width = 800, + .height = 600, + .plane_fmt[0] = { + .bytesperline = 800 * 4, + .sizeimage = 800 * 4 * 600, + }, + }; + const struct gsc_fmt *fmt; + + fmt = find_fmt(&pixm.pixelformat, NULL, 0); + if (!fmt) + return -EINVAL; + + gsc_set_frame_size(&ctx->s_frame, pixm.width, pixm.height); + ctx->s_frame.payload[0] = pixm.plane_fmt[0].sizeimage; + + gsc_set_frame_size(&ctx->d_frame, pixm.width, pixm.height); + ctx->d_frame.payload[0] = pixm.plane_fmt[0].sizeimage; + + return 0; +} + static int gsc_m2m_open(struct file *file) { struct gsc_dev *gsc = video_drvdata(file); @@ -638,7 +664,7 @@ static int gsc_m2m_open(struct file *file) ctx->d_frame.fmt = get_format(0); /* Setup the device context for mem2mem mode. */ ctx->state = GSC_CTX_M2M; - ctx->flags = 0; + ctx->flags = GSC_PARAMS; ctx->in_path = GSC_DMA; ctx->out_path = GSC_DMA; @@ -652,11 +678,17 @@ static int gsc_m2m_open(struct file *file) if (gsc->m2m.refcnt++ == 0) set_bit(ST_M2M_OPEN, &gsc->state); + ret = gsc_m2m_set_default_format(ctx); + if (ret) + goto error_m2m_rel; + pr_debug("gsc m2m driver is opened, ctx(0x%p)", ctx); mutex_unlock(&gsc->lock); return 0; +error_m2m_rel: + v4l2_m2m_ctx_release(ctx->fh.m2m_ctx); error_ctrls: gsc_ctrls_delete(ctx); error_fh: