瀏覽代碼

[media] coda: fix FMO value setting for CodaDx6

The register is only written on CodaDx6, so the temporary variable
to be written only needs to be initialized on CodaDx6. Also, drop
two no-op lines.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Philipp Zabel 12 年之前
父節點
當前提交
0fd84dc80b
共有 1 個文件被更改,包括 1 次插入3 次删除
  1. 1 3
      drivers/media/platform/coda.c

+ 1 - 3
drivers/media/platform/coda.c

@@ -2074,10 +2074,8 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
 	coda_setup_iram(ctx);
 	coda_setup_iram(ctx);
 
 
 	if (dst_fourcc == V4L2_PIX_FMT_H264) {
 	if (dst_fourcc == V4L2_PIX_FMT_H264) {
-		value  = (FMO_SLICE_SAVE_BUF_SIZE << 7);
-		value |= (0 & CODA_FMOPARAM_TYPE_MASK) << CODA_FMOPARAM_TYPE_OFFSET;
-		value |=  0 & CODA_FMOPARAM_SLICENUM_MASK;
 		if (dev->devtype->product == CODA_DX6) {
 		if (dev->devtype->product == CODA_DX6) {
+			value = FMO_SLICE_SAVE_BUF_SIZE << 7;
 			coda_write(dev, value, CODADX6_CMD_ENC_SEQ_FMO);
 			coda_write(dev, value, CODADX6_CMD_ENC_SEQ_FMO);
 		} else {
 		} else {
 			coda_write(dev, ctx->iram_info.search_ram_paddr,
 			coda_write(dev, ctx->iram_info.search_ram_paddr,