From fdbc0d26cc7cd0aa9c2d9f5d25b5baed99682a20 Mon Sep 17 00:00:00 2001 From: Rashi Bindra Date: Thu, 19 Jul 2018 12:40:52 +0530 Subject: [PATCH] msm: mdss: Change function from disbale_irq_nosync to disbale_irq Potential deadlock can happen while we disable irq and at the same time an irq is triggered to request for the same resource. Thus, it will pre-empt the spin-lock. Hence, change the function call to disbale_irq to prevent local interrupts. Change-Id: I7b80810b13660df8801533d418c78f2db75dd5b6 Signed-off-by: Rashi Bindra --- drivers/video/fbdev/msm/mdss_dsi_host.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_dsi_host.c b/drivers/video/fbdev/msm/mdss_dsi_host.c index 88f6b9040651..34cedaaa5864 100644 --- a/drivers/video/fbdev/msm/mdss_dsi_host.c +++ b/drivers/video/fbdev/msm/mdss_dsi_host.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. * * 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 @@ -2263,7 +2263,7 @@ static int mdss_dsi_cmd_dma_tx(struct mdss_dsi_ctrl_pdata *ctrl, /* clear CMD DMA and BTA_DONE isr only */ reg_val |= (DSI_INTR_CMD_DMA_DONE | DSI_INTR_BTA_DONE); MIPI_OUTP(ctrl->ctrl_base + 0x0110, reg_val); - mdss_dsi_disable_irq_nosync(ctrl, DSI_CMD_TERM); + mdss_dsi_disable_irq(ctrl, DSI_CMD_TERM); complete(&ctrl->dma_comp); pr_warn("%s: dma tx done but irq not triggered\n",