|
| 1 | +diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c |
| 2 | +index 1d1e9bfef8e9..62ca88e72570 100644 |
| 3 | +--- a/drivers/media/platform/rockchip/rkvdec/rkvdec.c |
| 4 | ++++ b/drivers/media/platform/rockchip/rkvdec/rkvdec.c |
| 5 | +@@ -11,6 +11,7 @@ |
| 6 | + |
| 7 | + #include <linux/hw_bitfield.h> |
| 8 | + #include <linux/clk.h> |
| 9 | ++#include <linux/delay.h> |
| 10 | + #include <linux/genalloc.h> |
| 11 | + #include <linux/interrupt.h> |
| 12 | + #include <linux/iommu.h> |
| 13 | +@@ -20,6 +21,8 @@ |
| 14 | + #include <linux/platform_device.h> |
| 15 | + #include <linux/pm.h> |
| 16 | + #include <linux/pm_runtime.h> |
| 17 | ++#include <linux/reset.h> |
| 18 | ++#include <linux/rockchip_pmu.h> |
| 19 | + #include <linux/slab.h> |
| 20 | + #include <linux/videodev2.h> |
| 21 | + #include <linux/workqueue.h> |
| 22 | +@@ -1095,6 +1098,11 @@ static void rkvdec_job_finish(struct rkvdec_ctx *ctx, |
| 23 | + struct rkvdec_dev *rkvdec = ctx->dev; |
| 24 | + |
| 25 | + pm_runtime_put_autosuspend(rkvdec->dev); |
| 26 | ++ |
| 27 | ++ if (result == VB2_BUF_STATE_ERROR && |
| 28 | ++ rkvdec->reset_mask == RESET_NONE) |
| 29 | ++ rkvdec->reset_mask |= RESET_SOFT; |
| 30 | ++ |
| 31 | + rkvdec_job_finish_no_pm(ctx, result); |
| 32 | + } |
| 33 | + |
| 34 | +@@ -1167,6 +1175,33 @@ static void rkvdec_device_run(void *priv) |
| 35 | + |
| 36 | + if (WARN_ON(!desc)) |
| 37 | + return; |
| 38 | ++ if (rkvdec->reset_mask != RESET_NONE) { |
| 39 | ++ |
| 40 | ++ if (rkvdec->reset_mask & RESET_SOFT) { |
| 41 | ++ writel(RKVDEC_SOFTRST_EN_P, |
| 42 | ++ rkvdec->regs + RKVDEC_REG_INTERRUPT); |
| 43 | ++ udelay(RKVDEC_RESET_DELAY); |
| 44 | ++ if (readl(rkvdec->regs + RKVDEC_REG_INTERRUPT) |
| 45 | ++ & RKVDEC_SOFTRESET_RDY) |
| 46 | ++ dev_info_ratelimited(rkvdec->dev, |
| 47 | ++ "softreset failed\n"); |
| 48 | ++ } |
| 49 | ++ |
| 50 | ++ if (rkvdec->reset_mask & RESET_HARD) { |
| 51 | ++ rockchip_pmu_idle_request(rkvdec->dev, true); |
| 52 | ++ ret = reset_control_assert(rkvdec->rstc); |
| 53 | ++ if (!ret) { |
| 54 | ++ udelay(RKVDEC_RESET_DELAY); |
| 55 | ++ ret = reset_control_deassert(rkvdec->rstc); |
| 56 | ++ } |
| 57 | ++ rockchip_pmu_idle_request(rkvdec->dev, false); |
| 58 | ++ if (ret) |
| 59 | ++ dev_notice_ratelimited(rkvdec->dev, |
| 60 | ++ "hardreset failed\n"); |
| 61 | ++ } |
| 62 | ++ rkvdec->reset_mask = RESET_NONE; |
| 63 | ++ pm_runtime_suspend(rkvdec->dev); |
| 64 | ++ } |
| 65 | + |
| 66 | + ret = pm_runtime_resume_and_get(rkvdec->dev); |
| 67 | + if (ret < 0) { |
| 68 | +@@ -1451,6 +1486,11 @@ static irqreturn_t rk3399_irq_handler(struct rkvdec_ctx *ctx) |
| 69 | + rkvdec_iommu_restore(rkvdec); |
| 70 | + } |
| 71 | + |
| 72 | ++ if (state == VB2_BUF_STATE_ERROR) { |
| 73 | ++ rkvdec->reset_mask |= (status & RKVDEC_ERR_MASK) ? |
| 74 | ++ RESET_HARD : RESET_SOFT; |
| 75 | ++ } |
| 76 | ++ |
| 77 | + if (cancel_delayed_work(&rkvdec->watchdog_work)) |
| 78 | + rkvdec_job_finish(ctx, state); |
| 79 | + |
| 80 | +@@ -1606,6 +1646,7 @@ static void rkvdec_watchdog_func(struct work_struct *work) |
| 81 | + ctx = v4l2_m2m_get_curr_priv(rkvdec->m2m_dev); |
| 82 | + if (ctx) { |
| 83 | + dev_err(rkvdec->dev, "Frame processing timed out!\n"); |
| 84 | ++ rkvdec->reset_mask |= RESET_HARD; |
| 85 | + writel(RKVDEC_IRQ_DIS, rkvdec->regs + RKVDEC_REG_INTERRUPT); |
| 86 | + rkvdec_job_finish(ctx, VB2_BUF_STATE_ERROR); |
| 87 | + } |
| 88 | +@@ -1833,6 +1874,18 @@ static int rkvdec_probe(struct platform_device *pdev) |
| 89 | + if (!rkvdec->sram_pool && rkvdec->variant->num_rcb_sizes > 0) |
| 90 | + dev_info(&pdev->dev, "No sram node, RCB will be stored in RAM\n"); |
| 91 | + |
| 92 | ++ |
| 93 | ++ rkvdec->rstc = devm_reset_control_array_get(&pdev->dev, RESET_CONTROL_OPTIONAL_EXCLUSIVE); |
| 94 | ++ if (IS_ERR(rkvdec->rstc)) { |
| 95 | ++ dev_err(&pdev->dev, |
| 96 | ++ "get resets failed %ld\n", PTR_ERR(rkvdec->rstc)); |
| 97 | ++ return PTR_ERR(rkvdec->rstc); |
| 98 | ++ } else { |
| 99 | ++ dev_dbg(&pdev->dev, |
| 100 | ++ "requested %d resets\n", |
| 101 | ++ reset_control_get_count(&pdev->dev)); |
| 102 | ++ } |
| 103 | ++ |
| 104 | + pm_runtime_set_autosuspend_delay(&pdev->dev, 100); |
| 105 | + pm_runtime_use_autosuspend(&pdev->dev); |
| 106 | + pm_runtime_enable(&pdev->dev); |
| 107 | +@@ -1869,9 +1922,9 @@ static void rkvdec_remove(struct platform_device *pdev) |
| 108 | + |
| 109 | + cancel_delayed_work_sync(&rkvdec->watchdog_work); |
| 110 | + |
| 111 | +- rkvdec_v4l2_cleanup(rkvdec); |
| 112 | +- pm_runtime_disable(&pdev->dev); |
| 113 | + pm_runtime_dont_use_autosuspend(&pdev->dev); |
| 114 | ++ pm_runtime_disable(&pdev->dev); |
| 115 | ++ rkvdec_v4l2_cleanup(rkvdec); |
| 116 | + |
| 117 | + if (rkvdec->empty_domain) |
| 118 | + iommu_domain_free(rkvdec->empty_domain); |
0 commit comments