tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'media/v6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:

- fix some unused-variable warning in mtk-mdp3

- ignore unused suspend operations in nxp

- some driver fixes in rcar-vin

* tag 'media/v6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: platform: mtk-mdp3: work around unused-variable warning
media: nxp: ignore unused suspend operations
media: rcar-vin: Select correct interrupt mode for V4L2_FIELD_ALTERNATE
media: rcar-vin: Fix NV12 size alignment
media: rcar-vin: Gen3 can not scale NV12

Linus Torvalds 691e1eee 80e62bc8

+19 -11
+1 -2
drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
··· 1035 1035 { 1036 1036 struct device *dev = &mdp->pdev->dev; 1037 1037 struct device_node *node, *parent; 1038 - const struct mtk_mdp_driver_data *data = mdp->mdp_data; 1039 1038 1040 1039 parent = dev->of_node->parent; 1041 1040 ··· 1044 1045 int id, alias_id; 1045 1046 struct mdp_comp *comp; 1046 1047 1047 - of_id = of_match_node(data->mdp_sub_comp_dt_ids, node); 1048 + of_id = of_match_node(mdp->mdp_data->mdp_sub_comp_dt_ids, node); 1048 1049 if (!of_id) 1049 1050 continue; 1050 1051 if (!of_device_is_available(node)) {
+3 -3
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
··· 378 378 } 379 379 380 380 static const struct dev_pm_ops mxc_isi_pm_ops = { 381 - SET_SYSTEM_SLEEP_PM_OPS(mxc_isi_pm_suspend, mxc_isi_pm_resume) 382 - SET_RUNTIME_PM_OPS(mxc_isi_runtime_suspend, mxc_isi_runtime_resume, NULL) 381 + SYSTEM_SLEEP_PM_OPS(mxc_isi_pm_suspend, mxc_isi_pm_resume) 382 + RUNTIME_PM_OPS(mxc_isi_runtime_suspend, mxc_isi_runtime_resume, NULL) 383 383 }; 384 384 385 385 /* ----------------------------------------------------------------------------- ··· 528 528 .driver = { 529 529 .of_match_table = mxc_isi_of_match, 530 530 .name = MXC_ISI_DRIVER_NAME, 531 - .pm = &mxc_isi_pm_ops, 531 + .pm = pm_ptr(&mxc_isi_pm_ops), 532 532 } 533 533 }; 534 534 module_platform_driver(mxc_isi_driver);
+15 -6
drivers/media/platform/renesas/rcar-vin/rcar-dma.c
··· 728 728 case V4L2_FIELD_SEQ_TB: 729 729 case V4L2_FIELD_SEQ_BT: 730 730 case V4L2_FIELD_NONE: 731 - vnmc = VNMC_IM_ODD_EVEN; 732 - progressive = true; 733 - break; 734 731 case V4L2_FIELD_ALTERNATE: 735 732 vnmc = VNMC_IM_ODD_EVEN; 733 + progressive = true; 736 734 break; 737 735 default: 738 736 vnmc = VNMC_IM_ODD; ··· 1310 1312 } 1311 1313 1312 1314 if (rvin_scaler_needed(vin)) { 1315 + /* Gen3 can't scale NV12 */ 1316 + if (vin->info->model == RCAR_GEN3 && 1317 + vin->format.pixelformat == V4L2_PIX_FMT_NV12) 1318 + return -EPIPE; 1319 + 1313 1320 if (!vin->scaler) 1314 1321 return -EPIPE; 1315 1322 } else { 1316 - if (fmt.format.width != vin->format.width || 1317 - fmt.format.height != vin->format.height) 1318 - return -EPIPE; 1323 + if (vin->format.pixelformat == V4L2_PIX_FMT_NV12) { 1324 + if (ALIGN(fmt.format.width, 32) != vin->format.width || 1325 + ALIGN(fmt.format.height, 32) != vin->format.height) 1326 + return -EPIPE; 1327 + } else { 1328 + if (fmt.format.width != vin->format.width || 1329 + fmt.format.height != vin->format.height) 1330 + return -EPIPE; 1331 + } 1319 1332 } 1320 1333 1321 1334 if (fmt.format.code != vin->mbus_code)