Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1470378ybh; Sun, 19 Jul 2020 21:42:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTtNl2JOWNQ4aKC63OlAMSC9l1WE3XSyaH9mYemvKXXSeJ72QM3b47BKN09BQbJtVcFAEV X-Received: by 2002:a50:ab52:: with SMTP id t18mr20178645edc.195.1595220147166; Sun, 19 Jul 2020 21:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595220147; cv=none; d=google.com; s=arc-20160816; b=cm4iZWSpuPQE4UjSKPee5ybqR95LvXv6C3MeS7kktpw403r9fsYZfaz/Qu4MKXpyDF RS7leVLYK9CWowm3B+oxHmI2hCfkzxKk9BpxU37JY7OQ34Xxx6wF/VLiE/3g89QFFlyq l56iZN7MBwpsxioHbAVTiz+Et3iOyGnNfJBAFznfiFyFh8dfLAeB2h15923uARgy2JjF W2AhmuaM5PQwjlnFZdr6F16jMYs7e+HfuOZ4mV8Abw14+GBC9VFC+B+3pAkerpogo50B pg6xxi/9IIaLG3BmR+lNv7gZVZQfLaxjEYT6tyvmGnJoHnt3VsLgDG3iL3CPwS13M+W1 6drw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:content-language :content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:references:cc:to:from:subject; bh=Y2hnBSi/9zICMzuo0hZ0Zmeo249UyL6uH8Lo0H246MA=; b=BCaNrHlcB/F9h1W5u2h2X84sX3zpDmT+S4UfkvIVCNN6HsCpvOF1niXoy95shjB+nj TTw+REtK/r0qwL6HImiFNiFIdd6Qu7aXR5SYHqu5fttd3HJLSPSeYQgtWasIjQm2U2da 7+3Jna2aKyE5kgbZ7/FCrIc8osOvHsOOO+YOQ1bM3RMSpiItjtuZelyjunFkyCVuBA6B LbxRmxuEltqFQoWhb/NSxTO7EJgWe9zXyF8lZE+N2X6pO+fLYSjnPRqZ/bcqgCz/LZKd 9OsGD48vGpH/HISGeDP/O3MCZ39AiczAHsVamniij4KYg6QMRuK+q3gfhssmZlIv/bIk /Jiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=RPSQYiDQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dc14si9330495edb.240.2020.07.19.21.42.04; Sun, 19 Jul 2020 21:42:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=RPSQYiDQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726042AbgGTElS (ORCPT + 99 others); Mon, 20 Jul 2020 00:41:18 -0400 Received: from hqnvemgate24.nvidia.com ([216.228.121.143]:15044 "EHLO hqnvemgate24.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725287AbgGTElS (ORCPT ); Mon, 20 Jul 2020 00:41:18 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Sun, 19 Jul 2020 21:39:18 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Sun, 19 Jul 2020 21:41:17 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Sun, 19 Jul 2020 21:41:17 -0700 Received: from [10.2.168.236] (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 20 Jul 2020 04:41:16 +0000 Subject: Re: [RFC PATCH v3 00/18] Support for Tegra video capture from external sensor From: Sowjanya Komatineni To: Hans Verkuil , , , , , , CC: , , , , , , , References: <1594786855-26506-1-git-send-email-skomatineni@nvidia.com>

<458db01d-3c9c-1aec-0d28-edcbf0265aa4@xs4all.nl> <5694f74a-be8e-7a95-1739-0a5fc9820597@nvidia.com> <9aa8be89-d181-2dca-36ca-ea118bd5b0a7@nvidia.com> <2f9ecba7-3d05-8a68-f2ad-546470780642@nvidia.com> Message-ID: <0e5b26b6-031a-c07c-0295-4cce0712779d@nvidia.com> Date: Sun, 19 Jul 2020 21:41:32 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <2f9ecba7-3d05-8a68-f2ad-546470780642@nvidia.com> X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-US DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1595219958; bh=Y2hnBSi/9zICMzuo0hZ0Zmeo249UyL6uH8Lo0H246MA=; h=X-PGP-Universal:Subject:From:To:CC:References:Message-ID:Date: User-Agent:MIME-Version:In-Reply-To:X-Originating-IP: X-ClientProxiedBy:Content-Type:Content-Transfer-Encoding: Content-Language; b=RPSQYiDQt2NvvSzMZmgUB17Srisiy60FwsjfA4ZNf2opnhoEmUfC/7svuW6WIQgzr 4kq2FSONFeyfmiArDT4nExaAqF1kZYYgpJHsv0ccRXDKzjPY0tn4jADh/R3nH30FGN 7KfoI0DLzagwroL0/786W6Ugc3gm/FdRr3+XUWnXxoyu8MNapxKhXcuqUtIAQQtClt JxDdOtuEkFnZHS/1N2qcQJeez5IcASic50cilhB9Dp9WFl1yzi3LHhPvyvdxWn2/cW Ys9heU6rzIcKuZnxfn6KiSTb7oU7uhwDPtCk+3v2oC9pkBKALcTW2hKAK10fvcrI7K brXB9rEQor07Q== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/17/20 10:48 AM, Sowjanya Komatineni wrote: > > On 7/17/20 10:38 AM, Sowjanya Komatineni wrote: >> >> On 7/17/20 10:23 AM, Sowjanya Komatineni wrote: >>> >>> On 7/17/20 10:08 AM, Hans Verkuil wrote: >>>> On 17/07/2020 18:34, Sowjanya Komatineni wrote: >>>>> On 7/17/20 3:54 AM, Hans Verkuil wrote: >>>>>> Hi Sowjanya, >>>>>> >>>>>> On 15/07/2020 06:20, Sowjanya Komatineni wrote: >>>>>>> This series adds support for video capture from external camera=20 >>>>>>> sensor to >>>>>>> Tegra video driver. >>>>>>> >>>>>>> Jetson TX1 has camera expansion connector and supports custom=20 >>>>>>> camera module >>>>>>> designed as per TX1 design specification. >>>>>>> >>>>>>> This series also enables camera capture support for Jetson Nano=20 >>>>>>> which has >>>>>>> Raspberry PI camera header. >>>>>>> >>>>>>> This series is tested with IMX219 camera sensor. >>>>>>> >>>>>>> This series include, >>>>>>> >>>>>>> VI I2C related fixes >>>>>>> - Camera sensor programming happens through VI I2C which is on=20 >>>>>>> host1x bus. >>>>>>> - These patches includes device tree and I2C driver fixes for VI=20 >>>>>>> I2C. >>>>>>> >>>>>>> Tegra video driver updates >>>>>>> - TPG Vs Non-TPG based on Kconfig >>>>>>> - Support for external sensor video capture based on device=20 >>>>>>> graph from DT. >>>>>>> - Support for selection ioctl operations >>>>>>> - Tegra MIPI CSI pads calibration >>>>>>> - CSI T-CLK and T-HS settle time computation based on clock rates. >>>>>>> >>>>>>> Host1x driver updates >>>>>>> - Adds API to allow creating mipi device for specific device node. >>>>>>> - Splits MIPI pads calibrate start and waiting for calibration=20 >>>>>>> to be done. >>>>>>> >>>>>>> Device tree updates >>>>>>> - Adds camera connector 2V8, 1V8, 1V2 regulator supplies to=20 >>>>>>> Jetson TX1 DT. >>>>>>> - Enabled VI and CSI support in Jetson Nano DT. >>>>>> I'm doing a bit of stress testing with: >>>>>> >>>>>> while true; do v4l2-ctl --stream-mmap --stream-count=3D1; done >>>>>> >>>>>> and I see that the imx274 has often streaming failures: >>>>>> >>>>>> [=C2=A0 172.025144] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 179.025192] IMX274 8-001a: imx274_write_mbreg : i2c bulk wri= te=20 >>>>>> failed, 3132 =3D 870 (2 bytes) >>>>>> [=C2=A0 179.033575] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 226.525378] IMX274 8-001a: imx274_write_mbreg : i2c bulk wri= te=20 >>>>>> failed, 3130 =3D 878 (2 bytes) >>>>>> [=C2=A0 226.533761] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 227.029325] IMX274 8-001a: imx274_write_mbreg : i2c bulk wri= te=20 >>>>>> failed, 30f6 =3D 107 (2 bytes) >>>>>> [=C2=A0 227.037758] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 247.025218] IMX274 8-001a: imx274_write_mbreg : i2c bulk wri= te=20 >>>>>> failed, 30f6 =3D 107 (2 bytes) >>>>>> [=C2=A0 247.033658] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 293.025517] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 309.024727] IMX274 8-001a: imx274_write_mbreg : i2c bulk wri= te=20 >>>>>> failed, 30e0 =3D 0 (2 bytes) >>>>>> [=C2=A0 309.032969] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 309.529506] IMX274 8-001a: imx274_write_mbreg : i2c bulk wri= te=20 >>>>>> failed, 30f8 =3D 11d2 (3 bytes) >>>>>> [=C2=A0 309.538103] IMX274 8-001a: imx274_set_frame_length error =3D= -121 >>>>>> [=C2=A0 309.544102] IMX274 8-001a: imx274_set_frame_interval error = =3D -121 >>>>>> [=C2=A0 309.550243] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 314.025561] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 329.025586] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 340.529567] IMX274 8-001a: imx274_write_mbreg : i2c bulk wri= te=20 >>>>>> failed, 303a =3D f0c (2 bytes) >>>>>> [=C2=A0 340.538009] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 347.525627] IMX274 8-001a: imx274_write_mbreg : i2c bulk wri= te=20 >>>>>> failed, 30f6 =3D 107 (2 bytes) >>>>>> [=C2=A0 347.534008] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 365.033640] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 437.525788] IMX274 8-001a: imx274_write_mbreg : i2c bulk wri= te=20 >>>>>> failed, 3038 =3D c (2 bytes) >>>>>> [=C2=A0 437.533997] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 456.029780] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 472.025862] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 498.025861] IMX274 8-001a: s_stream failed >>>>>> [=C2=A0 500.025905] IMX274 8-001a: s_stream failed >>>>>> >>>>>> where v4l2-ctl returns: >>>>>> >>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VIDIOC_STREAMON returned -1 (Remote I/= O error) >>>>>> >>>>>> I don't see this with the imx219. >>>>>> >>>>>> I also see this occasionally: >>>>>> >>>>>> [Fri Jul 17 12:51:42 2020] video4linux video1: failed to run=20 >>>>>> capture start kthread: -4 >>>>>> >>>>>> Something is not stable here. >>>>>> >>>>>> Regards, >>>>>> >>>>>> =C2=A0=C2=A0=C2=A0=C2=A0Hans >>>>> Hi Hans, >>>>> >>>>> Running the same single frame continuous loop for more than 2=20 >>>>> hours now >>>>> and I don't see any failure. >>>>> >>>>> Above failure shows i2c bulk writes to IMX274 failure due to which >>>>> s_stream also failed. >>>>> >>>>> Not sure if its due to i2c mux in the path to sensor on your module >>>>> causing some issue when there is more i2c write traffic as we are=20 >>>>> doing >>>>> single stream in continuous loop. Also IMX219 does not show on=20 >>>>> your side >>>>> so something specific to IMX274 setup probably. >>>> I'll take a closer look next week. Good to know that it works fine=20 >>>> for you. >>>> >>>>> >>>>> Regarding kthread_run failure where kthread_run() returned -EINTR=20 >>>>> during >>>>> capture start thread, I always see this happen at the point of=20 >>>>> stopping >>>>> the continuous single stream while loop by pressing ctrl+c after few >>>>> loops of execution. >>>> Hmm, if this is normal behavior, then should this message be a=20 >>>> debug message >>>> only? Or perhaps only show the message if the error code !=3D EINTR. >>> >>> I believe its good to still show this as its reported by kthread_run=20 >>> -> kthread_create_on_node. >>> >>> But not sure in real usecase we will ever use while true like this=20 >>> and we should use script to also break while loop along with=20 >>> v4l2-ctl termination when ctrl-c terminate request happens. >>> >> Hi Hans, As this happens only during this type of case, I can update=20 >> to show message only when error code !=3D EINTR. >> >> Thanks >> >> Sowjanya > > > Sorry, Was thinking to not mask debug message for -EINTR in case if it=20 > happens in any other valid scenarios. If you still want to mask, will=20 > update in next version. > As we are running application that uses threads depending on when ctrl-c=20 gets hit I see sigkill happens during kthread run even with break=20 causing this. Good way I see it working all the time is to use crtl-z and then kill=20 application as below Command to run while true; do ./v4l2-ctl --stream-mmap --stream-count=3D1; done To stop , press ctrl-z and then execute kill %% >> >>> >>>> >>>> Regards, >>>> >>>> =C2=A0=C2=A0=C2=A0=C2=A0Hans >>>> >>>>> while true; do v4l2-ctl --stream-mmap --stream-count=3D1; done >>>>> >>>>> when we stop loop with ctrl+c, v4l2-ctl terminates but loop does not >>>>> terminate immediately and probably SIGKILLed=C2=A0 is seen prior to=20 >>>>> complete. >>>>> >>>>> Using below can help to terminate loop as well when we stop ctrl-c=20 >>>>> and >>>>> with this I don't see any repro of EINTR error from kthread_run=20 >>>>> when run >>>>> in infinite loop. >>>>> >>>>> while true; do ./v4l2-ctl --stream-mmap --stream-count=3D1 || break;= =20 >>>>> done >>>>> >>>>> >>>>> >>>>>>> Delta between patch versions: >>>>>>> >>>>>>> [v3]:=C2=A0=C2=A0=C2=A0 Includes v2 feedback >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0- Uses separate helper function for retriev= ing remote csi=20 >>>>>>> subdevice >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 and source subdevice. >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0- Added check for presence of subdevice ops= set/get_selection >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0- dropped vb2_queue_release from driver and= using >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vb2_video_unregister_device instead = of=20 >>>>>>> video_unregister_device. >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0- video device register should happen in th= e last after all=20 >>>>>>> video >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 device related setup is done in the = driver. This is being=20 >>>>>>> addressed >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 in below RFC patch. Once proper impl= ementation of this is=20 >>>>>>> available >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 will update Tegra video driver to us= e split APIs and do=20 >>>>>>> all setup >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 prior to device register. Added this= as TODO in the driver. >>>>>>> https://www.spinics.net/lists/linux-media/msg172761.html >>>>>>> >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0Note: >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0Patch-0012 has compilation dependency on >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0https://patchwork.kernel.org/patch/11659521= / >>>>>>> >>>>>>> >>>>>>> [v2]:=C2=A0=C2=A0=C2=A0 Includes below changes based on v1 feedback >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0- dt-binding document and the driver update= for device graph=20 >>>>>>> to use >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 separate ports for sink endpoint and= source endpoint for csi. >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0- Use data-lanes endpoint property for csi. >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0- Update tegra_mipi_request() to take devic= e node pointer=20 >>>>>>> argument >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rather than adding extra API. >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0- Remove checking for clk pointer before cl= k_disable. >>>>>>> >>>>>>> >>>>>>> Sowjanya Komatineni (18): >>>>>>> =C2=A0=C2=A0=C2=A0 dt-bindings: i2c: tegra: Document Tegra210 VI I2= C clocks and >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 power-domains >>>>>>> =C2=A0=C2=A0=C2=A0 arm64: tegra: Add missing clocks and power-domai= ns to=20 >>>>>>> Tegra210 VI I2C >>>>>>> =C2=A0=C2=A0=C2=A0 i2c: tegra: Don't mark VI I2C as IRQ safe runtim= e PM >>>>>>> =C2=A0=C2=A0=C2=A0 i2c: tegra: Remove NULL pointer check before >>>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 clk_enable/disable/prepare/unprepare >>>>>>> =C2=A0=C2=A0=C2=A0 i2c: tegra: Fix the error path in tegra_i2c_runt= ime_resume >>>>>>> =C2=A0=C2=A0=C2=A0 i2c: tegra: Fix runtime resume to re-init VI I2C >>>>>>> =C2=A0=C2=A0=C2=A0 i2c: tegra: Avoid tegra_i2c_init_dma() for Tegra= 210 vi i2c >>>>>>> =C2=A0=C2=A0=C2=A0 media: tegra-video: Fix channel format alignment >>>>>>> =C2=A0=C2=A0=C2=A0 media: tegra-video: Enable TPG based on kernel c= onfig >>>>>>> =C2=A0=C2=A0=C2=A0 media: tegra-video: Update format lookup to offs= et based >>>>>>> =C2=A0=C2=A0=C2=A0 dt-bindings: tegra: Update VI and CSI bindings w= ith port info >>>>>>> =C2=A0=C2=A0=C2=A0 media: tegra-video: Add support for external sen= sor capture >>>>>>> =C2=A0=C2=A0=C2=A0 media: tegra-video: Add support for selection io= ctl ops >>>>>>> =C2=A0=C2=A0=C2=A0 gpu: host1x: mipi: Update tegra_mipi_request() t= o be node based >>>>>>> =C2=A0=C2=A0=C2=A0 gpu: host1x: mipi: Use readl_relaxed_poll_timeou= t in=20 >>>>>>> tegra_mipi_wait >>>>>>> =C2=A0=C2=A0=C2=A0 gpu: host1x: mipi: Split tegra_mipi_calibrate an= d=20 >>>>>>> tegra_mipi_wait >>>>>>> =C2=A0=C2=A0=C2=A0 media: tegra-video: Add CSI MIPI pads calibratio= n >>>>>>> =C2=A0=C2=A0=C2=A0 media: tegra-video: Compute settle times based o= n the clock=20 >>>>>>> rate >>>>>>> >>>>>>> =C2=A0=C2=A0 .../display/tegra/nvidia,tegra20-host1x.txt | 92 ++- >>>>>>> =C2=A0=C2=A0 .../devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | 1= 9 +- >>>>>>> =C2=A0=C2=A0 arch/arm64/boot/dts/nvidia/tegra210.dtsi | 6 + >>>>>>> =C2=A0=C2=A0 drivers/gpu/drm/tegra/dsi.c | 9 +- >>>>>>> =C2=A0=C2=A0 drivers/gpu/host1x/mipi.c | 37 +- >>>>>>> =C2=A0=C2=A0 drivers/i2c/busses/i2c-tegra.c | 101 +-- >>>>>>> =C2=A0=C2=A0 drivers/staging/media/tegra-video/Kconfig | 7 + >>>>>>> =C2=A0=C2=A0 drivers/staging/media/tegra-video/csi.c | 247 ++++++- >>>>>>> =C2=A0=C2=A0 drivers/staging/media/tegra-video/csi.h | 8 + >>>>>>> =C2=A0=C2=A0 drivers/staging/media/tegra-video/tegra210.c | 25 +- >>>>>>> =C2=A0=C2=A0 drivers/staging/media/tegra-video/vi.c | 793=20 >>>>>>> +++++++++++++++++++-- >>>>>>> =C2=A0=C2=A0 drivers/staging/media/tegra-video/vi.h | 25 +- >>>>>>> =C2=A0=C2=A0 drivers/staging/media/tegra-video/video.c | 23 +- >>>>>>> =C2=A0=C2=A0 include/linux/host1x.h | 4 +- >>>>>>> =C2=A0=C2=A0 14 files changed, 1242 insertions(+), 154 deletions(-) >>>>>>>