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

Commit fb1fcf17 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: fix ENC_SEQ_OPTION for CODA7 



GAMMA_OFFSET is different between CodaDx6 and CODA7.
Also, this is a bitfield.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7eac97d7

drivers/media/platform/coda.c

+8 −2
Original line number Diff line number Diff line
@@ -1129,8 +1129,14 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
	value = (CODA_DEFAULT_GAMMA & CODA_GAMMA_MASK) << CODA_GAMMA_OFFSET;

	coda_write(dev, value, CODA_CMD_ENC_SEQ_RC_GAMMA);



	value  = (CODA_DEFAULT_GAMMA > 0) << CODA_OPTION_GAMMA_OFFSET;

	value |= (0 & CODA_OPTION_SLICEREPORT_MASK) << CODA_OPTION_SLICEREPORT_OFFSET;

	if (CODA_DEFAULT_GAMMA > 0) {

		if (dev->devtype->product == CODA_DX6)

			value  = 1 << CODADX6_OPTION_GAMMA_OFFSET;

		else

			value  = 1 << CODA7_OPTION_GAMMA_OFFSET;

	} else {

		value = 0;

	}

	coda_write(dev, value, CODA_CMD_ENC_SEQ_OPTION);



	if (dst_fourcc == V4L2_PIX_FMT_H264) {

drivers/media/platform/coda.h

+2 −6
Original line number Diff line number Diff line
@@ -96,16 +96,12 @@ 
#define CODA_CMD_ENC_SEQ_BB_START				0x180

#define CODA_CMD_ENC_SEQ_BB_SIZE				0x184

#define CODA_CMD_ENC_SEQ_OPTION				0x188

#define		CODA_OPTION_GAMMA_OFFSET			7

#define		CODA_OPTION_GAMMA_MASK				0x01

#define		CODA7_OPTION_GAMMA_OFFSET			8

#define		CODADX6_OPTION_GAMMA_OFFSET			7

#define		CODA_OPTION_LIMITQP_OFFSET			6

#define		CODA_OPTION_LIMITQP_MASK			0x01

#define		CODA_OPTION_RCINTRAQP_OFFSET			5

#define		CODA_OPTION_RCINTRAQP_MASK			0x01

#define		CODA_OPTION_FMO_OFFSET				4

#define		CODA_OPTION_FMO_MASK				0x01

#define		CODA_OPTION_SLICEREPORT_OFFSET			1

#define		CODA_OPTION_SLICEREPORT_MASK			0x01

#define CODA_CMD_ENC_SEQ_COD_STD				0x18c

#define		CODA_STD_MPEG4					0

#define		CODA_STD_H263					1