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

Commit 20fab5e0 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: clu: Support runtime modification of controls 



Allow reconfiguration of the look-up table and processing mode at
runtime.

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

drivers/media/platform/vsp1/vsp1_clu.c

+26 −15
Original line number Diff line number Diff line
@@ -55,7 +55,9 @@ static int clu_set_table(struct vsp1_clu *clu, struct v4l2_ctrl *ctrl) 
	for (i = 0; i < 17 * 17 * 17; ++i)

		vsp1_dl_fragment_write(dlb, VI6_CLU_DATA, ctrl->p_new.p_u32[i]);



	spin_lock_irq(&clu->lock);

	swap(clu->clu, dlb);

	spin_unlock_irq(&clu->lock);



	vsp1_dl_fragment_free(dlb);

	return 0;
@@ -208,32 +210,39 @@ static void clu_configure(struct vsp1_entity *entity, 
			  struct vsp1_dl_list *dl, bool full)

{

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

	struct v4l2_mbus_framefmt *format;

	struct vsp1_dl_body *dlb;

	unsigned long flags;

	u32 ctrl = VI6_CLU_CTRL_AAI | VI6_CLU_CTRL_MVS | VI6_CLU_CTRL_EN;



	if (!full)

		return;

	/* The format can't be changed during streaming, only verify it at

	 * stream start and store the information internally for future partial

	 * reconfiguration calls.

	 */

	if (full) {

		struct v4l2_mbus_framefmt *format;



	format = vsp1_entity_get_pad_format(&clu->entity, clu->entity.config,

		format = vsp1_entity_get_pad_format(&clu->entity,

						    clu->entity.config,

						    CLU_PAD_SINK);



	mutex_lock(clu->ctrls.lock);

		clu->yuv_mode = format->code == MEDIA_BUS_FMT_AYUV8_1X32;

		return;

	}



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

	if (clu->mode == V4L2_CID_VSP1_CLU_MODE_2D &&

	    format->code == MEDIA_BUS_FMT_AYUV8_1X32)

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

		ctrl |= VI6_CLU_CTRL_AX1I_2D | VI6_CLU_CTRL_AX2I_2D

		     |  VI6_CLU_CTRL_OS0_2D | VI6_CLU_CTRL_OS1_2D

		     |  VI6_CLU_CTRL_OS2_2D | VI6_CLU_CTRL_M2D;



	if (clu->clu) {

		vsp1_dl_list_add_fragment(dl, clu->clu);

		clu->clu = NULL;

	}

	vsp1_clu_write(clu, dl, VI6_CLU_CTRL, ctrl);



	mutex_unlock(clu->ctrls.lock);

	spin_lock_irqsave(&clu->lock, flags);

	dlb = clu->clu;

	clu->clu = NULL;

	spin_unlock_irqrestore(&clu->lock, flags);



	vsp1_clu_write(clu, dl, VI6_CLU_CTRL, ctrl);

	if (dlb)

		vsp1_dl_list_add_fragment(dl, dlb);

}



static const struct vsp1_entity_operations clu_entity_ops = {
@@ -253,6 +262,8 @@ struct vsp1_clu *vsp1_clu_create(struct vsp1_device *vsp1) 
	if (clu == NULL)

		return ERR_PTR(-ENOMEM);



	spin_lock_init(&clu->lock);



	clu->entity.ops = &clu_entity_ops;

	clu->entity.type = VSP1_ENTITY_CLU;

drivers/media/platform/vsp1/vsp1_clu.h

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#ifndef __VSP1_CLU_H__

#define __VSP1_CLU_H__



#include <linux/spinlock.h>



#include <media/media-entity.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-subdev.h>
@@ -30,6 +32,8 @@ struct vsp1_clu { 


	struct v4l2_ctrl_handler ctrls;



	bool yuv_mode;

	spinlock_t lock;

	unsigned int mode;

	struct vsp1_dl_body *clu;

};