[PATCH] fixup! video: Rockchip: Add VOP2 driver

[PATCH] fixup! video: Rockchip: Add VOP2 driver

[Ahmad Fatoum]

video: Rockchip: add missing dma_alloc_coherent a device parameter

dma_alloc_coherent was recently changed to take a device parameter like
in Linux.

The VOP2 driver went upstream during the same time and is missing the
fixup.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
This should be squashed either into the DMA branch or the VOP2 branch,
whichever comes first.
---
 drivers/video/rockchip/rockchip_drm_vop2.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/video/rockchip/rockchip_drm_vop2.c b/drivers/video/rockchip/rockchip_drm_vop2.c
index 3ab6fe97e0b0..3a1c951ec7e4 100644
--- a/drivers/video/rockchip/rockchip_drm_vop2.c
+++ b/drivers/video/rockchip/rockchip_drm_vop2.c
@@ -1634,8 +1634,9 @@ static int vop2_register_plane(struct vop2_video_port *vp, struct vop2_win *win)
 	win->dst.y2 = info->yres;
 
 	info->line_length = vp->line_length;
-	info->screen_base = dma_alloc_writecombine(vp->line_length * vp->max_yres,
-							&win->dma);
+	info->screen_base = dma_alloc_writecombine(DMA_DEVICE_BROKEN,
+						   vp->line_length * vp->max_yres,
+						   &win->dma);
 	if (!info->screen_base)
 		return -ENOMEM;
 
-- 
2.39.5

Re: [PATCH] fixup! video: Rockchip: Add VOP2 driver

[Sascha Hauer]

On Tue, 22 Oct 2024 10:34:50 +0200, Ahmad Fatoum wrote:
> video: Rockchip: add missing dma_alloc_coherent a device parameter
> 
> dma_alloc_coherent was recently changed to take a device parameter like
> in Linux.
> 
> The VOP2 driver went upstream during the same time and is missing the
> fixup.
> 
> [...]

Applied, thanks!

[1/1] fixup! video: Rockchip: Add VOP2 driver
      https://git.pengutronix.de/cgit/barebox/commit/?id=c3ed9b182dd4 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>