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

Commit 3d65a6ba 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: dp: always set default resolution"

parents 4b791a5f 3d11494d

drivers/video/fbdev/msm/mdss_dp.c

+2 −0
Original line number Diff line number Diff line
@@ -1820,6 +1820,8 @@ static int mdss_dp_edid_init(struct mdss_panel_data *pdata) 
	dp_drv->edid_buf = edid_init_data.buf;

	dp_drv->edid_buf_size = edid_init_data.buf_size;



	mdss_dp_set_default_resolution(dp_drv);



	return 0;

}

drivers/video/fbdev/msm/mdss_hdmi_edid.c

+5 −0
Original line number Diff line number Diff line
@@ -2604,6 +2604,11 @@ void hdmi_edid_set_video_resolution(void *input, u32 resolution, bool reset) 
		return;

	}



	if (resolution == HDMI_VFRMT_UNKNOWN) {

		pr_debug("%s: Default video resolution not set\n", __func__);

		return;

	}



	edid_ctrl->video_resolution = resolution;



	if (reset) {