Hi Linus,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v4.20-7
For the Intel IPU3 camera driver.
====
NOTE
====
Please apply this series *after* my first pull request, as it partially
contains the patches that are there.
Also, it would be good if you merge first the docs-next pull request from
Jon, as otherwise, you'll see some warnings when building documentation,
due to an issue at scripts/kernel-doc, whose fix is at documentation tree.
Thanks!
Mauro
The following changes since commit d2b4387f3bdf016e266d23cf657465f557721488:
media: platform: Add Aspeed Video Engine driver (2018-12-12 12:05:12 -0500)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v4.20-7
for you to fetch changes up to 38b11beb73c52bd6fb3920775887fdd1004f2a68:
media: staging/ipu3-imgu: Add MAINTAINERS entry (2018-12-17 15:03:53 -0500)
----------------------------------------------------------------
media fixes for v4.20-rc8
----------------------------------------------------------------
Bingbu Cao (1):
media: staging/intel-ipu3: Add dual pipe support
Ondrej Jirman (1):
media: v4l2-fwnode: Fix setting V4L2_MBUS_DATA_ACTIVE_HIGH/LOW flag
Rajmohan Mani (1):
media: doc-rst: Add Intel IPU3 documentation
Sakari Ailus (6):
media: v4l: Add support for V4L2_BUF_TYPE_META_OUTPUT
media: docs-rst: v4l: Document V4L2_BUF_TYPE_META_OUTPUT interface
media: ipu3-imgu: Fix compiler warnings
media: ipu3-imgu: Fix firmware binary location
media: staging/ipu3-imgu: Address documentation comments
media: staging/ipu3-imgu: Add MAINTAINERS entry
Tomasz Figa (2):
media: staging/intel-ipu3: mmu: Implement driver
media: staging/intel-ipu3: Implement DMA mapping functions
Yong Zhi (12):
media: staging/intel-ipu3: abi: Add register definitions and enum
media: staging/intel-ipu3: abi: Add structs
media: staging/intel-ipu3: css: Add dma buff pool utility functions
media: staging/intel-ipu3: css: Add support for firmware management
media: staging/intel-ipu3: css: Add static settings for image pipeline
media: staging/intel-ipu3: css: Compute and program ccs
media: staging/intel-ipu3: css: Initialize css hardware
media: staging/intel-ipu3: Add css pipeline programming
media: staging/intel-ipu3: Add v4l2 driver based on media framework
media: staging/intel-ipu3: Add imgu top level pci device driver
media: staging/intel-ipu3: Add Intel IPU3 meta data uAPI
media: v4l: Add Intel IPU3 meta buffer formats
Documentation/media/uapi/v4l/buffer.rst | 3 +
Documentation/media/uapi/v4l/dev-meta.rst | 33 +-
Documentation/media/uapi/v4l/meta-formats.rst | 1 +
.../media/uapi/v4l/pixfmt-meta-intel-ipu3.rst | 178 +
Documentation/media/uapi/v4l/vidioc-querycap.rst | 3 +
Documentation/media/v4l-drivers/index.rst | 1 +
Documentation/media/v4l-drivers/ipu3.rst | 369 +
Documentation/media/videodev2.h.rst.exceptions | 2 +
MAINTAINERS | 8 +
drivers/media/common/videobuf2/videobuf2-v4l2.c | 1 +
drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +
drivers/media/v4l2-core/v4l2-dev.c | 12 +-
drivers/media/v4l2-core/v4l2-fwnode.c | 4 +-
drivers/media/v4l2-core/v4l2-ioctl.c | 23 +
drivers/staging/media/Kconfig | 2 +
drivers/staging/media/Makefile | 1 +
drivers/staging/media/ipu3/Kconfig | 14 +
drivers/staging/media/ipu3/Makefile | 11 +
drivers/staging/media/ipu3/TODO | 34 +
drivers/staging/media/ipu3/include/intel-ipu3.h | 2785 ++++++
drivers/staging/media/ipu3/ipu3-abi.h | 2011 ++++
drivers/staging/media/ipu3/ipu3-css-fw.c | 265 +
drivers/staging/media/ipu3/ipu3-css-fw.h | 188 +
drivers/staging/media/ipu3/ipu3-css-params.c | 2943 ++++++
drivers/staging/media/ipu3/ipu3-css-params.h | 28 +
drivers/staging/media/ipu3/ipu3-css-pool.c | 100 +
drivers/staging/media/ipu3/ipu3-css-pool.h | 55 +
drivers/staging/media/ipu3/ipu3-css.c | 2391 +++++
drivers/staging/media/ipu3/ipu3-css.h | 213 +
drivers/staging/media/ipu3/ipu3-dmamap.c | 270 +
drivers/staging/media/ipu3/ipu3-dmamap.h | 22 +
drivers/staging/media/ipu3/ipu3-mmu.c | 561 ++
drivers/staging/media/ipu3/ipu3-mmu.h | 35 +
drivers/staging/media/ipu3/ipu3-tables.c | 9609 ++++++++++++++++++++
drivers/staging/media/ipu3/ipu3-tables.h | 66 +
drivers/staging/media/ipu3/ipu3-v4l2.c | 1419 +++
drivers/staging/media/ipu3/ipu3.c | 830 ++
drivers/staging/media/ipu3/ipu3.h | 168 +
include/media/v4l2-ioctl.h | 17 +
include/uapi/linux/videodev2.h | 2 +
40 files changed, 24661 insertions(+), 19 deletions(-)
create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
create mode 100644 Documentation/media/v4l-drivers/ipu3.rst
create mode 100644 drivers/staging/media/ipu3/Kconfig
create mode 100644 drivers/staging/media/ipu3/Makefile
create mode 100644 drivers/staging/media/ipu3/TODO
create mode 100644 drivers/staging/media/ipu3/include/intel-ipu3.h
create mode 100644 drivers/staging/media/ipu3/ipu3-abi.h
create mode 100644 drivers/staging/media/ipu3/ipu3-css-fw.c
create mode 100644 drivers/staging/media/ipu3/ipu3-css-fw.h
create mode 100644 drivers/staging/media/ipu3/ipu3-css-params.c
create mode 100644 drivers/staging/media/ipu3/ipu3-css-params.h
create mode 100644 drivers/staging/media/ipu3/ipu3-css-pool.c
create mode 100644 drivers/staging/media/ipu3/ipu3-css-pool.h
create mode 100644 drivers/staging/media/ipu3/ipu3-css.c
create mode 100644 drivers/staging/media/ipu3/ipu3-css.h
create mode 100644 drivers/staging/media/ipu3/ipu3-dmamap.c
create mode 100644 drivers/staging/media/ipu3/ipu3-dmamap.h
create mode 100644 drivers/staging/media/ipu3/ipu3-mmu.c
create mode 100644 drivers/staging/media/ipu3/ipu3-mmu.h
create mode 100644 drivers/staging/media/ipu3/ipu3-tables.c
create mode 100644 drivers/staging/media/ipu3/ipu3-tables.h
create mode 100644 drivers/staging/media/ipu3/ipu3-v4l2.c
create mode 100644 drivers/staging/media/ipu3/ipu3.c
create mode 100644 drivers/staging/media/ipu3/ipu3.h
On Thu, Dec 20, 2018 at 4:45 AM Mauro Carvalho Chehab
<[email protected]> wrote:
>
> Also, it would be good if you merge first the docs-next pull request from
> Jon, as otherwise, you'll see some warnings when building documentation,
> due to an issue at scripts/kernel-doc, whose fix is at documentation tree.
I don't seem to have that in my pile of pull requests, so docs
creation will warn for a bit. Not a huge deal.
Linus
The pull request you sent on Thu, 20 Dec 2018 10:45:44 -0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v4.20-7
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/996680d461f8f759082e64f2395c1f7c25d9d549
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
Em Tue, 25 Dec 2018 13:12:58 -0800
Linus Torvalds <[email protected]> escreveu:
> On Thu, Dec 20, 2018 at 4:45 AM Mauro Carvalho Chehab
> <[email protected]> wrote:
> >
> > Also, it would be good if you merge first the docs-next pull request from
> > Jon, as otherwise, you'll see some warnings when building documentation,
> > due to an issue at scripts/kernel-doc, whose fix is at documentation tree.
>
> I don't seem to have that in my pile of pull requests, so docs
> creation will warn for a bit. Not a huge deal.
Yeah, we can live without that for a while. In any case, the patch that
fixes it is this one:
3d9bfb19bd70 ("scripts/kernel-doc: Fix struct and struct field attribute processing")
I'm enclosing it as a reference (as seen at Jon's docs-next tree). It is
probably worth to just wait for Jon's pull request.
Thanks,
Mauro
From: Sakari Ailus <[email protected]>
Date: Thu, 22 Nov 2018 13:06:04 +0200
Subject: [PATCH] scripts/kernel-doc: Fix struct and struct field attribute
processing
The kernel-doc attempts to clear the struct and struct member attributes
from the API documentation it produces. It falls short of the job in the
following respects:
- extra whitespaces are left where __attribute__((...)) was removed,
- only a single attribute is removed per struct,
- attributes (such as aligned) containing numbers were not removed,
- attributes are only cleared from struct fields, not structs themselves.
This patch addresses these issues by removing the attributes.
Signed-off-by: Sakari Ailus <[email protected]>
Signed-off-by: Jonathan Corbet <[email protected]>
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index f9f143145c4b..c5333d251985 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1062,7 +1062,7 @@ sub dump_struct($$) {
my $x = shift;
my $file = shift;
- if ($x =~ /(struct|union)\s+(\w+)\s*\{(.*)\}/) {
+ if ($x =~ /(struct|union)\s+(\w+)\s*\{(.*)\}(\s*(__packed|__aligned|__attribute__\s*\(\([a-z0-9,_\s\(\)]*\)\)))*/) {
my $decl_type = $1;
$declaration_name = $2;
my $members = $3;
@@ -1073,8 +1073,9 @@ sub dump_struct($$) {
# strip comments:
$members =~ s/\/\*.*?\*\///gos;
# strip attributes
- $members =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i;
- $members =~ s/__aligned\s*\([^;]*\)//gos;
+ $members =~ s/\s*__attribute__\s*\(\([a-z0-9,_\*\s\(\)]*\)\)//gi;
+ $members =~ s/\s*__aligned\s*\([^;]*\)//gos;
+ $members =~ s/\s*__packed\s*//gos;
$members =~ s/\s*CRYPTO_MINALIGN_ATTR//gos;
# replace DECLARE_BITMAP
$members =~ s/DECLARE_BITMAP\s*\(([^,)]+),\s*([^,)]+)\)/unsigned long $1\[BITS_TO_LONGS($2)\]/gos;