Merge "mdss: mdp: do not send panel events for idle power collapse" (0c694e68) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp.c

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2914,6 +2914,9 @@ static int mdss_mdp_runtime_resume(struct device *dev)
	return -ENODEV;		return -ENODEV;

	dev_dbg(dev, "pm_runtime: resuming...\n");		dev_dbg(dev, "pm_runtime: resuming...\n");

			/* do not resume panels when coming out of idle power collapse */
			if (!mdata->idle_pc)
	device_for_each_child(dev, &device_on, mdss_fb_suspres_panel);		device_for_each_child(dev, &device_on, mdss_fb_suspres_panel);
	mdss_mdp_footswitch_ctrl(mdata, true);		mdss_mdp_footswitch_ctrl(mdata, true);

	@@ -2943,6 +2946,9 @@ static int mdss_mdp_runtime_suspend(struct device *dev)
	pr_err("MDP suspend failed\n");		pr_err("MDP suspend failed\n");
	return -EBUSY;		return -EBUSY;
	}		}

			/* do not suspend panels when going in to idle power collapse */
			if (!mdata->idle_pc)
	device_for_each_child(dev, &device_on, mdss_fb_suspres_panel);		device_for_each_child(dev, &device_on, mdss_fb_suspres_panel);
	mdss_mdp_footswitch_ctrl(mdata, false);		mdss_mdp_footswitch_ctrl(mdata, false);