Received: by 2002:a05:7412:37c9:b0:e2:908c:2ebd with SMTP id jz9csp1109975rdb; Tue, 19 Sep 2023 22:53:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJXL200OXbaNLPECX+F37XsawkBo9pyKwhG+ZPlRA8J0zFkpwTkU7E0Rmul8JSXoY+pcTz X-Received: by 2002:a05:6512:3b0c:b0:503:38f2:6e1 with SMTP id f12-20020a0565123b0c00b0050338f206e1mr1796295lfv.5.1695189214383; Tue, 19 Sep 2023 22:53:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695189214; cv=none; d=google.com; s=arc-20160816; b=BdcQnWM1tm4g5//KEeN5Sd85osmBC6rFMp8hI+IQU0iVocjeZzIeLYSCNlt07gL2F7 7Qza7y4mXw15e6oLYhxXSUw5smZZufw5D9uLvxijwGcgLgAepDU50mQBhfOcrp/Ejd+E SU/KDhwBHo0qm1uhCpPZOX+bRFNrouwm1B8nZMIK42KesmtzmSSMOTpOz3LtFYm0S4tS 3CO4+JR4rZ8OpwpuI3PanVDGWVt6jUo9bPPtdaLn8mkPkTT9bfEX8S4cWWgsukIiFxIo RMhcbEyJxu+k5jfoSzSx9Cluh//KGsQ8XRdG4k6wLFOgWMhd15HRvUXRuXMiJjtXhiC8 vzkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=KevI59ZuvC1O6+r+tEg1r1bqNlO0utcnRFy1Zyml1zE=; fh=KMfe3NzApKs946iR4WZVcjkCLVuFGk/FN6/8X0ShN1s=; b=m3xX9alA3OoF57GTFjGbe5F/HhOeZjSkoA0dI1ogBqa2Bmg9OWVOk5VifMFW2b6K0M 5wzdfrplMmvJjpm5WfLkV4tD5aEF8pGrS7iXsS0BJpRIfevuoBgEB+dvFwSmG5lWXeMP vKr+hmdRbCn20rah7F1OYF42nXQ2QjC1xHCh/W4HTF+1bvUDZKTTfmjM8QX0QHmJbPnC 31qzy7GzzJNhhtxZnbQmmnbDBk0Y+YUS6YaSGLYnykirxSyE+oQmWLhPSFb09UMUKYis FscXt/z14mYgM1yEJ6lUoSyhyc0fcaMH+K4mLXNggbnNyOBiP4o9fp3zu0ZCUl6eEu5o R0zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=HqP2upef; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id a22-20020aa7d756000000b0052559901edfsi10689644eds.146.2023.09.19.22.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 22:53:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=HqP2upef; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 18AB4826FA9D; Tue, 19 Sep 2023 12:49:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233001AbjISTtm (ORCPT + 99 others); Tue, 19 Sep 2023 15:49:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232972AbjISTtj (ORCPT ); Tue, 19 Sep 2023 15:49:39 -0400 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FE0DF0 for ; Tue, 19 Sep 2023 12:49:27 -0700 (PDT) Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-34fcc39fae1so24865ab.0 for ; Tue, 19 Sep 2023 12:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695152966; x=1695757766; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=KevI59ZuvC1O6+r+tEg1r1bqNlO0utcnRFy1Zyml1zE=; b=HqP2upef+BtmjExv12AWSI1Sn+G+rR6T9qvJmiIP4KAvktf7D9qGJwkiyUWggYCgl0 QmduJSHOcsc2+PfYC12SPqfx28q0gkLcwaoW5mte97L1WSfUvkX6BboKc9JvRyMeteDK 37Sn2udGcrvbHTcBFLND9v6PqzNdJXAJrY5gu0OXtArYIjbdGU4pcQFaed8gLUXCK8Qr 2YltllXGbKwkd9CiiR88quhs2EgIb2yJqMS7F+vU9rSMmUAkctD9Im/wQ0qeri8HR8/4 rcW0cxwUgwrNFzXkEWlzSBtHyCryRWWmTmJdR42gBWlWz1HzhKFr6prxWD1qQ0puPdCd h5vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695152966; x=1695757766; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KevI59ZuvC1O6+r+tEg1r1bqNlO0utcnRFy1Zyml1zE=; b=XM30X6Bt4xjWWHlPYT2y19Kuh7hy/14z/Ke+2x0jNnXS6Zxbz8lEIgDd2goEMrMHK2 DvIxJWYAe2I8btU+i9a1ORFmo6r2zccrAXMfJlshP8cKso/6pq01awqSISZquA1tc3lT CMFF9ytDOsO+XBphf19OyehNL5kXWnvyRM/9XaLyOdxocuETd6j8ELuEH+KwyCSZtSOS gFYlJvWbY9N91/XwZIu1GpPVMYc30HfT0qZhzbpEeWuUCKhq+SXnIe8pr7ooe+NkaRPQ s/8nZRktNnqosBb3JzIGfKG0hdP8xdcBCQe3wpS+ls+W5PcD6CxW7EqB67KGQPfaWzPp URsA== X-Gm-Message-State: AOJu0YwxDuHeXmaqc2z8ukj0BSGxK+W7AdnrYaokkyl2jm1gU/N7lYxR GQc6MazPS6ACvSzSf9jd1rIX8Uvsp2OfyjURt73P X-Received: by 2002:a05:6e02:1e0a:b0:349:1dfe:ff2a with SMTP id g10-20020a056e021e0a00b003491dfeff2amr37179ila.19.1695152966107; Tue, 19 Sep 2023 12:49:26 -0700 (PDT) MIME-Version: 1.0 References: <20230911125936.10648-1-yunfei.dong@mediatek.com> <20230911125936.10648-13-yunfei.dong@mediatek.com> <1df3e79b84933dda0313d0d9719220dbc06c9022.camel@collabora.com> <5307203d79c0d90cc742a315bb161fa796b9960f.camel@mediatek.com> In-Reply-To: From: Jeffrey Kardatzke Date: Tue, 19 Sep 2023 12:49:14 -0700 Message-ID: Subject: Re: [PATCH 12/14] media: medkatek: vcodec: set secure mode to decoder driver To: Nicolas Dufresne Cc: Hans Verkuil , =?UTF-8?B?WXVuZmVpIERvbmcgKOiRo+S6kemjnik=?= , "nhebert@chromium.org" , "benjamin.gaignard@collabora.com" , "nfraprado@collabora.com" , "angelogioacchino.delregno@collabora.com" , "linux-kernel@vger.kernel.org" , "linux-mediatek@lists.infradead.org" , "frkoenig@chromium.org" , "stevecho@chromium.org" , "wenst@chromium.org" , "linux-media@vger.kernel.org" , "devicetree@vger.kernel.org" , "daniel@ffwll.ch" , Project_Global_Chrome_Upstream_Group , "hsinyi@chromium.org" , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 19 Sep 2023 12:49:56 -0700 (PDT) On Tue, Sep 19, 2023 at 11:51=E2=80=AFAM Nicolas Dufresne wrote: > > Le mardi 19 septembre 2023 =C3=A0 10:53 +0200, Hans Verkuil a =C3=A9crit = : > > On 18/09/2023 22:57, Jeffrey Kardatzke wrote: > > > On Fri, Sep 15, 2023 at 1:56=E2=80=AFAM Hans Verkuil wrote: > > > > > > > > On 15/09/2023 10:25, Yunfei Dong (=E8=91=A3=E4=BA=91=E9=A3=9E) wrot= e: > > > > > Hi Hans & Nicolas, > > > > > > > > > > Thanks for your advice. > > > > > > > > > > On Tue, 2023-09-12 at 11:30 +0200, Hans Verkuil wrote: > > > > > > > > > > > > External email : Please do not click links or open attachments = until > > > > > > you have verified the sender or the content. > > > > > > Hi, > > > > > > > > > > > > On 9/11/23 17:54, Nicolas Dufresne wrote: > > > > > > > Hi, > > > > > > > > > > > > > > Le lundi 11 septembre 2023 =C3=A0 20:59 +0800, Yunfei Dong a = =C3=A9crit : > > > > > > > > Setting secure mode flag to kernel when trying to play secu= re > > > > > > > > > > > > video, > > > > > > > > then decoder driver will initialize tee related interface t= o > > > > > > > > > > > > support > > > > > > > > svp. > > > > > > > > > > > > > > > > > > > > > This is not what the patch is doing, please rework. This patc= h is > > > > > > > > > > > > an vendor API > > > > > > > addition introducing V4L2_CID_MPEG_MTK_SET_SECURE_MODE. I sho= uld > > > > > > > > > > > > not have to > > > > > > > read your patch to understand this. > > > > > > > > > > > > > > > > > > > > > > > Signed-off-by: Yunfei Dong > > > > > > > > --- > > > > > > > > .../vcodec/decoder/mtk_vcodec_dec_stateless.c | 15 > > > > > > > > > > > > ++++++++++++++- > > > > > > > > drivers/media/v4l2-core/v4l2-ctrls-defs.c | 5 +++= ++ > > > > > > > > include/uapi/linux/v4l2-controls.h | 1 + > > > > > > > > 3 files changed, 20 insertions(+), 1 deletion(-) > > > > > > > > > > > > > > > > diff --git > > > > > > > > > > > > a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec= _state > > > > > > less.c > > > > > > b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec= _state > > > > > > less.c > > > > > > > > index d2b09ce9f1cf..a981178c25d9 100644 > > > > > > > > --- > > > > > > > > > > > > a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec= _state > > > > > > less.c > > > > > > > > +++ > > > > > > > > > > > > b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec= _state > > > > > > less.c > > > > > > > > @@ -535,6 +535,17 @@ static int mtk_vdec_s_ctrl(struct v4l2= _ctrl > > > > > > > > > > > > *ctrl) > > > > > > > > ctrl->val =3D mtk_dma_contig_get_secure_handle(ctx, ctrl->= val); > > > > > > > > mtk_v4l2_vdec_dbg(3, ctx, "get secure handle: %d =3D> 0x%x= ", > > > > > > > > > > > > sec_fd, ctrl->val); > > > > > > > > break; > > > > > > > > +case V4L2_CID_MPEG_MTK_SET_SECURE_MODE: > > > > > > > > > > > > > > Stepping back a little and focusing on the API, what makes yo= ur > > > > > > > > > > > > driver so > > > > > > > special that it should be the only one having a "secure mode"= ? We > > > > > > > > > > > > are touching > > > > > > > in gap in the media pipeline in Linux, and this should come w= ith > > > > > > > > > > > > consideration > > > > > > > of the global API. > > > > > > > > > > > > > > Why is this API better then let's say Google Android one, wer= e they > > > > > > > > > > > > expose 2 > > > > > > > device nodes in their fork of the MFC driver (a secure and a = non > > > > > > > > > > > > secure one) ? > > > > > > > > > > > > Perhaps it is a good idea to first post an RFC with an uAPI pro= posal > > > > > > on how to > > > > > > handle secure video. I suspect this isn't mediatek specific, ot= her > > > > > > SoCs with > > > > > > tee support could use this as well. > > > > > > > > > > > > As Nicolas said, it's long known to be a gap in our media suppo= rt, so > > > > > > it is > > > > > > really great that you started work on this, but you need to loo= k at > > > > > > this from > > > > > > a more generic point-of-view, and not mediatek-specific. > > > > > > > > > > > > > > > > Whether your have any advice about how to do a more generic drive= r to > > > > > handle secure video playback? > > > > > > > > > > There are several kind of buffer: output queue buffer/capture que= ue > > > > > buffer/working buffer. > > > > > > > > > > output and capture queue buffer: user space will call tee related > > > > > interface to allocate secure handle. Will convert to secure handl= e with > > > > > v4l2 framework, then send secure handle to optee-os. > > > > > > > > > > working buffer: calling dma_heap and dma_buf to get secure memory > > > > > handle, then covert secure iova in optee-os. > > > > > > > > > > Using the same kernel driver for svp and non-svp playback, just t= he > > > > > buffer type are different. Normal is iova and secure is secure ha= ndle. > > > > > > > > > > User driver will tell the kernel driver with CID control whether = the > > > > > current playback is svp or non-svp. > > > > > > > > My understanding is that when you switch to secure mode, the driver= makes > > > > some optee calls to set everything up. And userspace needs a way co= nvert a > > > > dmabuf fd to a 'secure handle', which appears to be the DMA address= of the > > > > buffer. Who uses that handle? > > > > > > The only user space usage for getting the 'secure handle' from an fd > > > is when that memory is written to. This is done when the TEE decrypts > > > the video contents. User space sends the encrypted video + 'secure > > > handle' to the TEE, and the TEE decrypts the contents to the memory > > > associated with the 'secure handle'. Then the 'secure handle' is > > > passed into the TEE again with the v4l2 driver to use as the source > > > for video decoding (but w/ v4l2, user space is passing in fds). > > > > I think I need some more background. This series is to support a 'Secur= e Video > > Processor' (at least, that's what svp stands for I believe, something t= hat > > is not mentioned anywhere in this series, BTW) which is used to decode = an > > encrypted h264 stream. > > > > First question: how is that stream encrypted? Is that according to some= standard? > > Nothing is mentioned about that. > > > > I gather that the encrypted stream is fed to the codec as usual (i.e. j= ust put it > > in the output buffer and queue it to the codec), nothing special is nee= ded for that. > > Except, how does the hardware know it is encrypted? I guess that's wher= e the > > control comes in, you have to turn on SVP mode first. > > Decryption takes place before the decoder. I suspect there is no dedicate= d > driver for that, the TEE driver API is similar to smart card API and fits= well > this task. So the decrytor consume normal memory that is encrypted and is= only > allowed to decrypt into secure memory. All this is happening before the d= ecoder, > so is out of scope for this patchset. > > Just a correction :-D. > > > > > For the capture buffers you need to provide buffers from secure/trusted= memory. > > That's a dmabuf fd, but where does that come from? > > > > I saw this message: > > > > https://lore.kernel.org/linux-media/CAPj87rOHctwHJM-7HiQpt8Q0b09x0WWw_T= 4XsL0qT=3DdS+XzyZQ@mail.gmail.com/T/#u > > > > so I expect that's where it comes from. But I agree that getting this f= rom dma-heaps > > seems more natural. > > > > I assume that those capture buffers are inaccessible from the CPU? (Hen= ce 'secure') > > > > For actually displaying these secure buffers you would use drm, and I a= ssume that > > the hardware would mix in the contents of the secure buffer into the vi= deo output > > pipeline? I.e., the actual contents remain inaccessible. And that the v= ideo output > > (HDMI or DisplayPort) is using HDCP? > > > > > > > > > > > > > In any case, using a control to switch to secure mode and using a c= ontrol > > > > to convert a dmabuf fd to a secure handle seems a poor choice to me= . > > > > > > > > I was wondering if it wouldn't be better to create a new V4L2_MEMOR= Y_ type, > > > > e.g. V4L2_MEMORY_DMABUF_SECURE (or perhaps _DMABUF_OPTEE). That ens= ures that > > > > once you create buffers for the first time, the driver can switch i= nto secure > > > > mode, and until all buffers are released again you know that the dr= iver will > > > > stay in secure mode. > > > > > > Why do you think the control for setting secure mode is a poor choice= ? > > > There's various places in the driver code where functionality changes > > > based on being secure/non-secure mode, so this is very much a 'global= ' > > > setting for the driver. It could be inferred based off a new memory > > > type for the queues...which then sets that flag in the driver; but > > > that seems like it would be more fragile and would require checking > > > for incompatible output/capture memory types. I'm not against another > > > way of doing this; but didn't see why you think the proposed method i= s > > > a poor choice. > > > > I assume you are either decoding to secure memory all the time, or not > > at all. That's something you would want to select the moment you alloca= te > > the first buffer. Using the V4L2_MEMORY_ value would be the natural pla= ce > > for that. A control can typically be toggled at any time, and it makes > > no sense to do that for secure streaming. > > > > Related to that: if you pass a dmabuf fd you will need to check somewhe= re > > if the fd points to secure memory or not. You don't want to mix the two > > but you want to check that at VIDIOC_QBUF time. > > > > Note that the V4L2_MEMORY_ value is already checked in the v4l2 core, > > drivers do not need to do that. > > Just to clarify a bit, and make sure I understand this too. You are propo= sing to > introduce something like: > > V4L2_MEMORY_SECURE_DMABUF > > Which like V4L2_MEMORY_DMABUF is meant to import dmabuf, while telling th= e > driver that the memory is secure according to the definition of "secure" = for the > platform its running on. > > This drivers also allocate secure SHM (a standard tee concept) and have i= nternal > allocation for reconstruction buffer and some hw specific reference metad= ata. So > the idea would be that it would keep allocation using the dmabuf heap int= ernal > APIs ? And decide which type of memory based on the memory type found in = the > queue? > > Stepping back a little, why can't we have a way for drivers to detect tha= t > dmabuf are secure ? I'm wondering if its actually useful to impose to all > userspace component to know that a dmabuf is secure ? > > Also, regarding MTK, these are stateless decoders. I think it would be ni= ce to > show use example code that can properly parse the un-encrypted header, pa= ss the > data to the decryptor and decode. There is a bit of mechanic in there tha= t lacks > clarification, a reference implementation would clearly help. Finally, do= es this > platform offers some clearkey implementation (or other alternative) so we= can do > validation and regression testing? It would be very unfortunate to add fe= ature > upstream that can only be tested by proprietary CDM software. > > Nicolas Here's some links to the current userspace implementation built on top of the MTK patches (and yeah, this'll end up changing based on what happens upstream). 1. This is where we are decrypting the video to a secure buffer, it's invoking IPC into a closed source component to do that: https://source.chromium.org/chromium/chromium/src/+/main:media/gpu/chromeos= /decoder_buffer_transcryptor.cc;l=3D87 2. This is where we aren enabling secure mode: https://source.chromium.org/chromium/chromium/src/+/main:media/gpu/v4l2/v4l= 2_video_decoder.cc;l=3D412 3. This is where we are resolving secure buffers to secure handles: https://source.chromium.org/chromium/chromium/src/+/main:media/gpu/v4l2/v4l= 2_video_decoder.cc;l=3D535 (the allocation of the secure buffers is done in closed source CDM code, but it's just opening the dma-buf heap and issuing the ioctl to allocate it) 4. This is where we submit the secure buffers to the output queue: https://source.chromium.org/chromium/chromium/src/+/main:media/gpu/v4l2/v4l= 2_queue.cc;l=3D816 (this is nothing special, since it's just passing in the fd) 5. For the capture queue, there's zero changes in Chrome V4L2 code for that...it's all transparent to user space that it's a secure surface that's being rendered to. We do allocate them w/ different flags via minigbm which happens here: https://source.chromium.org/chromium/chromium/src/+/main:media/gpu/chromeos= /platform_video_frame_pool.cc;l=3D37 > > > > > > > > > > > > > > For converting the dmabuf fd into a secure handle: a new ioctl simi= lar to > > > > VIDIOC_EXPBUF might be more suited for that. > > > > > > I actually think the best way for converting the dmabuf fd into a > > > secure handle would be another ioctl in the dma-heap driver...since > > > that's where the memory is actually allocated from. But this really > > > depends on upstream maintainers and what they are comfortable with. > > > > That feels like a more natural place of doing this. > > > > Regards, > > > > Hans > > > > > > > > > > > > > Note that I am the first to admit that I have no experience with se= cure > > > > video pipelines or optee-os, so I am looking at this purely from an= uAPI > > > > perspective. > > > > > > > > Regards, > > > > > > > > Hans > > > > > > > > > > > > > > Best Regards, > > > > > Yunfei Dong > > > > > > Regards, > > > > > > > > > > > > Hans > > > > > > > > > > > > > > > > > > > > regards, > > > > > > > Nicolas > > > > > > > > > > > > > > p.s. you forgot to document your control in the RST doc, plea= se do > > > > > > > > > > > > in following > > > > > > > release. > > > > > > > > > > > > > > > +ctx->is_svp_mode =3D ctrl->val; > > > > > > > > + > > > > > > > > +if (ctx->is_svp_mode) { > > > > > > > > +ret =3D mtk_vcodec_dec_optee_open(ctx->dev->optee_private)= ; > > > > > > > > +if (ret) > > > > > > > > +mtk_v4l2_vdec_err(ctx, "open secure mode failed."); > > > > > > > > +else > > > > > > > > +mtk_v4l2_vdec_dbg(3, ctx, "decoder in secure mode: %d", ct= rl- > > > > > > > > > > > > > > val); > > > > > > > > +} > > > > > > > > +break; > > > > > > > > default: > > > > > > > > mtk_v4l2_vdec_dbg(3, ctx, "Not supported to set ctrl id: > > > > > > > > 0x%x\n", > > > > > > > > > > > > hdr_ctrl->id); > > > > > > > > return ret; > > > > > > > > @@ -573,7 +584,7 @@ static int mtk_vcodec_dec_ctrls_setup(s= truct > > > > > > > > > > > > mtk_vcodec_dec_ctx *ctx) > > > > > > > > unsigned int i; > > > > > > > > struct v4l2_ctrl *ctrl; > > > > > > > > > > > > > > > > -v4l2_ctrl_handler_init(&ctx->ctrl_hdl, NUM_CTRLS + 1); > > > > > > > > +v4l2_ctrl_handler_init(&ctx->ctrl_hdl, NUM_CTRLS + 2); > > > > > > > > if (ctx->ctrl_hdl.error) { > > > > > > > > mtk_v4l2_vdec_err(ctx, "v4l2_ctrl_handler_init failed\n"); > > > > > > > > return ctx->ctrl_hdl.error; > > > > > > > > @@ -592,6 +603,8 @@ static int mtk_vcodec_dec_ctrls_setup(s= truct > > > > > > > > > > > > mtk_vcodec_dec_ctx *ctx) > > > > > > > > > > > > > > > > ctrl =3D v4l2_ctrl_new_std(&ctx->ctrl_hdl, > > > > > > > > > > > > &mtk_vcodec_dec_ctrl_ops, > > > > > > > > V4L2_CID_MPEG_MTK_GET_SECURE_HANDLE, 0, 65535, 1, 0); > > > > > > > > +ctrl =3D v4l2_ctrl_new_std(&ctx->ctrl_hdl, > > > > > > > > > > > > &mtk_vcodec_dec_ctrl_ops, > > > > > > > > + V4L2_CID_MPEG_MTK_SET_SECURE_MODE, 0, 65535, 1, 0); > > > > > > > > > > > > > > > > v4l2_ctrl_handler_setup(&ctx->ctrl_hdl); > > > > > > > > > > > > > > > > diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c > > > > > > > > > > > > b/drivers/media/v4l2-core/v4l2-ctrls-defs.c > > > > > > > > index d8cf01f76aab..a507045a3f30 100644 > > > > > > > > --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c > > > > > > > > +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c > > > > > > > > @@ -1042,6 +1042,7 @@ const char *v4l2_ctrl_get_name(u32 id= ) > > > > > > > > case V4L2_CID_MPEG_VIDEO_REF_NUMBER_FOR_PFRAMES:return > > > > > > > > "Reference > > > > > > > > > > > > Frames for a P-Frame"; > > > > > > > > case V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR:return "Pre= pend > > > > > > > > > > > > SPS and PPS to IDR"; > > > > > > > > case V4L2_CID_MPEG_MTK_GET_SECURE_HANDLE:return "MediaTek > > > > > > > > Decoder > > > > > > > > > > > > get secure handle"; > > > > > > > > +case V4L2_CID_MPEG_MTK_SET_SECURE_MODE:return "MediaTek De= coder > > > > > > > > > > > > set secure mode"; > > > > > > > > > > > > > > > > /* AV1 controls */ > > > > > > > > case V4L2_CID_MPEG_VIDEO_AV1_PROFILE:return "AV1 Profile"; > > > > > > > > @@ -1442,6 +1443,10 @@ void v4l2_ctrl_fill(u32 id, const ch= ar > > > > > > > > > > > > **name, enum v4l2_ctrl_type *type, > > > > > > > > *type =3D V4L2_CTRL_TYPE_INTEGER; > > > > > > > > *flags |=3D V4L2_CTRL_FLAG_WRITE_ONLY; > > > > > > > > break; > > > > > > > > +case V4L2_CID_MPEG_MTK_SET_SECURE_MODE: > > > > > > > > +*type =3D V4L2_CTRL_TYPE_INTEGER; > > > > > > > > +*flags |=3D V4L2_CTRL_FLAG_WRITE_ONLY; > > > > > > > > +break; > > > > > > > > case V4L2_CID_USER_CLASS: > > > > > > > > case V4L2_CID_CAMERA_CLASS: > > > > > > > > case V4L2_CID_CODEC_CLASS: > > > > > > > > diff --git a/include/uapi/linux/v4l2-controls.h > > > > > > > > > > > > b/include/uapi/linux/v4l2-controls.h > > > > > > > > index 7b3694985366..88e90d943e38 100644 > > > > > > > > --- a/include/uapi/linux/v4l2-controls.h > > > > > > > > +++ b/include/uapi/linux/v4l2-controls.h > > > > > > > > @@ -957,6 +957,7 @@ enum v4l2_mpeg_mfc51_video_force_frame_= type { > > > > > > > > /* MPEG-class control IDs specific to the MediaTek Decode= r > > > > > > > > > > > > driver as defined by V4L2 */ > > > > > > > > #define V4L2_CID_MPEG_MTK_BASE(V4L2_CTRL_CLASS_CODEC | 0x2= 000) > > > > > > > > #define > > > > > > > > > > > > V4L2_CID_MPEG_MTK_GET_SECURE_HANDLE(V4L2_CID_MPEG_MTK_BASE+8) > > > > > > > > +#define > > > > > > > > > > > > V4L2_CID_MPEG_MTK_SET_SECURE_MODE(V4L2_CID_MPEG_MTK_BASE+9) > > > > > > > > > > > > > > > > /* Camera class control IDs */ > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > linux-arm-kernel mailing list > > > > linux-arm-kernel@lists.infradead.org > > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > >