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

Commit eacf8f9a authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2: use new V4L2_DV_BT_BLANKING/FRAME defines 



Use the new defines to calculate the full blanking and frame sizes.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 7f68127f

drivers/media/i2c/ad9389b.c

+2 −4
Original line number Diff line number Diff line
@@ -445,10 +445,8 @@ static int ad9389b_log_status(struct v4l2_subdev *sd) 
	}

	if (state->dv_timings.type == V4L2_DV_BT_656_1120) {

		struct v4l2_bt_timings *bt = bt = &state->dv_timings.bt;

		u32 frame_width = bt->width + bt->hfrontporch +

			bt->hsync + bt->hbackporch;

		u32 frame_height = bt->height + bt->vfrontporch +

			bt->vsync + bt->vbackporch;

		u32 frame_width = V4L2_DV_BT_FRAME_WIDTH(bt);

		u32 frame_height = V4L2_DV_BT_FRAME_HEIGHT(bt);

		u32 frame_size = frame_width * frame_height;



		v4l2_info(sd, "timings: %ux%u%s%u (%ux%u). Pix freq. = %u Hz. Polarities = 0x%x\n",

drivers/media/i2c/adv7604.c

+4 −4
Original line number Diff line number Diff line
@@ -261,22 +261,22 @@ static inline struct v4l2_subdev *to_sd(struct v4l2_ctrl *ctrl) 


static inline unsigned hblanking(const struct v4l2_bt_timings *t)

{

	return t->hfrontporch + t->hsync + t->hbackporch;

	return V4L2_DV_BT_BLANKING_WIDTH(t);

}



static inline unsigned htotal(const struct v4l2_bt_timings *t)

{

	return t->width + t->hfrontporch + t->hsync + t->hbackporch;

	return V4L2_DV_BT_FRAME_WIDTH(t);

}



static inline unsigned vblanking(const struct v4l2_bt_timings *t)

{

	return t->vfrontporch + t->vsync + t->vbackporch;

	return V4L2_DV_BT_BLANKING_HEIGHT(t);

}



static inline unsigned vtotal(const struct v4l2_bt_timings *t)

{

	return t->height + t->vfrontporch + t->vsync + t->vbackporch;

	return V4L2_DV_BT_FRAME_HEIGHT(t);

}



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

drivers/media/i2c/ths7303.c

+2 −4
Original line number Diff line number Diff line
@@ -291,10 +291,8 @@ static int ths7303_log_status(struct v4l2_subdev *sd) 
		struct v4l2_bt_timings *bt = bt = &state->bt;

		u32 frame_width, frame_height;



		frame_width = bt->width + bt->hfrontporch +

			      bt->hsync + bt->hbackporch;

		frame_height = bt->height + bt->vfrontporch +

			       bt->vsync + bt->vbackporch;

		frame_width = V4L2_DV_BT_FRAME_WIDTH(bt);

		frame_height = V4L2_DV_BT_FRAME_HEIGHT(bt);

		v4l2_info(sd,

			  "timings: %dx%d%s%d (%dx%d). Pix freq. = %d Hz. Polarities = 0x%x\n",

			  bt->width, bt->height, bt->interlaced ? "i" : "p",

drivers/media/i2c/ths8200.c

+4 −4
Original line number Diff line number Diff line
@@ -65,22 +65,22 @@ static inline struct ths8200_state *to_state(struct v4l2_subdev *sd) 


static inline unsigned hblanking(const struct v4l2_bt_timings *t)

{

	return t->hfrontporch + t->hsync + t->hbackporch;

	return V4L2_DV_BT_BLANKING_WIDTH(t);

}



static inline unsigned htotal(const struct v4l2_bt_timings *t)

{

	return t->width + t->hfrontporch + t->hsync + t->hbackporch;

	return V4L2_DV_BT_FRAME_WIDTH(t);

}



static inline unsigned vblanking(const struct v4l2_bt_timings *t)

{

	return t->vfrontporch + t->vsync + t->vbackporch;

	return V4L2_DV_BT_BLANKING_HEIGHT(t);

}



static inline unsigned vtotal(const struct v4l2_bt_timings *t)

{

	return t->height + t->vfrontporch + t->vsync + t->vbackporch;

	return V4L2_DV_BT_FRAME_HEIGHT(t);

}



static int ths8200_read(struct v4l2_subdev *sd, u8 reg)

drivers/media/platform/blackfin/bfin_capture.c

+2 −7
Original line number Diff line number Diff line
@@ -388,13 +388,8 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count) 


		params.hdelay = bt->hsync + bt->hbackporch;

		params.vdelay = bt->vsync + bt->vbackporch;

		params.line = bt->hfrontporch + bt->hsync

				+ bt->hbackporch + bt->width;

		params.frame = bt->vfrontporch + bt->vsync

				+ bt->vbackporch + bt->height;

		if (bt->interlaced)

			params.frame += bt->il_vfrontporch + bt->il_vsync

					+ bt->il_vbackporch;

		params.line = V4L2_DV_BT_FRAME_WIDTH(bt);

		params.frame = V4L2_DV_BT_FRAME_HEIGHT(bt);

	} else if (bcap_dev->cfg->inputs[bcap_dev->cur_input].capabilities

			& V4L2_IN_CAP_STD) {

		params.hdelay = 0;