Commit b36c6049 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

media: vsp1: Add vsp1_dl_list argument to .configure_stream() operation 



The WPF needs access to the current display list to configure writeback.
Add a display list pointer to the VSP1 entity .configure_stream()
operation.

Only display pipelines can make use of the display list there as
mem-to-mem pipelines don't have access to a display list at stream
configuration time. This is not an issue as writeback is only used for
display pipelines.

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

drivers/media/platform/vsp1/vsp1_brx.c

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ static const struct v4l2_subdev_ops brx_ops = { 


static void brx_configure_stream(struct vsp1_entity *entity,

				 struct vsp1_pipeline *pipe,

				 struct vsp1_dl_list *dl,

				 struct vsp1_dl_body *dlb)

{

	struct vsp1_brx *brx = to_brx(&entity->subdev);

drivers/media/platform/vsp1/vsp1_clu.c

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ static const struct v4l2_subdev_ops clu_ops = { 


static void clu_configure_stream(struct vsp1_entity *entity,

				 struct vsp1_pipeline *pipe,

				 struct vsp1_dl_list *dl,

				 struct vsp1_dl_body *dlb)

{

	struct vsp1_clu *clu = to_clu(&entity->subdev);

drivers/media/platform/vsp1/vsp1_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static void vsp1_du_pipeline_configure(struct vsp1_pipeline *pipe) 
		}



		vsp1_entity_route_setup(entity, pipe, dlb);

		vsp1_entity_configure_stream(entity, pipe, dlb);

		vsp1_entity_configure_stream(entity, pipe, dl, dlb);

		vsp1_entity_configure_frame(entity, pipe, dl, dlb);

		vsp1_entity_configure_partition(entity, pipe, dl, dlb);

	}

drivers/media/platform/vsp1/vsp1_entity.c

+2 −1
Original line number Diff line number Diff line
@@ -71,10 +71,11 @@ void vsp1_entity_route_setup(struct vsp1_entity *entity, 


void vsp1_entity_configure_stream(struct vsp1_entity *entity,

				  struct vsp1_pipeline *pipe,

				  struct vsp1_dl_list *dl,

				  struct vsp1_dl_body *dlb)

{

	if (entity->ops->configure_stream)

		entity->ops->configure_stream(entity, pipe, dlb);

		entity->ops->configure_stream(entity, pipe, dl, dlb);

}



void vsp1_entity_configure_frame(struct vsp1_entity *entity,

drivers/media/platform/vsp1/vsp1_entity.h

+5 −2
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ struct vsp1_route { 
 * struct vsp1_entity_operations - Entity operations

 * @destroy:	Destroy the entity.

 * @configure_stream:	Setup the hardware parameters for the stream which do

 *			not vary between frames (pipeline, formats).

 *			not vary between frames (pipeline, formats). Note that

 *			the vsp1_dl_list argument is only valid for display

 *			pipeline and will be NULL for mem-to-mem pipelines.

 * @configure_frame:	Configure the runtime parameters for each frame.

 * @configure_partition: Configure partition specific parameters.

 * @max_width:	Return the max supported width of data that the entity can
@@ -78,7 +80,7 @@ struct vsp1_route { 
struct vsp1_entity_operations {

	void (*destroy)(struct vsp1_entity *);

	void (*configure_stream)(struct vsp1_entity *, struct vsp1_pipeline *,

				 struct vsp1_dl_body *);

				 struct vsp1_dl_list *, struct vsp1_dl_body *);

	void (*configure_frame)(struct vsp1_entity *, struct vsp1_pipeline *,

				struct vsp1_dl_list *, struct vsp1_dl_body *);

	void (*configure_partition)(struct vsp1_entity *,
@@ -155,6 +157,7 @@ void vsp1_entity_route_setup(struct vsp1_entity *entity, 


void vsp1_entity_configure_stream(struct vsp1_entity *entity,

				  struct vsp1_pipeline *pipe,

				  struct vsp1_dl_list *dl,

				  struct vsp1_dl_body *dlb);



void vsp1_entity_configure_frame(struct vsp1_entity *entity,

CRA Git | Maintained and supported by SUSTech CRA and CCSE