evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: vidc: fix the interrupt miss issue from video hardware"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-24 06:13:35 -08:00 • committed by Gerrit - the friendly Code Review server
commit 8c41e4e6b1
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/platform/msm/vidc/msm_vidc_common.c
View file

@ -5359,10 +5359,10 @@ static void msm_comm_print_debug_info(struct msm_vidc_inst *inst)
dprintk(VIDC_ERR, "Venus core frequency = %lu", dprintk(VIDC_ERR, "Venus core frequency = %lu",
msm_comm_get_clock_rate(core)); msm_comm_get_clock_rate(core));
mutex_lock(&core->lock);
dprintk(VIDC_ERR, "Printing instance info that caused Error\n"); dprintk(VIDC_ERR, "Printing instance info that caused Error\n");
msm_comm_print_inst_info(inst); msm_comm_print_inst_info(inst);
dprintk(VIDC_ERR, "Printing remaining instances info\n"); dprintk(VIDC_ERR, "Printing remaining instances info\n");
mutex_lock(&core->lock);
list_for_each_entry(temp, &core->instances, list) { list_for_each_entry(temp, &core->instances, list) {
/* inst already printed above. Hence don't repeat.*/ /* inst already printed above. Hence don't repeat.*/
if (temp == inst) if (temp == inst)

14
drivers/media/platform/msm/vidc/venus_hfi.c
View file

@ -75,7 +75,7 @@ const struct msm_vidc_gov_data DEFAULT_BUS_VOTE = {
.imem_size = 0, .imem_size = 0,
}; };
const int max_packets = 250; const int max_packets = 1000;
static void venus_hfi_pm_handler(struct work_struct *work); static void venus_hfi_pm_handler(struct work_struct *work);
static DECLARE_DELAYED_WORK(venus_hfi_pm_work, venus_hfi_pm_handler); static DECLARE_DELAYED_WORK(venus_hfi_pm_work, venus_hfi_pm_handler);
@ -3576,6 +3576,7 @@ static void venus_hfi_core_work_handler(struct work_struct *work)
struct venus_hfi_device *device = list_first_entry( struct venus_hfi_device *device = list_first_entry(
&hal_ctxt.dev_head, struct venus_hfi_device, list); &hal_ctxt.dev_head, struct venus_hfi_device, list);
int num_responses = 0, i = 0; int num_responses = 0, i = 0;
u32 intr_status;
mutex_lock(&device->lock); mutex_lock(&device->lock);
@ -3601,10 +3602,9 @@ static void venus_hfi_core_work_handler(struct work_struct *work)
num_responses = __response_handler(device); num_responses = __response_handler(device);
err_no_work: err_no_work:
/* We need re-enable the irq which was disabled in ISR handler */
if (!(device->intr_status & VIDC_WRAPPER_INTR_STATUS_A2HWD_BMSK))
enable_irq(device->hal_data->irq);
/* Keep the interrupt status before releasing device lock */
intr_status = device->intr_status;
mutex_unlock(&device->lock); mutex_unlock(&device->lock);
/* /*
@ -3619,6 +3619,10 @@ err_no_work:
device->callback(r->response_type, &r->response); device->callback(r->response_type, &r->response);
} }
/* We need re-enable the irq which was disabled in ISR handler */
if (!(intr_status & VIDC_WRAPPER_INTR_STATUS_A2HWD_BMSK))
enable_irq(device->hal_data->irq);
/* /*
* XXX: Don't add any code beyond here. Reacquiring locks after release * XXX: Don't add any code beyond here. Reacquiring locks after release
* it above doesn't guarantee the atomicity that we're aiming for. * it above doesn't guarantee the atomicity that we're aiming for.
@ -4548,7 +4552,7 @@ static struct venus_hfi_device *__add_device(u32 device_id,
} }
hdevice->response_pkt = kmalloc_array(max_packets, hdevice->response_pkt = kmalloc_array(max_packets,
sizeof(*hdevice->response_pkt), GFP_TEMPORARY); sizeof(*hdevice->response_pkt), GFP_KERNEL);
if (!hdevice->response_pkt) { if (!hdevice->response_pkt) {
dprintk(VIDC_ERR, "failed to allocate response_pkt\n"); dprintk(VIDC_ERR, "failed to allocate response_pkt\n");
goto err_cleanup; goto err_cleanup;