Skip to contentSkip to conversation

media fixes

GIT PULL Merged Mauro Carvalho Chehab 3 participants 3 messages Nov 25, 2020 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

Hi Linus,

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

For:
- a rand Kconfig fixup for mtk-vcodec;
- a fix at h264 handling at cedrus codec driver;
- some warning fixes when config PM is not enabled at marvell-ccic;
- two fixes at venus codec driver: one related to codec profile and the other one related to a bad error path which causes an OOPS on module re-bind.

Regards,
Mauro

The following changes since commit 3cea11cd5e3b00d91caf0b4730194039b45c5891:

Linux 5.10-rc2 (2020-11-01 14:43:51 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v5.10-2

for you to fetch changes up to 9215f6bb4705ffe205885411394732bfc439dee0:

media: venus: pm_helpers: Fix kernel module reload (2020-11-16 19:06:10 +0100)

----------------------------------------------------------------
media fixes for v5.10-rc6

----------------------------------------------------------------
Alexandre Courbot (2):
media: mtk-vcodec: move firmware implementations into their own files
media: mtk-vcodec: fix build breakage when one of VPU or SCP is enabled

Jernej Skrabec (1):
media: cedrus: h264: Fix check for presence of scaling matrix

Randy Dunlap (1):
media: media/platform/marvell-ccic: fix warnings when CONFIG_PM is not enabled

Stanimir Varbanov (2):
media: venus: venc: Fix setting of profile and level
media: venus: pm_helpers: Fix kernel module reload

 drivers/media/platform/Kconfig                     |  28 +++-
 drivers/media/platform/marvell-ccic/mmp-driver.c   |   2 +
 drivers/media/platform/mtk-vcodec/Makefile         |  10 +-
 .../media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c |   2 +-
 .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c |   2 +-
 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c  | 174 +--------------------
 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h  |   7 +-
 .../media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h |  52 ++++++
 .../media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c  |  73 +++++++++
 .../media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c  | 110 +++++++++++++
 drivers/media/platform/qcom/venus/core.h           |  15 +-
 drivers/media/platform/qcom/venus/pm_helpers.c     |   4 +-
 drivers/media/platform/qcom/venus/venc.c           |  31 +++-
 drivers/media/platform/qcom/venus/venc_ctrls.c     |  14 +-
 drivers/staging/media/sunxi/cedrus/cedrus_h264.c   |   2 +-
 15 files changed, 338 insertions(+), 188 deletions(-)
 create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h
 create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
 create mode 100644 drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c
#1 lore raw

Re: [GIT PULL for v5.10-rc6] media fixes (#69337)

From: [email protected]

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

gpg: Signature made Wed 25 Nov 2020 08:00:03 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/0003-media-media-platform-marvell-ccic-fix-warnings-when-.patch doesn't apply:
Applying patch patches/0003-media-media-platform-marvell-ccic-fix-warnings-when-.patch patching file drivers/media/platform/marvell-ccic/mmp-driver.c
Hunk #1 FAILED at 307.
1 out of 2 hunks FAILED -- rejects in file drivers/media/platform/marvell-ccic/mmp-driver.c Patch patches/0003-media-media-platform-marvell-ccic-fix-warnings-when-.patch does not apply (enforce with -f)

merge bot Merged
#2 lore raw
In reply to Mauro Carvalho Chehab
The pull request you sent on Wed, 25 Nov 2020 09:07:58 +0100:

The pull request you sent on Wed, 25 Nov 2020 09:07:58 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v5.10-2

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

Thank you!

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