Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7939fef4 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: Always setup the display list 



Make sure display list usage is correctly disabled by always setting up
the corresponding registers, including when the display list feature
isn't used.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent aa380ea0

drivers/media/platform/vsp1/vsp1_dl.c

+3 −4
Original line number Diff line number Diff line
@@ -243,15 +243,14 @@ void vsp1_dl_irq_frame_end(struct vsp1_dl *dl) 


void vsp1_dl_setup(struct vsp1_device *vsp1)

{

	u32 ctrl = (256 << VI6_DL_CTRL_AR_WAIT_SHIFT)

		 | VI6_DL_CTRL_DC2 | VI6_DL_CTRL_DC1 | VI6_DL_CTRL_DC0

		 | VI6_DL_CTRL_DLE;

	u32 ctrl = (256 << VI6_DL_CTRL_AR_WAIT_SHIFT);



	/* The DRM pipeline operates with header-less display lists in

	 * Continuous Frame Mode.

	 */

	if (vsp1->drm)

		ctrl |= VI6_DL_CTRL_CFM0 | VI6_DL_CTRL_NH0;

		ctrl |= VI6_DL_CTRL_DC2 | VI6_DL_CTRL_DC1 | VI6_DL_CTRL_DC0

		     |  VI6_DL_CTRL_DLE | VI6_DL_CTRL_CFM0 | VI6_DL_CTRL_NH0;



	vsp1_write(vsp1, VI6_DL_CTRL, ctrl);

	vsp1_write(vsp1, VI6_DL_SWAP, VI6_DL_SWAP_LWS);

drivers/media/platform/vsp1/vsp1_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -462,7 +462,6 @@ static int vsp1_device_init(struct vsp1_device *vsp1) 
	vsp1_write(vsp1, VI6_DPR_HGT_SMPPT, (7 << VI6_DPR_SMPPT_TGW_SHIFT) |

		   (VI6_DPR_NODE_UNUSED << VI6_DPR_SMPPT_PT_SHIFT));



	if (!vsp1->info->uapi)

	vsp1_dl_setup(vsp1);



	return 0;