Skip to contentSkip to conversation

media fixes

GIT PULL Merged Mauro Carvalho Chehab 3 participants 3 messages Jul 24, 2023 – Jul 25, 2023 Media (V4L/DVB)

lore
Share & tools
lore

Mauro Carvalho Chehab

author maintainer
#0 lore raw

Hi Linus,

Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.5-2

For a couple of fixes:
- some warning fixes;
- verisilicon: an excessive usage of stack fix and changes at reg access;
- amphion: use dev_err_probe;
- pulse8-cec: handle possible ping error
- imx-jpeg: Support to assign slot for encoder/decoder
- amphion: Fix firmware path to match linux-firmware
- pci: cx23885: fix error handling for cx23885 ATSC boards
- staging: atomisp: select V4L2_FWNODE
- mediatek: vcodec: fix cancel_work_sync fail with fluster test

Regards,
Mauro

The following changes since commit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5:

Linux 6.5-rc1 (2023-07-09 13:53:13 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.5-2

for you to fetch changes up to 0cb1d9c845110ce638a43a1417c7df5968d1daa3:

media: verisilicon: change confusingly named relaxed register access (2023-07-14 09:14:10 +0200)

----------------------------------------------------------------
media fixes for v6.5-rc4

----------------------------------------------------------------
Alexander Stein (1):
media: amphion: use dev_err_probe

Arnd Bergmann (3):
media: mtk_jpeg_core: avoid unused-variable warning
media: verisilicon: fix excessive stack usage
media: verisilicon: change confusingly named relaxed register access

Dmitry Antipov (1):
media: pulse8-cec: handle possible ping error

Ming Qian (1):
media: imx-jpeg: Support to assign slot for encoder/decoder

Nicolas Dufresne (1):
media: amphion: Fix firmware path to match linux-firmware

Nikolay Burykin (1):
media: pci: cx23885: fix error handling for cx23885 ATSC boards

Sakari Ailus (2):
media: tc358746: Address compiler warnings
media: staging: atomisp: select V4L2_FWNODE

Yunfei Dong (1):
media: mediatek: vcodec: fix cancel_work_sync fail with fluster test

 drivers/media/cec/usb/pulse8/pulse8-cec.c          |   7 +-
 drivers/media/i2c/tc358746.c                       |   4 +-
 drivers/media/pci/cx23885/cx23885-dvb.c            |  12 --
 drivers/media/platform/amphion/vpu_core.c          |   4 +-
 drivers/media/platform/amphion/vpu_mbox.c          |   9 +-
 .../media/platform/mediatek/jpeg/mtk_jpeg_core.c   |   6 +-
 .../media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c |   4 +-
 .../media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c |   4 +-
 .../platform/mediatek/vcodec/vdec_msg_queue.c      |   3 +-
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h  |   1 -
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c     | 135 ++++++++++-----------
 drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h     |   5 +-
 drivers/media/platform/verisilicon/hantro.h        |  46 +++----
 .../media/platform/verisilicon/hantro_postproc.c   |  12 +-
 drivers/staging/media/atomisp/Kconfig              |   1 +
 15 files changed, 116 insertions(+), 137 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Mon, 24 Jul 2023 12:11:50 +0200:

The pull request you sent on Mon, 24 Jul 2023 12:11:50 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.5-2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9e0ee0c7545c7ec012a53878e7687e05b87abc75

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
#2 lore raw

Re: [GIT PULL for v6.5-rc4] media fixes (#93381)

In reply to Mauro Carvalho Chehab

From: [email protected]

Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/
Build log: https://builder.linuxtv.org/job/patchwork/325108/
Build time: 00:00:00

gpg: Signature made Mon 24 Jul 2023 10:06:33 AM UTC
gpg:                using RSA key F909AE68FC11DF09C1755C00085F3EBD8EE4E115
gpg: Good signature from "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "[jpeg image of size 3594]" [ultimate]

Build aborted due to a fatal error:
FAILED: patch patch patches/0001-media-tc358746-Address-compiler-warnings.patch doesn't apply:
Applying patch patches/0001-media-tc358746-Address-compiler-warnings.patch patching file drivers/media/i2c/tc358746.c
Hunk #1 FAILED at 813.
1 out of 1 hunk FAILED -- rejects in file drivers/media/i2c/tc358746.c
Patch patches/0001-media-tc358746-Address-compiler-warnings.patch can be reverse-applied