From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 987E9C3DA63 for ; Wed, 24 Jul 2024 16:17:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kKtTi6J8HEB5OCpZPgPDE9GsqwJqSTtYQpQ+3Zz5BCQ=; b=ZCj31TA86zRn/5tpp2ysFI+M5a nJp16KKmQAh3WtFAnKRLLyplF8GekYyV1/3hDakz/oonQo7h1gJqgztZrotjzv+SaDCd035lUWxfx zWBLG7pmsX+6HK6V28B4GOXFST9Vu+4Y2x+TNgOru6EZaby6yadCV6YN8E3zOaMK+T/IH5p5xRP/E HpGfNUNO5AEZ7FDe5TcKzoP6RMh7ArMjhFKIns3r+2jvBYmULE2hg8d5L1G257VRae0bmopYixEEm UcQbfFsLPsMrJcRTQaCkgfBo+pAQPmH42f69JxlTZcpN5X/Zx3+SkZSnhAcA9y/+kzYpmyTmk09x4 UhGBsyzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWefm-0000000Ftoy-0sud; Wed, 24 Jul 2024 16:17:02 +0000 Received: from mail-oi1-x22f.google.com ([2607:f8b0:4864:20::22f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWefN-0000000Fth0-2CVS for linux-arm-kernel@lists.infradead.org; Wed, 24 Jul 2024 16:16:38 +0000 Received: by mail-oi1-x22f.google.com with SMTP id 5614622812f47-3d9da46ca13so3799426b6e.2 for ; Wed, 24 Jul 2024 09:16:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721837795; x=1722442595; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=kKtTi6J8HEB5OCpZPgPDE9GsqwJqSTtYQpQ+3Zz5BCQ=; b=hyRpIGJHf0bRJLka4yNf/Qi/i1uG7Q0POfReK1VcPqGNx3sDdIKKsVsxZEMgCIjNht duNxhDY83NPMyTelgMdwqbcJoxnTcjmbmteVJMglW9ar5/liIaxGb7gEI1Ck0CbkTW5W GadKgzpn4Oxy5m4Di6mKI9xEs8k33kNNa/1TK/U2rq0qJl2EU1zF8FdpZ94Z6ym8weq/ gLPlXaDrM6KlagcEVdPxSa+wA5Gf1zVsP3D00AddblgdflhCAPelVP5AbsfxXakQC0Qu RQMB0rtYwws/7vZH3OwxdhcxDBIGuEv93O9Ex+olXo6lH28Sk8UKV2z7UOLkuzde8w1X gUPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721837795; x=1722442595; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=kKtTi6J8HEB5OCpZPgPDE9GsqwJqSTtYQpQ+3Zz5BCQ=; b=QBW7SaLD70HRcU0QG5O0VDDQCqT0cIkSmcTM/rcJTu4Prth1Mt1sFNWvjUeJad2ha0 z9sXAXbTeV0qYUhPUnqdZZiXHiLSDlHnBlH4cTmn9YzvU3VlnKPf/w+TkYajxJIaSz2/ PqI9PFpRF1/xjxfuQ+7xplfSpaE9us1TqWmboqROe2VrwJkeuh+QuKBeaxoGxYee/QsW Lz3iICdi4e/ZiYEbs0BMZjhViXtKrDIzDXooKZcOqHqmF+/z3kytxCGktY9YQ2xJGTvv XPQBfree19m4pgDHx8by2UDhYoGWt+FKKEXdTFDnkQgN5Ca+9o69XDvqPcSy2z0xy4Mt qy5g== X-Forwarded-Encrypted: i=1; AJvYcCUFlFvRPXyMWHIejq5GYXG4MsKcrHUNJm8HYyNxcb1rQMrsqcjV7StKOcH2lfnyk+HA0ILsXf2zIjFDige1Nk1KobnpJ8UKDZuqYOvFolqcWkvbUm0= X-Gm-Message-State: AOJu0Yxr90ipQZ48s+CSmLd09bqH+7GGc7yY3vPgxIfFKVgTSNScCTXj b6AuZ1OT8sAeDGlT8QRgbgyFeY9zlKokKTl/OT0+b94tfG/m41EJyA1nd/sqS9A= X-Google-Smtp-Source: AGHT+IGL4mtwKdB32MSZ63+5s36lNy2nWouLYk/6/hosNV4rfjK0ChpvX+4v525bHV4bv4C5KpXHyg== X-Received: by 2002:a05:6808:2002:b0:3d6:71d4:e90d with SMTP id 5614622812f47-3db110cb758mr36565b6e.50.1721837794749; Wed, 24 Jul 2024 09:16:34 -0700 (PDT) Received: from localhost ([2603:8080:b800:f700:c022:78f5:6e53:c844]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3dae0990123sm2442748b6e.30.2024.07.24.09.16.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 09:16:34 -0700 (PDT) Date: Wed, 24 Jul 2024 11:16:32 -0500 From: Dan Carpenter To: Marek Vasut Cc: linux-media@vger.kernel.org, Daniel Vetter , David Airlie , Fabio Estevam , Greg Kroah-Hartman , Helge Deller , Mauro Carvalho Chehab , Pengutronix Kernel Team , Philipp Zabel , Sascha Hauer , Shawn Guo , Steve Longerbeam , dri-devel@lists.freedesktop.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org, linux-staging@lists.linux.dev Subject: Re: [PATCH v2 2/2] media: imx: vdic: Introduce mem2mem VDI deinterlacer driver Message-ID: <5aab2235-76cd-4fa6-8957-aed35e83a95e@suswa.mountain> References: <20240724002044.112544-1-marex@denx.de> <20240724002044.112544-2-marex@denx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240724002044.112544-2-marex@denx.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240724_091637_588569_3E432092 X-CRM114-Status: GOOD ( 19.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Jul 24, 2024 at 02:19:38AM +0200, Marek Vasut wrote: > diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c > index be54dca11465d..a841fdb4c2394 100644 > --- a/drivers/staging/media/imx/imx-media-dev.c > +++ b/drivers/staging/media/imx/imx-media-dev.c > @@ -57,7 +57,52 @@ static int imx6_media_probe_complete(struct v4l2_async_notifier *notifier) > goto unlock; > } > > + imxmd->m2m_vdic[0] = imx_media_mem2mem_vdic_init(imxmd, 0); > + if (IS_ERR(imxmd->m2m_vdic[0])) { > + ret = PTR_ERR(imxmd->m2m_vdic[0]); > + imxmd->m2m_vdic[0] = NULL; > + goto unlock; > + } > + > + /* MX6S/DL has one IPUv3, init second VDI only on MX6Q/QP */ > + if (imxmd->ipu[1]) { > + imxmd->m2m_vdic[1] = imx_media_mem2mem_vdic_init(imxmd, 1); > + if (IS_ERR(imxmd->m2m_vdic[1])) { > + ret = PTR_ERR(imxmd->m2m_vdic[1]); > + imxmd->m2m_vdic[1] = NULL; > + goto uninit_vdi0; > + } > + } > + > ret = imx_media_csc_scaler_device_register(imxmd->m2m_vdev); > + if (ret) > + goto uninit_vdi1; > + > + ret = imx_media_mem2mem_vdic_register(imxmd->m2m_vdic[0]); > + if (ret) > + goto unreg_csc; > + > + /* MX6S/DL has one IPUv3, init second VDI only on MX6Q/QP */ > + if (imxmd->ipu[1]) { > + ret = imx_media_mem2mem_vdic_register(imxmd->m2m_vdic[1]); > + if (ret) > + goto unreg_vdic; > + } > + > + mutex_unlock(&imxmd->mutex); > + return ret; Since it looks like you're going to do another version of this, could you change this to return 0; > + > +unreg_vdic: > + imx_media_mem2mem_vdic_unregister(imxmd->m2m_vdic[0]); > + imxmd->m2m_vdic[0] = NULL; > +unreg_csc: > + imx_media_csc_scaler_device_unregister(imxmd->m2m_vdev); > + imxmd->m2m_vdev = NULL; > +uninit_vdi1: > + if (imxmd->ipu[1]) > + imx_media_mem2mem_vdic_uninit(imxmd->m2m_vdic[1]); > +uninit_vdi0: > + imx_media_mem2mem_vdic_uninit(imxmd->m2m_vdic[0]); > unlock: > mutex_unlock(&imxmd->mutex); > return ret; [ snip ] > +static int ipu_mem2mem_vdic_querycap(struct file *file, void *priv, > + struct v4l2_capability *cap) > +{ > + strscpy(cap->driver, "imx-m2m-vdic", sizeof(cap->driver)); > + strscpy(cap->card, "imx-m2m-vdic", sizeof(cap->card)); > + strscpy(cap->bus_info, "platform:imx-m2m-vdic", sizeof(cap->bus_info)); These days strscpy() is a magic function where the third parameter is optional. strscpy(cap->driver, "imx-m2m-vdic"); strscpy(cap->card, "imx-m2m-vdic"); strscpy(cap->bus_info, "platform:imx-m2m-vdic"); Shazaaam! Magic! > + cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING; > + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; > + > + return 0; > +} regards, dan carpenter