55 files changed, 11471 insertions, 2282 deletions

diff --git a/drivers/amvdec_ports/vdec_drv_if.c b/drivers/amvdec_ports/vdec_drv_if.c
index d69ef9f..4b70ed0 100644
--- a/drivers/amvdec_ports/vdec_drv_if.c
+++ b/drivers/amvdec_ports/vdec_drv_if.c
@@ -29,6 +29,9 @@
 const struct vdec_common_if *get_h264_dec_comm_if(void);
 const struct vdec_common_if *get_hevc_dec_comm_if(void);
 const struct vdec_common_if *get_vp9_dec_comm_if(void);
+const struct vdec_common_if *get_mpeg12_dec_comm_if(void);
+const struct vdec_common_if *get_mpeg4_dec_comm_if(void);
+const struct vdec_common_if *get_mjpeg_dec_comm_if(void);
 
 int vdec_if_init(struct aml_vcodec_ctx *ctx, unsigned int fourcc)
 {
@@ -44,15 +47,22 @@ int vdec_if_init(struct aml_vcodec_ctx *ctx, unsigned int fourcc)
 	case V4L2_PIX_FMT_VP9:
 		ctx->dec_if = get_vp9_dec_comm_if();
 		break;
+	case V4L2_PIX_FMT_MPEG:
+	case V4L2_PIX_FMT_MPEG1:
+	case V4L2_PIX_FMT_MPEG2:
+		ctx->dec_if = get_mpeg12_dec_comm_if();
+		break;
+	case V4L2_PIX_FMT_MPEG4:
+		ctx->dec_if = get_mpeg4_dec_comm_if();
+		break;
+	case V4L2_PIX_FMT_MJPEG:
+		ctx->dec_if = get_mjpeg_dec_comm_if();
+		break;
 	default:
 		return -EINVAL;
 	}
 
-	aml_vdec_lock(ctx);
-	//aml_vcodec_dec_clock_on(&ctx->dev->pm);//debug_tmp
 	ret = ctx->dec_if->init(ctx, &ctx->drv_handle);
-	//aml_vcodec_dec_clock_off(&ctx->dev->pm);
-	aml_vdec_unlock(ctx);
 
 	return ret;
 }
@@ -62,15 +72,13 @@ int vdec_if_probe(struct aml_vcodec_ctx *ctx,
 {
 	int ret = 0;
 
-	aml_vdec_lock(ctx);
 	ret = ctx->dec_if->probe(ctx->drv_handle, bs, out);
-	aml_vdec_unlock(ctx);
 
 	return ret;
 }
 
 int vdec_if_decode(struct aml_vcodec_ctx *ctx, struct aml_vcodec_mem *bs,
-	unsigned long int timestamp, bool *res_chg)
+	u64 timestamp, bool *res_chg)
 {
 	int ret = 0;
 
@@ -81,29 +89,13 @@ int vdec_if_decode(struct aml_vcodec_ctx *ctx, struct aml_vcodec_mem *bs,
 		}
 	}
 
-	/*if (fb) {
-		if (((fb->base_y.dma_addr & 511) != 0) ||
-		    ((fb->base_c.dma_addr & 511) != 0)) {
-			aml_v4l2_err("frame buffer dma_addr should 512 byte align");
-			return -EINVAL;
-		}
-	}*/
-
 	if (ctx->drv_handle == 0)
 		return -EIO;
 
-	//aml_vdec_lock(ctx);
-
 	aml_vcodec_set_curr_ctx(ctx->dev, ctx);
-	//aml_vcodec_dec_clock_on(&ctx->dev->pm);//debug_tmp
-	//enable_irq(ctx->dev->dec_irq);
 	ret = ctx->dec_if->decode(ctx->drv_handle, bs, timestamp, res_chg);
-	//disable_irq(ctx->dev->dec_irq);
-	//aml_vcodec_dec_clock_off(&ctx->dev->pm);
 	aml_vcodec_set_curr_ctx(ctx->dev, NULL);
 
-	//aml_vdec_unlock(ctx);
-
 	return ret;
 }
 
@@ -115,9 +107,7 @@ int vdec_if_get_param(struct aml_vcodec_ctx *ctx,
 	if (ctx->drv_handle == 0)
 		return -EIO;
 
-	//aml_vdec_lock(ctx);
 	ret = ctx->dec_if->get_param(ctx->drv_handle, type, out);
-	//aml_vdec_unlock(ctx);
 
 	return ret;
 }
@@ -127,11 +117,6 @@ void vdec_if_deinit(struct aml_vcodec_ctx *ctx)
 	if (ctx->drv_handle == 0)
 		return;
 
-	//aml_vdec_lock(ctx);
-	//aml_vcodec_dec_clock_on(&ctx->dev->pm);
 	ctx->dec_if->deinit(ctx->drv_handle);
-	//aml_vcodec_dec_clock_off(&ctx->dev->pm);
-	//aml_vdec_unlock(ctx);
-
 	ctx->drv_handle = 0;
 }