Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'media/v6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
"Three driver fixes"
* tag 'media/v6.5-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: imx: imx7-media-csi: Fix applying format constraints
media: uvcvideo: Fix menu count handling for userspace XU mappings
media: mtk-jpeg: Set platform driver data earlier
+8
-5
+2
-2
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+2
-2
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
···
1310
1310
jpeg->dev = &pdev->dev;
1311
1311
jpeg->variant = of_device_get_match_data(jpeg->dev);
1312
1312
1313
+
platform_set_drvdata(pdev, jpeg);
1314
+
1313
1315
ret = devm_of_platform_populate(&pdev->dev);
1314
1316
if (ret) {
1315
1317
v4l2_err(&jpeg->v4l2_dev, "Master of platform populate failed.");
···
1382
1380
"%s device registered as /dev/video%d (%d,%d)\n",
1383
1381
jpeg->variant->dev_name, jpeg->vdev->num,
1384
1382
VIDEO_MAJOR, jpeg->vdev->minor);
1385
-
1386
-
platform_set_drvdata(pdev, jpeg);
1387
1383
1388
1384
pm_runtime_enable(&pdev->dev);
1389
1385
+5
-2
drivers/media/platform/nxp/imx7-media-csi.c
+5
-2
drivers/media/platform/nxp/imx7-media-csi.c
···
9
9
#include <linux/clk.h>
10
10
#include <linux/delay.h>
11
11
#include <linux/interrupt.h>
12
+
#include <linux/math.h>
12
13
#include <linux/mfd/syscon.h>
14
+
#include <linux/minmax.h>
13
15
#include <linux/module.h>
14
16
#include <linux/of_device.h>
15
17
#include <linux/of_graph.h>
···
1139
1137
* TODO: Implement configurable stride support.
1140
1138
*/
1141
1139
walign = 8 * 8 / cc->bpp;
1142
-
v4l_bound_align_image(&pixfmt->width, 1, 0xffff, walign,
1143
-
&pixfmt->height, 1, 0xffff, 1, 0);
1140
+
pixfmt->width = clamp(round_up(pixfmt->width, walign), walign,
1141
+
round_down(65535U, walign));
1142
+
pixfmt->height = clamp(pixfmt->height, 1U, 65535U);
1144
1143
1145
1144
pixfmt->bytesperline = pixfmt->width * cc->bpp / 8;
1146
1145
pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height;
+1
-1
drivers/media/usb/uvc/uvc_v4l2.c
+1
-1
drivers/media/usb/uvc/uvc_v4l2.c