diff --git a/drivers/video/rockchip/mpp/mpp_common.c b/drivers/video/rockchip/mpp/mpp_common.c
index ef4d2abb3ea0..199bac0a0e91 100644
--- a/drivers/video/rockchip/mpp/mpp_common.c
+++ b/drivers/video/rockchip/mpp/mpp_common.c
@@ -63,9 +63,9 @@ static int
 mpp_taskqueue_push_pending(struct mpp_taskqueue *queue,
 			   struct mpp_task *task)
 {
-	mutex_lock(&queue->lock);
-	list_add_tail(&task->queue_link, &queue->pending);
-	mutex_unlock(&queue->lock);
+	mutex_lock(&queue->pending_lock);
+	list_add_tail(&task->pending_link, &queue->pending_list);
+	mutex_unlock(&queue->pending_lock);
 
 	return 0;
 }
@@ -75,31 +75,52 @@ mpp_taskqueue_get_pending_task(struct mpp_taskqueue *queue)
 {
 	struct mpp_task *task = NULL;
 
-	mutex_lock(&queue->lock);
-	if (!atomic_read(&queue->running)) {
-		if (!list_empty(&queue->pending)) {
-			task = list_first_entry(&queue->pending,
-						struct mpp_task,
-						queue_link);
-			list_del_init(&task->queue_link);
-			atomic_inc(&queue->running);
-			queue->cur_task = task;
-		}
-	}
-
-	mutex_unlock(&queue->lock);
+	mutex_lock(&queue->pending_lock);
+	task = list_first_entry_or_null(&queue->pending_list,
+					struct mpp_task,
+					pending_link);
+	mutex_unlock(&queue->pending_lock);
 
 	return task;
 }
 
+static bool
+mpp_taskqueue_is_running(struct mpp_taskqueue *queue)
+{
+	bool flag;
+
+	mutex_lock(&queue->running_lock);
+	flag = !list_empty(&queue->running_list);
+	mutex_unlock(&queue->running_lock);
+
+	return flag;
+}
+
+static int
+mpp_taskqueue_pending_to_run(struct mpp_taskqueue *queue,
+			     struct mpp_task *task)
+{
+	mutex_lock(&queue->running_lock);
+	list_add_tail(&task->running_link, &queue->running_list);
+	mutex_unlock(&queue->running_lock);
+
+	mutex_lock(&queue->pending_lock);
+	list_del_init(&task->pending_link);
+	mutex_unlock(&queue->pending_lock);
+
+	return 0;
+}
+
 static struct mpp_task *
-mpp_taskqueue_get_cur_task(struct mpp_taskqueue *queue)
+mpp_taskqueue_get_running_task(struct mpp_taskqueue *queue)
 {
 	struct mpp_task *task = NULL;
 
-	mutex_lock(&queue->lock);
-	task = queue->cur_task;
-	mutex_unlock(&queue->lock);
+	mutex_lock(&queue->running_lock);
+	task = list_first_entry_or_null(&queue->running_list,
+					struct mpp_task,
+					running_link);
+	mutex_unlock(&queue->running_lock);
 
 	return task;
 }
@@ -108,10 +129,9 @@ static int
 mpp_taskqueue_done(struct mpp_taskqueue *queue,
 		   struct mpp_task *task)
 {
-	mutex_lock(&queue->lock);
-	queue->cur_task = NULL;
-	atomic_set(&queue->running, 0);
-	mutex_unlock(&queue->lock);
+	mutex_lock(&queue->running_lock);
+	list_del_init(&task->running_link);
+	mutex_unlock(&queue->running_lock);
 
 	return 0;
 }
@@ -120,27 +140,13 @@ static int
 mpp_taskqueue_trigger_work(struct mpp_taskqueue *queue,
 			   struct workqueue_struct *workq)
 {
-	mutex_lock(&queue->lock);
+	mutex_lock(&queue->work_lock);
 	queue_work(workq, &queue->work);
-	mutex_unlock(&queue->lock);
+	mutex_unlock(&queue->work_lock);
 
 	return 0;
 }
 
-static int
-mpp_taskqueue_abort(struct mpp_taskqueue *queue,
-		    struct mpp_task *task)
-{
-	mutex_lock(&queue->lock);
-	if (task) {
-		if (queue->cur_task == task)
-			queue->cur_task = NULL;
-	}
-	atomic_set(&queue->running, 0);
-	mutex_unlock(&queue->lock);
-	return 0;
-}
-
 static int mpp_power_on(struct mpp_dev *mpp)
 {
 	pm_runtime_get_sync(mpp->dev);
@@ -169,7 +175,7 @@ mpp_session_push_pending(struct mpp_session *session,
 			 struct mpp_task *task)
 {
 	mutex_lock(&session->pending_lock);
-	list_add_tail(&task->session_link, &session->pending);
+	list_add_tail(&task->session_link, &session->pending_list);
 	mutex_unlock(&session->pending_lock);
 
 	return 0;
@@ -240,8 +246,8 @@ static int mpp_process_task(struct mpp_session *session,
 	mpp_session_push_pending(session, task);
 	/* push current task to queue */
 	mpp_taskqueue_push_pending(mpp->queue, task);
-	atomic_inc(&session->task_running);
-	atomic_inc(&mpp->total_running);
+	atomic_inc(&session->task_count);
+	atomic_inc(&mpp->task_count);
 	/* trigger current queue to run task */
 	mpp_taskqueue_trigger_work(mpp->queue, mpp->workq);
 
@@ -407,16 +413,15 @@ static int mpp_dev_abort(struct mpp_dev *mpp)
 
 	mpp_dev_reset(mpp);
 	/* destroy the current task after hardware reset */
-	task = mpp_taskqueue_get_cur_task(mpp->queue);
+	task = mpp_taskqueue_get_running_task(mpp->queue);
 	if (task) {
 		mutex_lock(&task->session->pending_lock);
 		list_del_init(&task->session_link);
 		mutex_unlock(&task->session->pending_lock);
-		mpp_taskqueue_abort(mpp->queue, task);
-		atomic_dec(&task->session->task_running);
+		mpp_taskqueue_done(mpp->queue, task);
+		atomic_dec(&task->session->task_count);
 		mpp_free_task(task->session, task);
 	} else {
-		mpp_taskqueue_abort(mpp->queue, NULL);
 		mpp_err("error: task is null!\n");
 	}
 
@@ -490,8 +495,10 @@ static void mpp_task_try_run(struct work_struct *work_s)
 	task = mpp_taskqueue_get_pending_task(queue);
 	if (!task)
 		goto done;
+
 	/* get device for current task */
 	mpp = task->session->mpp;
+
 	/*
 	 * In the link table mode, the prepare function of the device
 	 * will check whether I can insert a new task into device.
@@ -501,13 +508,19 @@ static void mpp_task_try_run(struct work_struct *work_s)
 	 * query, leave this job to mpp service.
 	 */
 	if (mpp->dev_ops->prepare)
-		mpp->dev_ops->prepare(mpp, task);
+		task = mpp->dev_ops->prepare(mpp, task);
+	else if (mpp_taskqueue_is_running(queue))
+		task = NULL;
+
 	/*
 	 * FIXME if the hardware supports task query, but we still need to lock
 	 * the running list and lock the mpp service in the current state.
 	 */
 	/* Push a pending task to running queue */
-	mpp_task_run(mpp, task);
+	if (task) {
+		mpp_taskqueue_pending_to_run(queue, task);
+		mpp_task_run(mpp, task);
+	}
 
 done:
 	mpp_debug_leave();
@@ -527,7 +540,7 @@ static int mpp_session_clear(struct mpp_dev *mpp,
 	/* clear task which have not start */
 	mutex_lock(&session->pending_lock);
 	list_for_each_entry_safe(task, n,
-				 &session->pending,
+				 &session->pending_list,
 				 session_link) {
 		list_del_init(&task->session_link);
 		mpp_free_task(session, task);
@@ -577,11 +590,11 @@ static int mpp_wait_result(struct mpp_session *session,
 		ret = mpp_task_result(mpp, task, msgs);
 	} else {
 		mpp_err("pid %d wait %d task done timeout.\n",
-			session->pid, atomic_read(&session->task_running));
+			session->pid, atomic_read(&session->task_count));
 		mpp_dev_abort(mpp);
 		ret = -ETIMEDOUT;
 	}
-	atomic_dec(&mpp->total_running);
+	atomic_dec(&mpp->task_count);
 	mpp_power_off(mpp);
 
 	return ret;
@@ -656,14 +669,16 @@ err_put_pdev:
 int mpp_taskqueue_init(struct mpp_taskqueue *queue,
 		       struct mpp_service *srv)
 {
-	mutex_init(&queue->lock);
-	atomic_set(&queue->running, 0);
-	INIT_LIST_HEAD(&queue->pending);
-	INIT_LIST_HEAD(&queue->mmu_link);
+	mutex_init(&queue->work_lock);
+	mutex_init(&queue->pending_lock);
+	mutex_init(&queue->running_lock);
+	mutex_init(&queue->mmu_lock);
+	INIT_LIST_HEAD(&queue->pending_list);
+	INIT_LIST_HEAD(&queue->running_list);
+	INIT_LIST_HEAD(&queue->mmu_list);
 	INIT_WORK(&queue->work, mpp_task_try_run);
 
 	queue->srv = srv;
-	queue->cur_task = NULL;
 
 	return 0;
 }
@@ -831,7 +846,7 @@ static int mpp_process_request(struct mpp_session *session,
 		int val;
 
 		ret = readx_poll_timeout(atomic_read,
-					 &session->task_running,
+					 &session->task_count,
 					 val, val == 0, 1000, 50000);
 		if (ret == -ETIMEDOUT) {
 			mpp_err("wait task running time out\n");
@@ -1029,7 +1044,7 @@ static int mpp_dev_open(struct inode *inode, struct file *filp)
 	mutex_init(&session->pending_lock);
 	mutex_init(&session->reg_lock);
 	mutex_init(&session->done_lock);
-	INIT_LIST_HEAD(&session->pending);
+	INIT_LIST_HEAD(&session->pending_list);
 	init_waitqueue_head(&session->wait);
 	ret = kfifo_alloc(&session->done_fifo,
 			  MPP_SESSION_MAX_DONE_TASK,
@@ -1039,7 +1054,7 @@ static int mpp_dev_open(struct inode *inode, struct file *filp)
 		goto failed_kfifo;
 	}
 
-	atomic_set(&session->task_running, 0);
+	atomic_set(&session->task_count, 0);
 	atomic_set(&session->release_request, 0);
 	filp->private_data = (void *)session;
 
@@ -1069,7 +1084,7 @@ static int mpp_dev_release(struct inode *inode, struct file *filp)
 	/* wait for task all done */
 	atomic_inc(&session->release_request);
 	ret = readx_poll_timeout(atomic_read,
-				 &session->task_running,
+				 &session->task_count,
 				 val, val == 0, 1000, 50000);
 	if (ret == -ETIMEDOUT)
 		mpp_err("wait total running time out\n");
@@ -1284,7 +1299,8 @@ int mpp_task_init(struct mpp_session *session,
 		  struct mpp_task *task)
 {
 	INIT_LIST_HEAD(&task->session_link);
-	INIT_LIST_HEAD(&task->queue_link);
+	INIT_LIST_HEAD(&task->pending_link);
+	INIT_LIST_HEAD(&task->running_link);
 	INIT_LIST_HEAD(&task->mem_region_list);
 
 	task->session = session;
@@ -1299,7 +1315,7 @@ int mpp_task_finish(struct mpp_session *session,
 
 	if (mpp->dev_ops->finish)
 		mpp->dev_ops->finish(mpp, task);
-	atomic_dec(&task->session->task_running);
+	atomic_dec(&session->task_count);
 
 	up_read(&mpp->reset_group->rw_sem);
 
@@ -1309,8 +1325,6 @@ int mpp_task_finish(struct mpp_session *session,
 	/* Wake up the GET thread */
 	mpp_session_push_done(task);
 	mpp_taskqueue_done(mpp->queue, task);
-	/* trigger current queue to run next task */
-	mpp_taskqueue_trigger_work(mpp->queue, mpp->workq);
 
 	return 0;
 }
@@ -1390,7 +1404,7 @@ static int mpp_iommu_handle(struct iommu_domain *iommu,
 {
 	u32 i, s, e;
 	struct mpp_dev *mpp = (struct mpp_dev *)arg;
-	struct mpp_task *task = mpp->cur_task;
+	struct mpp_task *task = mpp_taskqueue_get_running_task(mpp->queue);
 
 	dev_err(mpp->dev, "fault addr 0x%08lx status %x\n", iova, status);
 
@@ -1443,7 +1457,7 @@ int mpp_dev_probe(struct mpp_dev *mpp,
 	mpp->dev_ops = mpp->var->dev_ops;
 
 	atomic_set(&mpp->reset_request, 0);
-	atomic_set(&mpp->total_running, 0);
+	atomic_set(&mpp->task_count, 0);
 
 	device_init_wakeup(dev, true);
 	/* power domain autosuspend delay 2s */
@@ -1557,12 +1571,15 @@ irqreturn_t mpp_dev_isr_sched(int irq, void *param)
 	struct mpp_dev *mpp = param;
 
 	if (mpp->hw_ops->reduce_freq &&
-	    list_empty(&mpp->queue->pending))
+	    list_empty(&mpp->queue->pending_list))
 		mpp->hw_ops->reduce_freq(mpp);
 
 	if (mpp->dev_ops->isr)
 		ret = mpp->dev_ops->isr(mpp);
 
+	/* trigger current queue to run next task */
+	mpp_taskqueue_trigger_work(mpp->queue, mpp->workq);
+
 	return ret;
 }
 
@@ -1657,7 +1674,7 @@ int px30_workaround_combo_init(struct mpp_dev *mpp)
 	struct platform_device *pdev = mpp->iommu_info->pdev;
 
 	/* find whether exist in iommu link */
-	list_for_each_entry_safe(loop, n, &mpp->queue->mmu_link, link) {
+	list_for_each_entry_safe(loop, n, &mpp->queue->mmu_list, link) {
 		if (loop->base_addr[0] == pdev->resource[0].start) {
 			iommu = loop;
 			break;
@@ -1685,9 +1702,9 @@ int px30_workaround_combo_init(struct mpp_dev *mpp)
 		iommu->grf_val = mpp->grf_info->val & MPP_GRF_VAL_MASK;
 		iommu->dte_addr =  mpp_iommu_get_dte_addr(iommu);
 		INIT_LIST_HEAD(&iommu->link);
-		mutex_lock(&mpp->queue->lock);
-		list_add_tail(&iommu->link, &mpp->queue->mmu_link);
-		mutex_unlock(&mpp->queue->lock);
+		mutex_lock(&mpp->queue->mmu_lock);
+		list_add_tail(&iommu->link, &mpp->queue->mmu_list);
+		mutex_unlock(&mpp->queue->mmu_lock);
 	}
 	mpp->iommu_info->iommu = iommu;
 
@@ -1715,7 +1732,7 @@ int px30_workaround_combo_switch_grf(struct mpp_dev *mpp)
 		rockchip_pmu_pd_on(mpp->dev);
 	mpp->hw_ops->power_on(mpp);
 
-	list_for_each_entry_safe(loop, n, &mpp->queue->mmu_link, link) {
+	list_for_each_entry_safe(loop, n, &mpp->queue->mmu_list, link) {
 		/* update iommu parameters */
 		if (loop->grf_val == curr_val)
 			loop->is_paged = mpp_iommu_is_paged(loop);
diff --git a/drivers/video/rockchip/mpp/mpp_common.h b/drivers/video/rockchip/mpp/mpp_common.h
index ae22bdf7472a..ed7f0c15dfe1 100644
--- a/drivers/video/rockchip/mpp/mpp_common.h
+++ b/drivers/video/rockchip/mpp/mpp_common.h
@@ -190,7 +190,7 @@ struct mpp_dev {
 	struct mpp_iommu_info *iommu_info;
 
 	atomic_t reset_request;
-	atomic_t total_running;
+	atomic_t task_count;
 	/* task for work queue */
 	struct workqueue_struct *workq;
 	/* current task in running */
@@ -213,20 +213,20 @@ struct mpp_session {
 	struct mpp_dev *mpp;
 	struct mpp_dma_session *dma;
 
-	/* session tasks pending list lock */
+	/* lock for session task pending list */
 	struct mutex pending_lock;
-	/* session tasks register list lock */
+	/* lock for session task register list */
 	struct mutex reg_lock;
-	/* session tasks done list lock */
+	/* lock for session task done list */
 	struct mutex done_lock;
 	/* task pending list in session */
-	struct list_head pending;
+	struct list_head pending_list;
 
 	DECLARE_KFIFO_PTR(done_fifo, struct mpp_task *);
 
 	wait_queue_head_t wait;
 	pid_t pid;
-	atomic_t task_running;
+	atomic_t task_count;
 	atomic_t release_request;
 	/* trans info set by user */
 	int trans_count;
@@ -238,10 +238,12 @@ struct mpp_task {
 	/* context belong to */
 	struct mpp_session *session;
 
-	/* link to session pending */
+	/* link to session pending_list */
 	struct list_head session_link;
-	/* link to taskqueue node pending */
-	struct list_head queue_link;
+	/* link to taskqueue node pending_list */
+	struct list_head pending_link;
+	/* link to taskqueue node running_list */
+	struct list_head running_link;
 	/* The DMA buffer used in this task */
 	struct list_head mem_region_list;
 
@@ -253,17 +255,23 @@ struct mpp_task {
 };
 
 struct mpp_taskqueue {
-	/* taskqueue structure global lock */
-	struct mutex lock;
+	/* lock for trigger work */
+	struct mutex work_lock;
 	/* work for taskqueue */
 	struct work_struct work;
 
-	struct list_head pending;
-	atomic_t running;
-	struct mpp_task *cur_task;
+	/* lock for pending list */
+	struct mutex pending_lock;
+	struct list_head pending_list;
+	/* lock for running list */
+	struct mutex running_lock;
+	struct list_head running_list;
+
+	/* point to MPP Service */
 	struct mpp_service *srv;
-	/* link to mmu iommu node */
-	struct list_head mmu_link;
+	/* lock for mmu list */
+	struct mutex mmu_lock;
+	struct list_head mmu_list;
 };
 
 struct mpp_reset_clk {
@@ -342,7 +350,7 @@ struct mpp_hw_ops {
 struct mpp_dev_ops {
 	void *(*alloc_task)(struct mpp_session *session,
 			    struct mpp_task_msgs *msgs);
-	int (*prepare)(struct mpp_dev *mpp, struct mpp_task *task);
+	void *(*prepare)(struct mpp_dev *mpp, struct mpp_task *task);
 	int (*run)(struct mpp_dev *mpp, struct mpp_task *task);
 	int (*irq)(struct mpp_dev *mpp);
 	int (*isr)(struct mpp_dev *mpp);
diff --git a/drivers/video/rockchip/mpp/mpp_rkvdec.c b/drivers/video/rockchip/mpp/mpp_rkvdec.c
index f45e21db52b3..8399e56e2075 100644
--- a/drivers/video/rockchip/mpp/mpp_rkvdec.c
+++ b/drivers/video/rockchip/mpp/mpp_rkvdec.c
@@ -852,21 +852,6 @@ fail:
 	return NULL;
 }
 
-static int rkvdec_prepare(struct mpp_dev *mpp,
-			  struct mpp_task *task)
-{
-	struct rkvdec_dev *dec = to_rkvdec_dev(mpp);
-
-	if (dec->state == RKVDEC_STATE_NORMAL)
-		return -EINVAL;
-	/*
-	 * Don't do soft reset before running or you will meet 0x00408322
-	 * if you will decode a HEVC stream. Different error for the AVC.
-	 */
-
-	return 0;
-}
-
 static int rkvdec_run(struct mpp_dev *mpp,
 		      struct mpp_task *mpp_task)
 {
@@ -1618,7 +1603,6 @@ static struct mpp_hw_ops rkvdec_3368_hw_ops = {
 
 static struct mpp_dev_ops rkvdec_v1_dev_ops = {
 	.alloc_task = rkvdec_alloc_task,
-	.prepare = rkvdec_prepare,
 	.run = rkvdec_run,
 	.irq = rkvdec_irq,
 	.isr = rkvdec_isr,
@@ -1640,7 +1624,6 @@ static struct mpp_hw_ops rkvdec_3328_hw_ops = {
 
 static struct mpp_dev_ops rkvdec_3328_dev_ops = {
 	.alloc_task = rkvdec_alloc_task,
-	.prepare = rkvdec_prepare,
 	.run = rkvdec_3328_run,
 	.irq = rkvdec_irq,
 	.isr = rkvdec_isr,
@@ -1796,7 +1779,7 @@ static void rkvdec_shutdown(struct platform_device *pdev)
 
 	atomic_inc(&mpp->srv->shutdown_request);
 	ret = readx_poll_timeout(atomic_read,
-				 &mpp->total_running,
+				 &mpp->task_count,
 				 val, val == 0, 20000, 200000);
 	if (ret == -ETIMEDOUT)
 		dev_err(dev, "wait total running time out\n");
diff --git a/drivers/video/rockchip/mpp/mpp_rkvenc.c b/drivers/video/rockchip/mpp/mpp_rkvenc.c
index 821a4196c22f..4ee44542cd00 100644
--- a/drivers/video/rockchip/mpp/mpp_rkvenc.c
+++ b/drivers/video/rockchip/mpp/mpp_rkvenc.c
@@ -335,12 +335,6 @@ fail:
 	return NULL;
 }
 
-static int rkvenc_prepare(struct mpp_dev *mpp,
-			  struct mpp_task *task)
-{
-	return -EINVAL;
-}
-
 static int rkvenc_write_req_l2(struct mpp_dev *mpp,
 			       u32 *regs,
 			       u32 start_idx, u32 end_idx)
@@ -762,7 +756,6 @@ static struct mpp_hw_ops rkvenc_hw_ops = {
 
 static struct mpp_dev_ops rkvenc_dev_ops = {
 	.alloc_task = rkvenc_alloc_task,
-	.prepare = rkvenc_prepare,
 	.run = rkvenc_run,
 	.irq = rkvenc_irq,
 	.isr = rkvenc_isr,
@@ -860,7 +853,7 @@ static void rkvenc_shutdown(struct platform_device *pdev)
 
 	atomic_inc(&mpp->srv->shutdown_request);
 	ret = readx_poll_timeout(atomic_read,
-				 &mpp->total_running,
+				 &mpp->task_count,
 				 val, val == 0, 1000, 200000);
 	if (ret == -ETIMEDOUT)
 		dev_err(dev, "wait total running time out\n");
diff --git a/drivers/video/rockchip/mpp/mpp_vdpu1.c b/drivers/video/rockchip/mpp/mpp_vdpu1.c
index 6756077a9957..c7fdbe368dfe 100644
--- a/drivers/video/rockchip/mpp/mpp_vdpu1.c
+++ b/drivers/video/rockchip/mpp/mpp_vdpu1.c
@@ -391,12 +391,6 @@ fail:
 	return NULL;
 }
 
-static int vdpu_prepare(struct mpp_dev *mpp,
-			struct mpp_task *task)
-{
-	return -EINVAL;
-}
-
 static int vdpu_run(struct mpp_dev *mpp,
 		    struct mpp_task *mpp_task)
 {
@@ -769,7 +763,6 @@ static struct mpp_hw_ops vdpu_3368_hw_ops = {
 
 static struct mpp_dev_ops vdpu_v1_dev_ops = {
 	.alloc_task = vdpu_alloc_task,
-	.prepare = vdpu_prepare,
 	.run = vdpu_run,
 	.irq = vdpu_irq,
 	.isr = vdpu_isr,
@@ -903,7 +896,7 @@ static void vdpu_shutdown(struct platform_device *pdev)
 
 	atomic_inc(&mpp->srv->shutdown_request);
 	ret = readx_poll_timeout(atomic_read,
-				 &mpp->total_running,
+				 &mpp->task_count,
 				 val, val == 0, 20000, 200000);
 	if (ret == -ETIMEDOUT)
 		dev_err(dev, "wait total running time out\n");
diff --git a/drivers/video/rockchip/mpp/mpp_vdpu2.c b/drivers/video/rockchip/mpp/mpp_vdpu2.c
index f8eb29d4ab04..c5b6f31cb23e 100644
--- a/drivers/video/rockchip/mpp/mpp_vdpu2.c
+++ b/drivers/video/rockchip/mpp/mpp_vdpu2.c
@@ -343,12 +343,6 @@ fail:
 	return NULL;
 }
 
-static int vdpu_prepare(struct mpp_dev *mpp,
-			struct mpp_task *task)
-{
-	return -EINVAL;
-}
-
 static int vdpu_run(struct mpp_dev *mpp,
 		    struct mpp_task *mpp_task)
 {
@@ -669,7 +663,6 @@ static struct mpp_hw_ops vdpu_px30_hw_ops = {
 
 static struct mpp_dev_ops vdpu_v2_dev_ops = {
 	.alloc_task = vdpu_alloc_task,
-	.prepare = vdpu_prepare,
 	.run = vdpu_run,
 	.irq = vdpu_irq,
 	.isr = vdpu_isr,
@@ -781,7 +774,7 @@ static void vdpu_shutdown(struct platform_device *pdev)
 
 	atomic_inc(&mpp->srv->shutdown_request);
 	ret = readx_poll_timeout(atomic_read,
-				 &mpp->total_running,
+				 &mpp->task_count,
 				 val, val == 0, 20000, 200000);
 	if (ret == -ETIMEDOUT)
 		dev_err(dev, "wait total running time out\n");
diff --git a/drivers/video/rockchip/mpp/mpp_vepu1.c b/drivers/video/rockchip/mpp/mpp_vepu1.c
index eaf29af47882..6d0bb2843868 100644
--- a/drivers/video/rockchip/mpp/mpp_vepu1.c
+++ b/drivers/video/rockchip/mpp/mpp_vepu1.c
@@ -260,12 +260,6 @@ fail:
 	return NULL;
 }
 
-static int vepu_prepare(struct mpp_dev *mpp,
-			struct mpp_task *task)
-{
-	return -EINVAL;
-}
-
 static int vepu_run(struct mpp_dev *mpp,
 		    struct mpp_task *mpp_task)
 {
@@ -558,7 +552,6 @@ static struct mpp_hw_ops vepu_v1_hw_ops = {
 
 static struct mpp_dev_ops vepu_v1_dev_ops = {
 	.alloc_task = vepu_alloc_task,
-	.prepare = vepu_prepare,
 	.run = vepu_run,
 	.irq = vepu_irq,
 	.isr = vepu_isr,
@@ -652,7 +645,7 @@ static void vepu_shutdown(struct platform_device *pdev)
 
 	atomic_inc(&mpp->srv->shutdown_request);
 	ret = readx_poll_timeout(atomic_read,
-				 &mpp->total_running,
+				 &mpp->task_count,
 				 val, val == 0, 20000, 200000);
 	if (ret == -ETIMEDOUT)
 		dev_err(dev, "wait total running time out\n");
diff --git a/drivers/video/rockchip/mpp/mpp_vepu2.c b/drivers/video/rockchip/mpp/mpp_vepu2.c
index a09f42c5b209..fc4f305a1ae6 100644
--- a/drivers/video/rockchip/mpp/mpp_vepu2.c
+++ b/drivers/video/rockchip/mpp/mpp_vepu2.c
@@ -269,12 +269,6 @@ fail:
 	return NULL;
 }
 
-static int vepu_prepare(struct mpp_dev *mpp,
-			struct mpp_task *task)
-{
-	return -EINVAL;
-}
-
 static int vepu_run(struct mpp_dev *mpp,
 		    struct mpp_task *mpp_task)
 {
@@ -585,7 +579,6 @@ static struct mpp_hw_ops vepu_px30_hw_ops = {
 
 static struct mpp_dev_ops vepu_v2_dev_ops = {
 	.alloc_task = vepu_alloc_task,
-	.prepare = vepu_prepare,
 	.run = vepu_run,
 	.irq = vepu_irq,
 	.isr = vepu_isr,
@@ -691,7 +684,7 @@ static void vepu_shutdown(struct platform_device *pdev)
 
 	atomic_inc(&mpp->srv->shutdown_request);
 	ret = readx_poll_timeout(atomic_read,
-				 &mpp->total_running,
+				 &mpp->task_count,
 				 val, val == 0, 20000, 200000);
 	if (ret == -ETIMEDOUT)
 		dev_err(dev, "wait total running time out\n");