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

Merge "msm: camera: isp: Do not wait w/o interruptible"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-28 17:03:49 -08:00 • committed by Gerrit - the friendly Code Review server
commit b174cc4b07
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/platform/msm/camera_v2/isp/msm_isp47.c
View file

@ -764,7 +764,7 @@ long msm_vfe47_reset_hardware(struct vfe_device *vfe_dev,
} }
if (blocking_call) { if (blocking_call) {
rc = wait_for_completion_timeout( rc = wait_for_completion_interruptible_timeout(
&vfe_dev->reset_complete, msecs_to_jiffies(100)); &vfe_dev->reset_complete, msecs_to_jiffies(100));
if (rc <= 0) { if (rc <= 0) {
pr_err("%s:%d failed: reset timeout\n", __func__, pr_err("%s:%d failed: reset timeout\n", __func__,
@ -1931,7 +1931,7 @@ int msm_vfe47_axi_halt(struct vfe_device *vfe_dev,
init_completion(&vfe_dev->halt_complete); init_completion(&vfe_dev->halt_complete);
/* Halt AXI Bus Bridge */ /* Halt AXI Bus Bridge */
msm_camera_io_w_mb(0x1, vfe_dev->vfe_base + 0x400); msm_camera_io_w_mb(0x1, vfe_dev->vfe_base + 0x400);
rc = wait_for_completion_timeout( rc = wait_for_completion_interruptible_timeout(
&vfe_dev->halt_complete, msecs_to_jiffies(500)); &vfe_dev->halt_complete, msecs_to_jiffies(500));
if (rc <= 0) if (rc <= 0)
pr_err("%s:VFE%d halt timeout rc=%d\n", __func__, pr_err("%s:VFE%d halt timeout rc=%d\n", __func__,

10
drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -443,7 +443,7 @@ static int msm_ispif_reset_hw(struct ispif_device *ispif)
msm_camera_io_w(ISPIF_RST_CMD_MASK, msm_camera_io_w(ISPIF_RST_CMD_MASK,
ispif->base + ISPIF_RST_CMD_ADDR); ispif->base + ISPIF_RST_CMD_ADDR);
timeout = wait_for_completion_timeout( timeout = wait_for_completion_interruptible_timeout(
&ispif->reset_complete[VFE0], msecs_to_jiffies(500)); &ispif->reset_complete[VFE0], msecs_to_jiffies(500));
CDBG("%s: VFE0 done\n", __func__); CDBG("%s: VFE0 done\n", __func__);
@ -457,7 +457,7 @@ static int msm_ispif_reset_hw(struct ispif_device *ispif)
atomic_set(&ispif->reset_trig[VFE1], 1); atomic_set(&ispif->reset_trig[VFE1], 1);
msm_camera_io_w(ISPIF_RST_CMD_1_MASK, msm_camera_io_w(ISPIF_RST_CMD_1_MASK,
ispif->base + ISPIF_RST_CMD_1_ADDR); ispif->base + ISPIF_RST_CMD_1_ADDR);
timeout = wait_for_completion_timeout( timeout = wait_for_completion_interruptible_timeout(
&ispif->reset_complete[VFE1], &ispif->reset_complete[VFE1],
msecs_to_jiffies(500)); msecs_to_jiffies(500));
CDBG("%s: VFE1 done\n", __func__); CDBG("%s: VFE1 done\n", __func__);
@ -1120,7 +1120,7 @@ static int msm_ispif_restart_frame_boundary(struct ispif_device *ispif,
/* initiate reset of ISPIF */ /* initiate reset of ISPIF */
msm_camera_io_w(ISPIF_RST_CMD_MASK_RESTART, msm_camera_io_w(ISPIF_RST_CMD_MASK_RESTART,
ispif->base + ISPIF_RST_CMD_ADDR); ispif->base + ISPIF_RST_CMD_ADDR);
timeout = wait_for_completion_timeout( timeout = wait_for_completion_interruptible_timeout(
&ispif->reset_complete[VFE0], msecs_to_jiffies(500)); &ispif->reset_complete[VFE0], msecs_to_jiffies(500));
if (timeout <= 0) { if (timeout <= 0) {
pr_err("%s: VFE0 reset wait timeout\n", __func__); pr_err("%s: VFE0 reset wait timeout\n", __func__);
@ -1133,7 +1133,7 @@ static int msm_ispif_restart_frame_boundary(struct ispif_device *ispif,
atomic_set(&ispif->reset_trig[VFE1], 1); atomic_set(&ispif->reset_trig[VFE1], 1);
msm_camera_io_w(ISPIF_RST_CMD_1_MASK_RESTART, msm_camera_io_w(ISPIF_RST_CMD_1_MASK_RESTART,
ispif->base + ISPIF_RST_CMD_1_ADDR); ispif->base + ISPIF_RST_CMD_1_ADDR);
timeout = wait_for_completion_timeout( timeout = wait_for_completion_interruptible_timeout(
&ispif->reset_complete[VFE1], &ispif->reset_complete[VFE1],
msecs_to_jiffies(500)); msecs_to_jiffies(500));
if (timeout <= 0) { if (timeout <= 0) {