TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msm: camera: Use a new reset_complete per VFE

Browse Source 
Each VFE can be reset separate from the other. As this can happen during
the reset of the other, it is not reliable to wait on a single
completion.

Also this change completes VFE1 reset_complete on reset done IRQ.

Change-Id: I37177df4d15f04a7fad81b0f62544cd7b50e9d92
Signed-off-by: Vladislav Hristov <vhrist@codeaurora.org>
This commit is contained in:
Vladislav Hristov
2013-03-01 12:06:01 -08:00
committed by Iliyan Malchev
parent 0eb5e8fab2
commit a2ef977f73
2 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
View File

@@ -93,8 +93,8 @@ static int msm_ispif_intf_reset(struct ispif_device *ispif,
unsigned long flags;
spin_lock_irqsave(&ispif->auto_complete_lock, flags);
ispif->wait_timeout = 0;
init_completion(&ispif->reset_complete);
ispif->wait_timeout[params->vfe_intf] = 0;
init_completion(&ispif->reset_complete[params->vfe_intf]);
spin_unlock_irqrestore(&ispif->auto_complete_lock, flags);
if (params->vfe_intf == VFE0)
@@ -102,14 +102,15 @@ static int msm_ispif_intf_reset(struct ispif_device *ispif,
else
msm_camera_io_w(data, ispif->base +
ISPIF_RST_CMD_1_ADDR);
lrc = wait_for_completion_interruptible_timeout(
&ispif->reset_complete, jiffes);
&ispif->reset_complete[params->vfe_intf], jiffes);
if (lrc < 0 || !lrc) {
pr_err("%s: wait timeout ret = %ld\n", __func__, lrc);
rc = -EIO;
spin_lock_irqsave(&ispif->auto_complete_lock, flags);
ispif->wait_timeout = 1;
ispif->wait_timeout[params->vfe_intf] = 1;
spin_unlock_irqrestore(
&ispif->auto_complete_lock, flags);
}
@@ -125,8 +126,12 @@ static int msm_ispif_reset(struct ispif_device *ispif)
unsigned long flags;
spin_lock_irqsave(&ispif->auto_complete_lock, flags);
ispif->wait_timeout = 0;
init_completion(&ispif->reset_complete);
ispif->wait_timeout[VFE0] = 0;
init_completion(&ispif->reset_complete[VFE0]);
if (ispif->csid_version >= CSID_VERSION_V3) {
ispif->wait_timeout[VFE1] = 0;
init_completion(&ispif->reset_complete[VFE1]);
}
spin_unlock_irqrestore(&ispif->auto_complete_lock, flags);
BUG_ON(!ispif);
@@ -135,22 +140,40 @@ static int msm_ispif_reset(struct ispif_device *ispif)
msm_camera_io_w(ISPIF_RST_CMD_MASK, ispif->base + ISPIF_RST_CMD_ADDR);
if (ispif->csid_version >= CSID_VERSION_V3)
msm_camera_io_w_mb(ISPIF_RST_CMD_1_MASK, ispif->base +
ISPIF_RST_CMD_1_ADDR);
lrc = wait_for_completion_interruptible_timeout(
&ispif->reset_complete, jiffes);
&ispif->reset_complete[VFE0], jiffes);
if (lrc < 0 || !lrc) {
pr_err("%s: wait timeout ret = %ld\n", __func__, lrc);
rc = -EIO;
spin_lock_irqsave(&ispif->auto_complete_lock, flags);
ispif->wait_timeout = 1;
ispif->wait_timeout[VFE0] = 1;
spin_unlock_irqrestore(&ispif->auto_complete_lock, flags);
goto end;
}
if (ispif->csid_version >= CSID_VERSION_V3) {
msm_camera_io_w_mb(ISPIF_RST_CMD_1_MASK, ispif->base +
ISPIF_RST_CMD_1_ADDR);
lrc = wait_for_completion_interruptible_timeout(
&ispif->reset_complete[VFE1], jiffes);
if (lrc < 0 || !lrc) {
pr_err("%s: wait timeout ret = %ld\n", __func__, lrc);
rc = -EIO;
spin_lock_irqsave(&ispif->auto_complete_lock, flags);
ispif->wait_timeout[VFE1] = 1;
spin_unlock_irqrestore(&ispif->auto_complete_lock,
flags);
}
}
end:
return rc;
}
@@ -591,8 +614,8 @@ static inline void msm_ispif_read_irq_status(struct ispif_irq_status *out,
if (out[VFE0].ispifIrqStatus0 & RESET_DONE_IRQ) {
unsigned long flags;
spin_lock_irqsave(&ispif->auto_complete_lock, flags);
if (ispif->wait_timeout == 0)
complete(&ispif->reset_complete);
if (ispif->wait_timeout[VFE0] == 0)
complete(&ispif->reset_complete[VFE0]);
spin_unlock_irqrestore(
&ispif->auto_complete_lock, flags);
}
@@ -627,6 +650,16 @@ static inline void msm_ispif_read_irq_status(struct ispif_irq_status *out,
msm_camera_io_w_mb(out[VFE1].ispifIrqStatus2,
ispif->base + ISPIF_IRQ_CLEAR_2_ADDR + 0x200);
if (out[VFE1].ispifIrqStatus0 & RESET_DONE_IRQ) {
unsigned long flags;
spin_lock_irqsave(&ispif->auto_complete_lock, flags);
if (ispif->wait_timeout[VFE1] == 0)
complete(&ispif->reset_complete[VFE1]);
spin_unlock_irqrestore(
&ispif->auto_complete_lock, flags);
}
if (out[VFE1].ispifIrqStatus0 & PIX_INTF_0_OVERFLOW_IRQ)
pr_err("%s: VFE1 pix0 overflow.\n", __func__);
@@ -899,6 +932,7 @@ static int __devinit ispif_probe(struct platform_device *pdev)
{
int rc;
struct ispif_device *ispif;
int i;
ispif = kzalloc(sizeof(struct ispif_device), GFP_KERNEL);
if (!ispif) {
@@ -957,7 +991,9 @@ static int __devinit ispif_probe(struct platform_device *pdev)
ispif->ispif_state = ISPIF_POWER_DOWN;
ispif->open_cnt = 0;
spin_lock_init(&ispif->auto_complete_lock);
ispif->wait_timeout = 0;
for (i = 0; i < VFE_MAX; i++)
ispif->wait_timeout[i] = 0;
return 0;
error:

4
drivers/media/platform/msm/camera_v2/ispif/msm_ispif.h
View File

@@ -47,9 +47,9 @@ struct ispif_device {
void __iomem *base;
struct mutex mutex;
uint8_t start_ack_pending;
struct completion reset_complete;
struct completion reset_complete[VFE_MAX];
spinlock_t auto_complete_lock;
uint8_t wait_timeout;
uint8_t wait_timeout[VFE_MAX];
uint32_t csid_version;
int enb_dump_reg;
uint32_t open_cnt;