shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: mpp: fix dec err in multi instance

Browse Source 
Attach iommu when hw running will be crash.
Therefore, just attach iommu once.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I46002e01542466e9084c51a49e3da6c3f2db2298
This commit is contained in:
Yandong Lin
2021-09-09 17:31:50 +08:00
committed by Tao Huang
parent 72f82d9b66
commit b2f36bd4ec
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/video/rockchip/mpp/mpp_rkvdec2_link.c
View File

@@ -1014,12 +1014,16 @@ static void rkvdec2_link_trigger_irq(struct mpp_dev *mpp)
rkvdec2_link_trigger_work(mpp);
}
static void rkvdec2_link_power_on(struct mpp_dev *mpp)
static int rkvdec2_link_power_on(struct mpp_dev *mpp)
{
struct rkvdec2_dev *dec = to_rkvdec2_dev(mpp);
struct rkvdec_link_dev *link_dec = dec->link_dec;
if (!atomic_xchg(&link_dec->power_enabled, 1)) {
if (mpp_iommu_attach(mpp->iommu_info)) {
dev_err(mpp->dev, "mpp_iommu_attach failed\n");
return -ENODATA;
}
pm_runtime_get_sync(mpp->dev);
pm_stay_awake(mpp->dev);
@@ -1031,6 +1035,7 @@ static void rkvdec2_link_power_on(struct mpp_dev *mpp)
link_dec->irq_enabled = 1;
}
}
return 0;
}
static void rkvdec2_link_power_off(struct mpp_dev *mpp)
@@ -1158,20 +1163,9 @@ static int mpp_task_queue(struct mpp_dev *mpp, struct mpp_task *task)
struct rkvdec_link_dev *link_dec = dec->link_dec;
u32 task_to_run = 0;
int slot_idx = 0;
int ret;
mpp_debug_enter();
/*
* for iommu share hardware, should attach to ensure
* working in current device
*/
ret = mpp_iommu_attach(mpp->iommu_info);
if (ret) {
dev_err(mpp->dev, "mpp_iommu_attach failed\n");
return -ENODATA;
}
rkvdec2_link_power_on(mpp);
mpp_time_record(task);
mpp_debug(DEBUG_TASK_INFO, "pid %d, start hw %s\n",