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

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

media: v4l: vsp1: Rename BRU to BRx 



Some VSP instances have two blending units named BRU (Blend/ROP Unit)
and BRS (Blend/ROP Sub unit). The BRS is a smaller version of the BRU
with only two inputs, but otherwise offers similar features and offers
the same register interface. The BRU and BRS can be used exchangeably in
VSP pipelines (provided no more than two inputs are needed).

Due to historical reasons, the VSP1 driver implements support for both
the BRU and BRS through objects named vsp1_bru. The code uses the name
BRU to refer to either the BRU or the BRS, except in a few places where
noted explicitly. This creates confusion.

In an effort to avoid confusion, rename the vsp1_bru object and the
corresponding API to vsp1_brx, and use BRx to refer to blend unit
instances regardless of their type. The names BRU and BRS are retained
where reference to a particular blend unit type is needed, as well as in
hardware registers to stay close to the datasheet.

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

drivers/media/platform/vsp1/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ vsp1-y := vsp1_drv.o vsp1_entity.o vsp1_pipe.o 
vsp1-y					+= vsp1_dl.o vsp1_drm.o vsp1_video.o

vsp1-y					+= vsp1_rpf.o vsp1_rwpf.o vsp1_wpf.o

vsp1-y					+= vsp1_clu.o vsp1_hsit.o vsp1_lut.o

vsp1-y					+= vsp1_bru.o vsp1_sru.o vsp1_uds.o

vsp1-y					+= vsp1_brx.o vsp1_sru.o vsp1_uds.o

vsp1-y					+= vsp1_hgo.o vsp1_hgt.o vsp1_histo.o

vsp1-y					+= vsp1_lif.o

drivers/media/platform/vsp1/vsp1.h

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct rcar_fcp_device; 
struct vsp1_drm;

struct vsp1_entity;

struct vsp1_platform_data;

struct vsp1_bru;

struct vsp1_brx;

struct vsp1_clu;

struct vsp1_hgo;

struct vsp1_hgt;
@@ -78,8 +78,8 @@ struct vsp1_device { 
	struct rcar_fcp_device *fcp;

	struct device *bus_master;



	struct vsp1_bru *brs;

	struct vsp1_bru *bru;

	struct vsp1_brx *brs;

	struct vsp1_brx *bru;

	struct vsp1_clu *clu;

	struct vsp1_hgo *hgo;

	struct vsp1_hgt *hgt;

drivers/media/platform/vsp1/vsp1_bru.c→drivers/media/platform/vsp1/vsp1_brx.c

+101 −101
Original line number Diff line number Diff line 
/*

 * vsp1_bru.c  --  R-Car VSP1 Blend ROP Unit

 * vsp1_brx.c  --  R-Car VSP1 Blend ROP Unit (BRU and BRS)

 *

 * Copyright (C) 2013 Renesas Corporation

 *
@@ -17,45 +17,45 @@ 
#include <media/v4l2-subdev.h>



#include "vsp1.h"

#include "vsp1_bru.h"

#include "vsp1_brx.h"

#include "vsp1_dl.h"

#include "vsp1_pipe.h"

#include "vsp1_rwpf.h"

#include "vsp1_video.h"



#define BRU_MIN_SIZE				1U

#define BRU_MAX_SIZE				8190U

#define BRX_MIN_SIZE				1U

#define BRX_MAX_SIZE				8190U



/* -----------------------------------------------------------------------------

 * Device Access

 */



static inline void vsp1_bru_write(struct vsp1_bru *bru, struct vsp1_dl_list *dl,

static inline void vsp1_brx_write(struct vsp1_brx *brx, struct vsp1_dl_list *dl,

				  u32 reg, u32 data)

{

	vsp1_dl_list_write(dl, bru->base + reg, data);

	vsp1_dl_list_write(dl, brx->base + reg, data);

}



/* -----------------------------------------------------------------------------

 * Controls

 */



static int bru_s_ctrl(struct v4l2_ctrl *ctrl)

static int brx_s_ctrl(struct v4l2_ctrl *ctrl)

{

	struct vsp1_bru *bru =

		container_of(ctrl->handler, struct vsp1_bru, ctrls);

	struct vsp1_brx *brx =

		container_of(ctrl->handler, struct vsp1_brx, ctrls);



	switch (ctrl->id) {

	case V4L2_CID_BG_COLOR:

		bru->bgcolor = ctrl->val;

		brx->bgcolor = ctrl->val;

		break;

	}



	return 0;

}



static const struct v4l2_ctrl_ops bru_ctrl_ops = {

	.s_ctrl = bru_s_ctrl,

static const struct v4l2_ctrl_ops brx_ctrl_ops = {

	.s_ctrl = brx_s_ctrl,

};



/* -----------------------------------------------------------------------------
@@ -63,12 +63,12 @@ static const struct v4l2_ctrl_ops bru_ctrl_ops = { 
 */



/*

 * The BRU can't perform format conversion, all sink and source formats must be

 * The BRx can't perform format conversion, all sink and source formats must be

 * identical. We pick the format on the first sink pad (pad 0) and propagate it

 * to all other pads.

 */



static int bru_enum_mbus_code(struct v4l2_subdev *subdev,

static int brx_enum_mbus_code(struct v4l2_subdev *subdev,

			      struct v4l2_subdev_pad_config *cfg,

			      struct v4l2_subdev_mbus_code_enum *code)

{
@@ -81,7 +81,7 @@ static int bru_enum_mbus_code(struct v4l2_subdev *subdev, 
					  ARRAY_SIZE(codes));

}



static int bru_enum_frame_size(struct v4l2_subdev *subdev,

static int brx_enum_frame_size(struct v4l2_subdev *subdev,

			       struct v4l2_subdev_pad_config *cfg,

			       struct v4l2_subdev_frame_size_enum *fse)

{
@@ -92,29 +92,29 @@ static int bru_enum_frame_size(struct v4l2_subdev *subdev, 
	    fse->code != MEDIA_BUS_FMT_AYUV8_1X32)

		return -EINVAL;



	fse->min_width = BRU_MIN_SIZE;

	fse->max_width = BRU_MAX_SIZE;

	fse->min_height = BRU_MIN_SIZE;

	fse->max_height = BRU_MAX_SIZE;

	fse->min_width = BRX_MIN_SIZE;

	fse->max_width = BRX_MAX_SIZE;

	fse->min_height = BRX_MIN_SIZE;

	fse->max_height = BRX_MAX_SIZE;



	return 0;

}



static struct v4l2_rect *bru_get_compose(struct vsp1_bru *bru,

static struct v4l2_rect *brx_get_compose(struct vsp1_brx *brx,

					 struct v4l2_subdev_pad_config *cfg,

					 unsigned int pad)

{

	return v4l2_subdev_get_try_compose(&bru->entity.subdev, cfg, pad);

	return v4l2_subdev_get_try_compose(&brx->entity.subdev, cfg, pad);

}



static void bru_try_format(struct vsp1_bru *bru,

static void brx_try_format(struct vsp1_brx *brx,

			   struct v4l2_subdev_pad_config *config,

			   unsigned int pad, struct v4l2_mbus_framefmt *fmt)

{

	struct v4l2_mbus_framefmt *format;



	switch (pad) {

	case BRU_PAD_SINK(0):

	case BRX_PAD_SINK(0):

		/* Default to YUV if the requested format is not supported. */

		if (fmt->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&

		    fmt->code != MEDIA_BUS_FMT_AYUV8_1X32)
@@ -122,46 +122,46 @@ static void bru_try_format(struct vsp1_bru *bru, 
		break;



	default:

		/* The BRU can't perform format conversion. */

		format = vsp1_entity_get_pad_format(&bru->entity, config,

						    BRU_PAD_SINK(0));

		/* The BRx can't perform format conversion. */

		format = vsp1_entity_get_pad_format(&brx->entity, config,

						    BRX_PAD_SINK(0));

		fmt->code = format->code;

		break;

	}



	fmt->width = clamp(fmt->width, BRU_MIN_SIZE, BRU_MAX_SIZE);

	fmt->height = clamp(fmt->height, BRU_MIN_SIZE, BRU_MAX_SIZE);

	fmt->width = clamp(fmt->width, BRX_MIN_SIZE, BRX_MAX_SIZE);

	fmt->height = clamp(fmt->height, BRX_MIN_SIZE, BRX_MAX_SIZE);

	fmt->field = V4L2_FIELD_NONE;

	fmt->colorspace = V4L2_COLORSPACE_SRGB;

}



static int bru_set_format(struct v4l2_subdev *subdev,

static int brx_set_format(struct v4l2_subdev *subdev,

			  struct v4l2_subdev_pad_config *cfg,

			  struct v4l2_subdev_format *fmt)

{

	struct vsp1_bru *bru = to_bru(subdev);

	struct vsp1_brx *brx = to_brx(subdev);

	struct v4l2_subdev_pad_config *config;

	struct v4l2_mbus_framefmt *format;

	int ret = 0;



	mutex_lock(&bru->entity.lock);

	mutex_lock(&brx->entity.lock);



	config = vsp1_entity_get_pad_config(&bru->entity, cfg, fmt->which);

	config = vsp1_entity_get_pad_config(&brx->entity, cfg, fmt->which);

	if (!config) {

		ret = -EINVAL;

		goto done;

	}



	bru_try_format(bru, config, fmt->pad, &fmt->format);

	brx_try_format(brx, config, fmt->pad, &fmt->format);



	format = vsp1_entity_get_pad_format(&bru->entity, config, fmt->pad);

	format = vsp1_entity_get_pad_format(&brx->entity, config, fmt->pad);

	*format = fmt->format;



	/* Reset the compose rectangle */

	if (fmt->pad != bru->entity.source_pad) {

	if (fmt->pad != brx->entity.source_pad) {

		struct v4l2_rect *compose;



		compose = bru_get_compose(bru, config, fmt->pad);

		compose = brx_get_compose(brx, config, fmt->pad);

		compose->left = 0;

		compose->top = 0;

		compose->width = format->width;
@@ -169,48 +169,48 @@ static int bru_set_format(struct v4l2_subdev *subdev, 
	}



	/* Propagate the format code to all pads */

	if (fmt->pad == BRU_PAD_SINK(0)) {

	if (fmt->pad == BRX_PAD_SINK(0)) {

		unsigned int i;



		for (i = 0; i <= bru->entity.source_pad; ++i) {

			format = vsp1_entity_get_pad_format(&bru->entity,

		for (i = 0; i <= brx->entity.source_pad; ++i) {

			format = vsp1_entity_get_pad_format(&brx->entity,

							    config, i);

			format->code = fmt->format.code;

		}

	}



done:

	mutex_unlock(&bru->entity.lock);

	mutex_unlock(&brx->entity.lock);

	return ret;

}



static int bru_get_selection(struct v4l2_subdev *subdev,

static int brx_get_selection(struct v4l2_subdev *subdev,

			     struct v4l2_subdev_pad_config *cfg,

			     struct v4l2_subdev_selection *sel)

{

	struct vsp1_bru *bru = to_bru(subdev);

	struct vsp1_brx *brx = to_brx(subdev);

	struct v4l2_subdev_pad_config *config;



	if (sel->pad == bru->entity.source_pad)

	if (sel->pad == brx->entity.source_pad)

		return -EINVAL;



	switch (sel->target) {

	case V4L2_SEL_TGT_COMPOSE_BOUNDS:

		sel->r.left = 0;

		sel->r.top = 0;

		sel->r.width = BRU_MAX_SIZE;

		sel->r.height = BRU_MAX_SIZE;

		sel->r.width = BRX_MAX_SIZE;

		sel->r.height = BRX_MAX_SIZE;

		return 0;



	case V4L2_SEL_TGT_COMPOSE:

		config = vsp1_entity_get_pad_config(&bru->entity, cfg,

		config = vsp1_entity_get_pad_config(&brx->entity, cfg,

						    sel->which);

		if (!config)

			return -EINVAL;



		mutex_lock(&bru->entity.lock);

		sel->r = *bru_get_compose(bru, config, sel->pad);

		mutex_unlock(&bru->entity.lock);

		mutex_lock(&brx->entity.lock);

		sel->r = *brx_get_compose(brx, config, sel->pad);

		mutex_unlock(&brx->entity.lock);

		return 0;



	default:
@@ -218,25 +218,25 @@ static int bru_get_selection(struct v4l2_subdev *subdev, 
	}

}



static int bru_set_selection(struct v4l2_subdev *subdev,

static int brx_set_selection(struct v4l2_subdev *subdev,

			     struct v4l2_subdev_pad_config *cfg,

			     struct v4l2_subdev_selection *sel)

{

	struct vsp1_bru *bru = to_bru(subdev);

	struct vsp1_brx *brx = to_brx(subdev);

	struct v4l2_subdev_pad_config *config;

	struct v4l2_mbus_framefmt *format;

	struct v4l2_rect *compose;

	int ret = 0;



	if (sel->pad == bru->entity.source_pad)

	if (sel->pad == brx->entity.source_pad)

		return -EINVAL;



	if (sel->target != V4L2_SEL_TGT_COMPOSE)

		return -EINVAL;



	mutex_lock(&bru->entity.lock);

	mutex_lock(&brx->entity.lock);



	config = vsp1_entity_get_pad_config(&bru->entity, cfg, sel->which);

	config = vsp1_entity_get_pad_config(&brx->entity, cfg, sel->which);

	if (!config) {

		ret = -EINVAL;

		goto done;
@@ -246,8 +246,8 @@ static int bru_set_selection(struct v4l2_subdev *subdev, 
	 * The compose rectangle top left corner must be inside the output

	 * frame.

	 */

	format = vsp1_entity_get_pad_format(&bru->entity, config,

					    bru->entity.source_pad);

	format = vsp1_entity_get_pad_format(&brx->entity, config,

					    brx->entity.source_pad);

	sel->r.left = clamp_t(unsigned int, sel->r.left, 0, format->width - 1);

	sel->r.top = clamp_t(unsigned int, sel->r.top, 0, format->height - 1);
@@ -255,42 +255,42 @@ static int bru_set_selection(struct v4l2_subdev *subdev, 
	 * Scaling isn't supported, the compose rectangle size must be identical

	 * to the sink format size.

	 */

	format = vsp1_entity_get_pad_format(&bru->entity, config, sel->pad);

	format = vsp1_entity_get_pad_format(&brx->entity, config, sel->pad);

	sel->r.width = format->width;

	sel->r.height = format->height;



	compose = bru_get_compose(bru, config, sel->pad);

	compose = brx_get_compose(brx, config, sel->pad);

	*compose = sel->r;



done:

	mutex_unlock(&bru->entity.lock);

	mutex_unlock(&brx->entity.lock);

	return ret;

}



static const struct v4l2_subdev_pad_ops bru_pad_ops = {

static const struct v4l2_subdev_pad_ops brx_pad_ops = {

	.init_cfg = vsp1_entity_init_cfg,

	.enum_mbus_code = bru_enum_mbus_code,

	.enum_frame_size = bru_enum_frame_size,

	.enum_mbus_code = brx_enum_mbus_code,

	.enum_frame_size = brx_enum_frame_size,

	.get_fmt = vsp1_subdev_get_pad_format,

	.set_fmt = bru_set_format,

	.get_selection = bru_get_selection,

	.set_selection = bru_set_selection,

	.set_fmt = brx_set_format,

	.get_selection = brx_get_selection,

	.set_selection = brx_set_selection,

};



static const struct v4l2_subdev_ops bru_ops = {

	.pad    = &bru_pad_ops,

static const struct v4l2_subdev_ops brx_ops = {

	.pad    = &brx_pad_ops,

};



/* -----------------------------------------------------------------------------

 * VSP1 Entity Operations

 */



static void bru_configure(struct vsp1_entity *entity,

static void brx_configure(struct vsp1_entity *entity,

			  struct vsp1_pipeline *pipe,

			  struct vsp1_dl_list *dl,

			  enum vsp1_entity_params params)

{

	struct vsp1_bru *bru = to_bru(&entity->subdev);

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

	struct v4l2_mbus_framefmt *format;

	unsigned int flags;

	unsigned int i;
@@ -298,8 +298,8 @@ static void bru_configure(struct vsp1_entity *entity, 
	if (params != VSP1_ENTITY_PARAMS_INIT)

		return;



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

					    bru->entity.source_pad);

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

					    brx->entity.source_pad);



	/*

	 * The hardware is extremely flexible but we have no userspace API to
@@ -313,7 +313,7 @@ static void bru_configure(struct vsp1_entity *entity, 
	 * format at the pipeline output is premultiplied.

	 */

	flags = pipe->output ? pipe->output->format.flags : 0;

	vsp1_bru_write(bru, dl, VI6_BRU_INCTRL,

	vsp1_brx_write(brx, dl, VI6_BRU_INCTRL,

		       flags & V4L2_PIX_FMT_FLAG_PREMUL_ALPHA ?

		       0 : VI6_BRU_INCTRL_NRM);
@@ -321,12 +321,12 @@ static void bru_configure(struct vsp1_entity *entity, 
	 * Set the background position to cover the whole output image and

	 * configure its color.

	 */

	vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_SIZE,

	vsp1_brx_write(brx, dl, VI6_BRU_VIRRPF_SIZE,

		       (format->width << VI6_BRU_VIRRPF_SIZE_HSIZE_SHIFT) |

		       (format->height << VI6_BRU_VIRRPF_SIZE_VSIZE_SHIFT));

	vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_LOC, 0);

	vsp1_brx_write(brx, dl, VI6_BRU_VIRRPF_LOC, 0);



	vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_COL, bru->bgcolor |

	vsp1_brx_write(brx, dl, VI6_BRU_VIRRPF_COL, brx->bgcolor |

		       (0xff << VI6_BRU_VIRRPF_COL_A_SHIFT));



	/*
@@ -336,25 +336,25 @@ static void bru_configure(struct vsp1_entity *entity, 
	 * unit.

	 */

	if (entity->type == VSP1_ENTITY_BRU)

		vsp1_bru_write(bru, dl, VI6_BRU_ROP,

		vsp1_brx_write(brx, dl, VI6_BRU_ROP,

			       VI6_BRU_ROP_DSTSEL_BRUIN(1) |

			       VI6_BRU_ROP_CROP(VI6_ROP_NOP) |

			       VI6_BRU_ROP_AROP(VI6_ROP_NOP));



	for (i = 0; i < bru->entity.source_pad; ++i) {

	for (i = 0; i < brx->entity.source_pad; ++i) {

		bool premultiplied = false;

		u32 ctrl = 0;



		/*

		 * Configure all Blend/ROP units corresponding to an enabled BRU

		 * Configure all Blend/ROP units corresponding to an enabled BRx

		 * input for alpha blending. Blend/ROP units corresponding to

		 * disabled BRU inputs are used in ROP NOP mode to ignore the

		 * disabled BRx inputs are used in ROP NOP mode to ignore the

		 * SRC input.

		 */

		if (bru->inputs[i].rpf) {

		if (brx->inputs[i].rpf) {

			ctrl |= VI6_BRU_CTRL_RBC;



			premultiplied = bru->inputs[i].rpf->format.flags

			premultiplied = brx->inputs[i].rpf->format.flags

				      & V4L2_PIX_FMT_FLAG_PREMUL_ALPHA;

		} else {

			ctrl |= VI6_BRU_CTRL_CROP(VI6_ROP_NOP)
@@ -378,7 +378,7 @@ static void bru_configure(struct vsp1_entity *entity, 
		if (!(entity->type == VSP1_ENTITY_BRU && i == 1))

			ctrl |= VI6_BRU_CTRL_SRCSEL_BRUIN(i);



		vsp1_bru_write(bru, dl, VI6_BRU_CTRL(i), ctrl);

		vsp1_brx_write(brx, dl, VI6_BRU_CTRL(i), ctrl);



		/*

		 * Harcode the blending formula to
@@ -393,7 +393,7 @@ static void bru_configure(struct vsp1_entity *entity, 
		 *

		 * otherwise.

		 */

		vsp1_bru_write(bru, dl, VI6_BRU_BLD(i),

		vsp1_brx_write(brx, dl, VI6_BRU_BLD(i),

			       VI6_BRU_BLD_CCMDX_255_SRC_A |

			       (premultiplied ? VI6_BRU_BLD_CCMDY_COEFY :

						VI6_BRU_BLD_CCMDY_SRC_A) |
@@ -403,29 +403,29 @@ static void bru_configure(struct vsp1_entity *entity, 
	}

}



static const struct vsp1_entity_operations bru_entity_ops = {

	.configure = bru_configure,

static const struct vsp1_entity_operations brx_entity_ops = {

	.configure = brx_configure,

};



/* -----------------------------------------------------------------------------

 * Initialization and Cleanup

 */



struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1,

struct vsp1_brx *vsp1_brx_create(struct vsp1_device *vsp1,

				 enum vsp1_entity_type type)

{

	struct vsp1_bru *bru;

	struct vsp1_brx *brx;

	unsigned int num_pads;

	const char *name;

	int ret;



	bru = devm_kzalloc(vsp1->dev, sizeof(*bru), GFP_KERNEL);

	if (bru == NULL)

	brx = devm_kzalloc(vsp1->dev, sizeof(*brx), GFP_KERNEL);

	if (brx == NULL)

		return ERR_PTR(-ENOMEM);



	bru->base = type == VSP1_ENTITY_BRU ? VI6_BRU_BASE : VI6_BRS_BASE;

	bru->entity.ops = &bru_entity_ops;

	bru->entity.type = type;

	brx->base = type == VSP1_ENTITY_BRU ? VI6_BRU_BASE : VI6_BRS_BASE;

	brx->entity.ops = &brx_entity_ops;

	brx->entity.type = type;



	if (type == VSP1_ENTITY_BRU) {

		num_pads = vsp1->info->num_bru_inputs + 1;
@@ -435,26 +435,26 @@ struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1, 
		name = "brs";

	}



	ret = vsp1_entity_init(vsp1, &bru->entity, name, num_pads, &bru_ops,

	ret = vsp1_entity_init(vsp1, &brx->entity, name, num_pads, &brx_ops,

			       MEDIA_ENT_F_PROC_VIDEO_COMPOSER);

	if (ret < 0)

		return ERR_PTR(ret);



	/* Initialize the control handler. */

	v4l2_ctrl_handler_init(&bru->ctrls, 1);

	v4l2_ctrl_new_std(&bru->ctrls, &bru_ctrl_ops, V4L2_CID_BG_COLOR,

	v4l2_ctrl_handler_init(&brx->ctrls, 1);

	v4l2_ctrl_new_std(&brx->ctrls, &brx_ctrl_ops, V4L2_CID_BG_COLOR,

			  0, 0xffffff, 1, 0);



	bru->bgcolor = 0;

	brx->bgcolor = 0;



	bru->entity.subdev.ctrl_handler = &bru->ctrls;

	brx->entity.subdev.ctrl_handler = &brx->ctrls;



	if (bru->ctrls.error) {

	if (brx->ctrls.error) {

		dev_err(vsp1->dev, "%s: failed to initialize controls\n", name);

		ret = bru->ctrls.error;

		vsp1_entity_destroy(&bru->entity);

		ret = brx->ctrls.error;

		vsp1_entity_destroy(&brx->entity);

		return ERR_PTR(ret);

	}



	return bru;

	return brx;

}

drivers/media/platform/vsp1/vsp1_bru.h→drivers/media/platform/vsp1/vsp1_brx.h

+9 −9
Original line number Diff line number Diff line 
/*

 * vsp1_bru.h  --  R-Car VSP1 Blend ROP Unit

 * vsp1_brx.h  --  R-Car VSP1 Blend ROP Unit (BRU and BRS)

 *

 * Copyright (C) 2013 Renesas Corporation

 *
@@ -10,8 +10,8 @@ 
 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

#ifndef __VSP1_BRU_H__

#define __VSP1_BRU_H__

#ifndef __VSP1_BRX_H__

#define __VSP1_BRX_H__



#include <media/media-entity.h>

#include <media/v4l2-ctrls.h>
@@ -22,9 +22,9 @@ 
struct vsp1_device;

struct vsp1_rwpf;



#define BRU_PAD_SINK(n)				(n)

#define BRX_PAD_SINK(n)				(n)



struct vsp1_bru {

struct vsp1_brx {

	struct vsp1_entity entity;

	unsigned int base;
@@ -37,12 +37,12 @@ struct vsp1_bru { 
	u32 bgcolor;

};



static inline struct vsp1_bru *to_bru(struct v4l2_subdev *subdev)

static inline struct vsp1_brx *to_brx(struct v4l2_subdev *subdev)

{

	return container_of(subdev, struct vsp1_bru, entity.subdev);

	return container_of(subdev, struct vsp1_brx, entity.subdev);

}



struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1,

struct vsp1_brx *vsp1_brx_create(struct vsp1_device *vsp1,

				 enum vsp1_entity_type type);



#endif /* __VSP1_BRU_H__ */
 
#endif /* __VSP1_BRX_H__ */

drivers/media/platform/vsp1/vsp1_drm.c

+87 −87

File changed.

Preview size limit exceeded, changes collapsed.