video: rockchip: rga3: fix irq_handler crash when hardware reset

Signed-off-by: Yu Qiaowei <[email protected]>
Change-Id: Iee7f20510172fc89c6640503926584a982d2837c

Author: Yu Qiaowei

drivers/video/rockchip/rga3/rga2_reg_info.c

@@ -3124,6 +3124,13 @@ static int rga2_irq(struct rga_scheduler_t *scheduler)
 {
 	struct rga_job *job = scheduler->running_job;
 
+	/*clear INTR */
+	rga_write(rga_read(RGA2_INT, scheduler) |
+		  (m_RGA2_INT_ERROR_CLEAR_MASK |
+		   m_RGA2_INT_ALL_CMD_DONE_INT_CLEAR | m_RGA2_INT_NOW_CMD_DONE_INT_CLEAR |
+		   m_RGA2_INT_LINE_RD_CLEAR | m_RGA2_INT_LINE_WR_CLEAR),
+		  RGA2_INT, scheduler);
+
 	/* The hardware interrupt top-half don't need to lock the scheduler. */
 	if (job == NULL)
 		return IRQ_HANDLED;
@@ -3151,13 +3158,6 @@ static int rga2_irq(struct rga_scheduler_t *scheduler)
 		scheduler->ops->soft_reset(scheduler);
 	}
 
-	/*clear INTR */
-	rga_write(rga_read(RGA2_INT, scheduler) |
-		  (m_RGA2_INT_ERROR_CLEAR_MASK |
-		   m_RGA2_INT_ALL_CMD_DONE_INT_CLEAR | m_RGA2_INT_NOW_CMD_DONE_INT_CLEAR |
-		   m_RGA2_INT_LINE_RD_CLEAR | m_RGA2_INT_LINE_WR_CLEAR),
-		  RGA2_INT, scheduler);
-
 	return IRQ_WAKE_THREAD;
 }
 

drivers/video/rockchip/rga3/rga3_reg_info.c

@@ -2155,6 +2155,10 @@ static int rga3_irq(struct rga_scheduler_t *scheduler)
 {
 	struct rga_job *job = scheduler->running_job;
 
+	/*clear INTR */
+	rga_write(m_RGA3_INT_FRM_DONE | m_RGA3_INT_CMD_LINE_FINISH | m_RGA3_INT_ERROR_MASK,
+		  RGA3_INT_CLR, scheduler);
+
 	if (job == NULL)
 		return IRQ_HANDLED;
 
@@ -2179,10 +2183,6 @@ static int rga3_irq(struct rga_scheduler_t *scheduler)
 		scheduler->ops->soft_reset(scheduler);
 	}
 
-	/*clear INTR */
-	rga_write(m_RGA3_INT_FRM_DONE | m_RGA3_INT_CMD_LINE_FINISH | m_RGA3_INT_ERROR_MASK,
-		  RGA3_INT_CLR, scheduler);
-
 	return IRQ_WAKE_THREAD;
 }
 

drivers/video/rockchip/rga3/rga_drv.c

@@ -1123,11 +1123,26 @@ static irqreturn_t rga_irq_handler(int irq, void *data)
 {
 	irqreturn_t irq_ret = IRQ_NONE;
 	struct rga_scheduler_t *scheduler = data;
+	ktime_t timestamp = ktime_get();
 
-	scheduler->running_job->timestamp.hw_done = ktime_get();
+	spin_lock(&scheduler->irq_lock);
 
-	if (scheduler->ops->irq)
+	if (scheduler->ops->irq) {
 		irq_ret = scheduler->ops->irq(scheduler);
+		if (irq_ret == IRQ_HANDLED) {
+			spin_unlock(&scheduler->irq_lock);
+			return irq_ret;
+		}
+	}
+
+	if (scheduler->running_job == NULL) {
+		spin_unlock(&scheduler->irq_lock);
+		return IRQ_HANDLED;
+	}
+
+	scheduler->running_job->timestamp.hw_done = timestamp;
+
+	spin_unlock(&scheduler->irq_lock);
 
 	return irq_ret;
 }