Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d60ffc05 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: use spin_lock_irqsave while checking the intr status"

parents fd52e44f 69c00fad

drivers/video/msm/mdss/mdss_mdp.c

+3 −2
Original line number Diff line number Diff line
@@ -585,11 +585,12 @@ void mdss_mdp_irq_disable(u32 intr_type, u32 intf_num) 
void mdss_mdp_intr_check_and_clear(u32 intr_type, u32 intf_num)

{

	u32 status, irq;

	unsigned long irq_flags;

	struct mdss_data_type *mdata = mdss_mdp_get_mdata();



	irq = mdss_mdp_irq_mask(intr_type, intf_num);



	spin_lock(&mdp_lock);

	spin_lock_irqsave(&mdp_lock, irq_flags);

	status = irq & readl_relaxed(mdata->mdp_base +

			MDSS_MDP_REG_INTR_STATUS);

	if (status) {
@@ -597,7 +598,7 @@ void mdss_mdp_intr_check_and_clear(u32 intr_type, u32 intf_num) 
				intr_type, intf_num);

		writel_relaxed(irq, mdata->mdp_base + MDSS_MDP_REG_INTR_CLEAR);

	}

	spin_unlock(&mdp_lock);

	spin_unlock_irqrestore(&mdp_lock, irq_flags);

}



void mdss_mdp_hist_irq_disable(u32 irq)