github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

video: rockchip: vpu: do vpu_reset after err immediately

Browse Source 
1. do vpu_reset immediately when err occur
2. fix power ops bug

Change-Id: I939101167d84d18f1b73b3b3da74a05093f35d20
Signed-off-by: Jung Zhao <jung.zhao@rock-chips.com>
This commit is contained in:
Jung Zhao 2018-01-11 16:54:36 +08:00 committed by Tao Huang
parent 87b681f969
commit bdbe4855fb
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/video/rockchip/vcodec/vcodec_service.c
View File

@ -1568,6 +1568,7 @@ static void reg_copy_to_hw(struct vpu_subdev_data *data, struct vpu_reg *reg)
static void try_set_reg(struct vpu_subdev_data *data)
{
struct vpu_service_info *pservice = data->pservice;
int reset_request = atomic_read(&pservice->reset_request);
vpu_debug_enter();
@ -1576,18 +1577,23 @@ static void try_set_reg(struct vpu_subdev_data *data)
mutex_unlock(&pservice->shutdown_lock);
return;
}
if (reset_request) {
vpu_service_power_on(data, pservice);
vpu_reset(data);
}
if (!list_empty(&pservice->waiting)) {
struct vpu_reg *reg_codec = pservice->reg_codec;
struct vpu_reg *reg_pproc = pservice->reg_pproc;
int can_set = 0;
bool change_able = (reg_codec == NULL) && (reg_pproc == NULL);
int reset_request = atomic_read(&pservice->reset_request);
struct vpu_reg *reg = list_entry(pservice->waiting.next,
struct vpu_reg, status_link);
vpu_service_power_on(data, pservice);
if (change_able || !reset_request) {
if (change_able) {
switch (reg->type) {
case VPU_ENC: {
if (change_able)
@ -1629,14 +1635,6 @@ static void try_set_reg(struct vpu_subdev_data *data)
}
}
/* then check reset request */
if (reset_request && !change_able)
reset_request = 0;
/* do reset before setting registers */
if (reset_request)
vpu_reset(data);
if (can_set) {
reg_from_wait_to_run(pservice, reg);
reg_copy_to_hw(reg->data, reg);
@ -1811,6 +1809,9 @@ static long vpu_service_ioctl(struct file *filp, unsigned int cmd,
!list_empty(&session->done),
VPU_TIMEOUT_DELAY);
while (atomic_read(&pservice->reset_request))
msleep(10);
if (!list_empty(&session->done)) {
if (ret < 0)
vpu_err("warning: pid %d wait task error ret %d\n",
@ -2605,7 +2606,7 @@ static struct vcodec_hw_var rk3328_vpucombo_var = {
.device_type = VCODEC_DEVICE_TYPE_VPUC,
.name = "vpu-combo",
.pmu_type = -1,
.ops = &hw_ops_default,
.ops = NULL,
.init = NULL,
.config = NULL,
};
@ -2615,7 +2616,7 @@ static struct vcodec_hw_var vpu_device_info = {
.device_type = VCODEC_DEVICE_TYPE_VPUX,
.name = "vpu-service",
.pmu_type = -1,
.ops = &hw_ops_default,
.ops = NULL,
.init = NULL,
.config = NULL,
};
@ -2624,7 +2625,7 @@ static struct vcodec_hw_var vpu_combo_device_info = {
.device_type = VCODEC_DEVICE_TYPE_VPUC,
.name = "vpu-combo",
.pmu_type = -1,
.ops = &hw_ops_default,
.ops = NULL,
.init = NULL,
.config = NULL,
};
@ -2633,7 +2634,7 @@ static struct vcodec_hw_var hevc_device_info = {
.device_type = VCODEC_DEVICE_TYPE_HEVC,
.name = "hevc-service",
.pmu_type = -1,
.ops = &hw_ops_default,
.ops = NULL,
.init = NULL,
.config = NULL,
};
@ -2642,7 +2643,7 @@ static struct vcodec_hw_var rkvd_device_info = {
.device_type = VCODEC_DEVICE_TYPE_RKVD,
.name = "rkvdec",
.pmu_type = -1,
.ops = &hw_ops_default,
.ops = NULL,
.init = NULL,
.config = NULL,
};
@ -2651,7 +2652,9 @@ static void vcodec_set_hw_ops(struct vpu_service_info *pservice)
{
if (pservice->hw_var) {
pservice->hw_ops = pservice->hw_var->ops;
} else {
}
if (!pservice->hw_ops) {
pservice->hw_ops = &hw_ops_default;
if (of_machine_is_compatible("rockchip,rk3328") ||
of_machine_is_compatible("rockchip,rk3228") ||