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

Commit 2ca72570 authored by Kieran Bingham's avatar Kieran Bingham Committed by Mauro Carvalho Chehab
Browse files

media: vsp1: Rename dl_child to dl_next 



Both vsp1_dl_list_commit() and __vsp1_dl_list_put() walk the display
list chain referencing the nodes as children, when in reality they are
siblings.

Update the terminology to 'dl_next' to be consistent with the
vsp1_video_pipeline_run() usage.

Signed-off-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 3e737e39

drivers/media/platform/vsp1/vsp1_dl.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -399,7 +399,7 @@ struct vsp1_dl_list *vsp1_dl_list_get(struct vsp1_dl_manager *dlm) 
/* This function must be called with the display list manager lock held.*/

/* This function must be called with the display list manager lock held.*/

static void __vsp1_dl_list_put(struct vsp1_dl_list *dl)

static void __vsp1_dl_list_put(struct vsp1_dl_list *dl)

{

{

	struct vsp1_dl_list *dl_child;

	struct vsp1_dl_list *dl_next;





	if (!dl)

	if (!dl)

		return;

		return;
@@ -409,8 +409,8 @@ static void __vsp1_dl_list_put(struct vsp1_dl_list *dl) 
	 * hardware operation.

	 * hardware operation.

	 */

	 */

	if (dl->has_chain) {

	if (dl->has_chain) {

		list_for_each_entry(dl_child, &dl->chain, chain)

		list_for_each_entry(dl_next, &dl->chain, chain)

			__vsp1_dl_list_put(dl_child);

			__vsp1_dl_list_put(dl_next);

	}

	}





	dl->has_chain = false;

	dl->has_chain = false;
@@ -674,17 +674,17 @@ static void vsp1_dl_list_commit_singleshot(struct vsp1_dl_list *dl) 
void vsp1_dl_list_commit(struct vsp1_dl_list *dl, bool internal)

void vsp1_dl_list_commit(struct vsp1_dl_list *dl, bool internal)

{

{

	struct vsp1_dl_manager *dlm = dl->dlm;

	struct vsp1_dl_manager *dlm = dl->dlm;

	struct vsp1_dl_list *dl_child;

	struct vsp1_dl_list *dl_next;

	unsigned long flags;

	unsigned long flags;





	if (dlm->mode == VSP1_DL_MODE_HEADER) {

	if (dlm->mode == VSP1_DL_MODE_HEADER) {

		/* Fill the header for the head and chained display lists. */

		/* Fill the header for the head and chained display lists. */

		vsp1_dl_list_fill_header(dl, list_empty(&dl->chain));

		vsp1_dl_list_fill_header(dl, list_empty(&dl->chain));





		list_for_each_entry(dl_child, &dl->chain, chain) {

		list_for_each_entry(dl_next, &dl->chain, chain) {

			bool last = list_is_last(&dl_child->chain, &dl->chain);

			bool last = list_is_last(&dl_next->chain, &dl->chain);





			vsp1_dl_list_fill_header(dl_child, last);

			vsp1_dl_list_fill_header(dl_next, last);

		}

		}

	}

	}