[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 1d4a000289979cc7f2887c8407b1bfe2a0918354
WARNING: Author mismatch between patch and upstream commit:
Backport author: Stanislaw Gruszka <stanislaw.gruszka@xxxxxxxxxxxxxxx>
Commit author: Bingbu Cao <bingbu.cao@xxxxxxxxx>
Status in newer kernel trees:
6.12.y | Not found
Note: The patch differs from the upstream commit:
---
1: 1d4a000289979 ! 1: b5698951cc16d media: ipu6: use the IPU6 DMA mapping APIs to do mapping
@@ Metadata
## Commit message ##
media: ipu6: use the IPU6 DMA mapping APIs to do mapping
+ commit 1d4a000289979cc7f2887c8407b1bfe2a0918354 upstream.
+
dma_ops is removed from the IPU6 auxiliary device, ISYS driver
should use the IPU6 DMA mapping APIs directly instead of depending
on the device callbacks.
@@ Commit message
[Sakari Ailus: Rebased on recent videobuf2 wait changes.]
Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
+ Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@xxxxxxxxxxxxxxx>
## drivers/media/pci/intel/ipu6/Kconfig ##
@@ drivers/media/pci/intel/ipu6/Kconfig: config VIDEO_INTEL_IPU6
@@ drivers/media/pci/intel/ipu6/ipu6-isys-queue.c: void ipu6_isys_queue_buf_ready(s
static const struct vb2_ops ipu6_isys_queue_ops = {
- .queue_setup = queue_setup,
+ .queue_setup = ipu6_isys_queue_setup,
-+ .wait_prepare = vb2_ops_wait_prepare,
-+ .wait_finish = vb2_ops_wait_finish,
+ .wait_prepare = vb2_ops_wait_prepare,
+ .wait_finish = vb2_ops_wait_finish,
+ .buf_init = ipu6_isys_buf_init,
.buf_prepare = ipu6_isys_buf_prepare,
+ .buf_cleanup = ipu6_isys_buf_cleanup,
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.12.y | Success | Success |
