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

Commit 387cff96 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: Allow display commit in DCM state for CMD panels"

parents 19d1e5f5 694e9b60

drivers/video/msm/mdss/mdss_fb.c

+10 −2
Original line number Diff line number Diff line
@@ -2233,7 +2233,11 @@ static int mdss_fb_pan_display_ex(struct fb_info *info, 
	u32 wait_for_finish = disp_commit->wait_for_finish;

	int ret = 0;



	if (!mfd || (!mfd->op_enable) || (!mfd->panel_power_on))

	if (!mfd || (!mfd->op_enable))

		return -EPERM;



	if ((!mfd->panel_power_on) && !((mfd->dcm_state == DCM_ENTER) &&

				(mfd->panel.type == MIPI_CMD_PANEL)))

		return -EPERM;



	if (var->xoffset > (info->var.xres_virtual - info->var.xres))
@@ -2285,7 +2289,11 @@ static int mdss_fb_pan_display_sub(struct fb_var_screeninfo *var, 
{

	struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;



	if ((!mfd->op_enable) || (!mfd->panel_power_on))

	if (!mfd->op_enable)

		return -EPERM;



	if ((!mfd->panel_power_on) && !((mfd->dcm_state == DCM_ENTER) &&

				(mfd->panel.type == MIPI_CMD_PANEL)))

		return -EPERM;



	if (var->xoffset > (info->var.xres_virtual - info->var.xres))

drivers/video/msm/mdss/mdss_mdp_overlay.c

+2 −1
Original line number Diff line number Diff line
@@ -1832,7 +1832,8 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd) 
	if (mutex_lock_interruptible(&mdp5_data->ov_lock))

		return;



	if (!mfd->panel_power_on) {

	if ((!mfd->panel_power_on) && !((mfd->dcm_state == DCM_ENTER) &&

				(mfd->panel.type == MIPI_CMD_PANEL))) {

		mutex_unlock(&mdp5_data->ov_lock);

		return;

	}