Commit 8ddf3784 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: Replace .set_memory() with VSP1_ENTITY_PARAMS_PARTITION 



The new VSP1_ENTITY_PARAMS_PARTITION configuration parameters type
covers all registers that need to be configured for every partition.
This prepares for support of image partitioning, and replaces the
.set_memory() operation as the memory registers take different values
for every partition.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent d21fbbb4

drivers/media/platform/vsp1/vsp1_clu.c

+3 −0
Original line number Diff line number Diff line
@@ -237,6 +237,9 @@ static void clu_configure(struct vsp1_entity *entity, 
		break;

	}



	case VSP1_ENTITY_PARAMS_PARTITION:

		break;



	case VSP1_ENTITY_PARAMS_RUNTIME:

		/* 2D mode can only be used with the YCbCr pixel encoding. */

		if (clu->mode == V4L2_CID_VSP1_CLU_MODE_2D && clu->yuv_mode)

drivers/media/platform/vsp1/vsp1_drm.c

+2 −7
Original line number Diff line number Diff line
@@ -496,14 +496,9 @@ void vsp1_du_atomic_flush(struct device *dev) 
					       VSP1_ENTITY_PARAMS_INIT);

			entity->ops->configure(entity, pipe, pipe->dl,

					       VSP1_ENTITY_PARAMS_RUNTIME);

			entity->ops->configure(entity, pipe, pipe->dl,

					       VSP1_ENTITY_PARAMS_PARTITION);

		}



		/* The memory buffer address must be applied after configuring

		 * the RPF to make sure the crop offset are computed.

		 */

		if (entity->type == VSP1_ENTITY_RPF)

			vsp1_rwpf_set_memory(to_rwpf(&entity->subdev),

					     pipe->dl);

	}



	vsp1_dl_list_commit(pipe->dl);

drivers/media/platform/vsp1/vsp1_entity.h

+2 −4
Original line number Diff line number Diff line
@@ -38,10 +38,12 @@ enum vsp1_entity_type { 
/*

 * enum vsp1_entity_params - Entity configuration parameters class

 * @VSP1_ENTITY_PARAMS_INIT - Initial parameters

 * @VSP1_ENTITY_PARAMS_PARTITION - Per-image partition parameters

 * @VSP1_ENTITY_PARAMS_RUNTIME - Runtime-configurable parameters

 */

enum vsp1_entity_params {

	VSP1_ENTITY_PARAMS_INIT,

	VSP1_ENTITY_PARAMS_PARTITION,

	VSP1_ENTITY_PARAMS_RUNTIME,

};
@@ -73,15 +75,11 @@ struct vsp1_route { 
/**

 * struct vsp1_entity_operations - Entity operations

 * @destroy:	Destroy the entity.

 * @set_memory:	Setup memory buffer access. This operation applies the settings

 *		stored in the rwpf mem field to the display list. Valid for RPF

 *		and WPF only.

 * @configure:	Setup the hardware based on the entity state (pipeline, formats,

 *		selection rectangles, ...)

 */

struct vsp1_entity_operations {

	void (*destroy)(struct vsp1_entity *);

	void (*set_memory)(struct vsp1_entity *, struct vsp1_dl_list *dl);

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

			  struct vsp1_dl_list *, enum vsp1_entity_params);

};

drivers/media/platform/vsp1/vsp1_lut.c

+3 −0
Original line number Diff line number Diff line
@@ -202,6 +202,9 @@ static void lut_configure(struct vsp1_entity *entity, 
		vsp1_lut_write(lut, dl, VI6_LUT_CTRL, VI6_LUT_CTRL_EN);

		break;



	case VSP1_ENTITY_PARAMS_PARTITION:

		break;



	case VSP1_ENTITY_PARAMS_RUNTIME:

		spin_lock_irqsave(&lut->lock, flags);

		dlb = lut->lut;

drivers/media/platform/vsp1/vsp1_rpf.c

+40 −38
Original line number Diff line number Diff line
@@ -46,18 +46,6 @@ static const struct v4l2_subdev_ops rpf_ops = { 
 * VSP1 Entity Operations

 */



static void rpf_set_memory(struct vsp1_entity *entity, struct vsp1_dl_list *dl)

{

	struct vsp1_rwpf *rpf = entity_to_rwpf(entity);



	vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_Y,

		       rpf->mem.addr[0] + rpf->offsets[0]);

	vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_C0,

		       rpf->mem.addr[1] + rpf->offsets[1]);

	vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_C1,

		       rpf->mem.addr[2] + rpf->offsets[1]);

}



static void rpf_configure(struct vsp1_entity *entity,

			  struct vsp1_pipeline *pipe,

			  struct vsp1_dl_list *dl,
@@ -68,7 +56,6 @@ static void rpf_configure(struct vsp1_entity *entity, 
	const struct v4l2_pix_format_mplane *format = &rpf->format;

	const struct v4l2_mbus_framefmt *source_format;

	const struct v4l2_mbus_framefmt *sink_format;

	const struct v4l2_rect *crop;

	unsigned int left = 0;

	unsigned int top = 0;

	u32 pstride;
@@ -84,11 +71,16 @@ static void rpf_configure(struct vsp1_entity *entity, 
		return;

	}



	/* Source size, stride and crop offsets.

	if (params == VSP1_ENTITY_PARAMS_PARTITION) {

		const struct v4l2_rect *crop;

		unsigned int offsets[2];



		/* Source size and crop offsets.

		 *

	 * The crop offsets correspond to the location of the crop rectangle top

	 * left corner in the plane buffer. Only two offsets are needed, as

	 * planes 2 and 3 always have identical strides.

		 * The crop offsets correspond to the location of the crop

		 * rectangle top left corner in the plane buffer. Only two

		 * offsets are needed, as planes 2 and 3 always have identical

		 * strides.

		 */

		crop = vsp1_rwpf_get_crop(rpf, rpf->entity.config);
@@ -99,20 +91,31 @@ static void rpf_configure(struct vsp1_entity *entity, 
			       (crop->width << VI6_RPF_SRC_ESIZE_EHSIZE_SHIFT) |

			       (crop->height << VI6_RPF_SRC_ESIZE_EVSIZE_SHIFT));



	rpf->offsets[0] = crop->top * format->plane_fmt[0].bytesperline

		offsets[0] = crop->top * format->plane_fmt[0].bytesperline

			   + crop->left * fmtinfo->bpp[0] / 8;



		if (format->num_planes > 1)

			offsets[1] = crop->top * format->plane_fmt[1].bytesperline

				   + crop->left / fmtinfo->hsub

				   * fmtinfo->bpp[1] / 8;

		else

			offsets[1] = 0;



		vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_Y,

			       rpf->mem.addr[0] + offsets[0]);

		vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_C0,

			       rpf->mem.addr[1] + offsets[1]);

		vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_C1,

			       rpf->mem.addr[2] + offsets[1]);

		return;

	}



	/* Stride */

	pstride = format->plane_fmt[0].bytesperline

		<< VI6_RPF_SRCM_PSTRIDE_Y_SHIFT;



	if (format->num_planes > 1) {

		rpf->offsets[1] = crop->top * format->plane_fmt[1].bytesperline

				+ crop->left / fmtinfo->hsub * fmtinfo->bpp[1]

				/ 8;

	if (format->num_planes > 1)

		pstride |= format->plane_fmt[1].bytesperline

			<< VI6_RPF_SRCM_PSTRIDE_C_SHIFT;

	} else {

		rpf->offsets[1] = 0;

	}



	vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_PSTRIDE, pstride);
@@ -217,7 +220,6 @@ static void rpf_configure(struct vsp1_entity *entity, 
}



static const struct vsp1_entity_operations rpf_entity_ops = {

	.set_memory = rpf_set_memory,

	.configure = rpf_configure,

};