Merge "msm: mdss: overlay: skip kickoff for empty pan_display during handoff" (7b9744a7) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_hdmi_cec.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -270,15 +270,15 @@ int hdmi_cec_isr(void *input)
		return -EPERM;
		}

		io = cec_ctrl->init_data.io;

		cec_intr = DSS_REG_R_ND(io, HDMI_CEC_INT);

		if (!cec_ctrl->cec_enabled) {
		DSS_REG_W(io, HDMI_CEC_INT, cec_intr);
		DEV_DBG("%s: CEC feature not enabled\n", __func__);
		return 0;
		}

		io = cec_ctrl->init_data.io;

		cec_intr = DSS_REG_R_ND(io, HDMI_CEC_INT);

		cec_status = DSS_REG_R_ND(io, HDMI_CEC_STATUS);

		if ((cec_intr & BIT(0)) && (cec_intr & BIT(1))) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -666,7 +666,7 @@ static void hdmi_hdcp2p2_link_cb(void *data)

		static void hdmi_hdcp2p2_recv_msg(struct hdmi_hdcp2p2_ctrl *ctrl)
		{
		int rc, timeout_hsync;
		int rc = 0, timeout_hsync;
		char *recvd_msg_buf = NULL;
		struct hdmi_tx_hdcp2p2_ddc_data *ddc_data;
		struct hdmi_tx_ddc_ctrl *ddc_ctrl;

+14 −2

Original line number	Diff line number	Diff line
		@@ -2883,13 +2883,19 @@ static inline void hdmi_tx_audio_off(struct hdmi_tx_ctrl *hdmi_ctrl)
		static int hdmi_tx_power_off(struct hdmi_tx_ctrl *hdmi_ctrl)
		{
		struct dss_io_data *io = NULL;
		void *pdata = hdmi_tx_get_fd(HDMI_TX_FEAT_PANEL);
		void *pdata = NULL;

		if (!hdmi_ctrl) {
		DEV_ERR("%s: invalid input\n", __func__);
		return -EINVAL;
		}

		pdata = hdmi_tx_get_fd(HDMI_TX_FEAT_PANEL);
		if (!pdata) {
		DEV_ERR("%s: invalid panel data\n", __func__);
		return -EINVAL;
		}

		io = &hdmi_ctrl->pdata.io[HDMI_TX_CORE_IO];
		if (!io->base) {
		DEV_ERR("%s: Core io is not initialized\n", __func__);
		@@ -3451,7 +3457,7 @@ static char *hdmi_tx_get_event_name(int event)

		static void hdmi_tx_update_fps(struct hdmi_tx_ctrl *hdmi_ctrl)
		{
		void *pdata = pdata = hdmi_tx_get_fd(HDMI_TX_FEAT_PANEL);
		void *pdata = NULL;
		struct mdss_panel_info *pinfo;

		if (!hdmi_ctrl) {
		@@ -3459,6 +3465,12 @@ static void hdmi_tx_update_fps(struct hdmi_tx_ctrl *hdmi_ctrl)
		return;
		}

		pdata = hdmi_tx_get_fd(HDMI_TX_FEAT_PANEL);
		if (!pdata) {
		DEV_ERR("%s: invalid panel data\n", __func__);
		return;
		}

		pinfo = &hdmi_ctrl->panel_data.panel_info;

		if (!pinfo->dynamic_fps) {

+15 −2

Original line number	Diff line number	Diff line
		@@ -1359,7 +1359,7 @@ int mdss_mdp_overlay_start(struct msm_fb_data_type *mfd)
		if (rc) {
		pr_debug("empty kickoff on fb%d during cont splash\n",
		mfd->index);
		return 0;
		return -EPERM;
		}
		} else if (mdata->handoff_pending) {
		pr_warn("fb%d: commit while splash handoff pending\n",
		@@ -2468,7 +2468,7 @@ done:
		static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd)
		{
		struct mdss_mdp_data buf_l = NULL, buf_r = NULL;
		struct mdss_mdp_pipe l_pipe, r_pipe;
		struct mdss_mdp_pipe l_pipe, r_pipe, pipe, tmp;
		struct fb_info *fbi;
		struct mdss_overlay_private *mdp5_data;
		struct mdss_data_type *mdata;
		@@ -2497,6 +2497,19 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd)

		if (IS_ERR_OR_NULL(mfd->fbmem_buf) \|\| fbi->fix.smem_len == 0 \|\|
		mdp5_data->borderfill_enable) {
		if (mdata->handoff_pending) {
		/*
		* Move pipes to cleanup queue and avoid kickoff if
		* pan display is called before handoff is completed.
		*/
		mutex_lock(&mdp5_data->list_lock);
		list_for_each_entry_safe(pipe, tmp,
		&mdp5_data->pipes_used, list) {
		list_move(&pipe->list,
		&mdp5_data->pipes_cleanup);
		}
		mutex_unlock(&mdp5_data->list_lock);
		}
		mfd->mdp.kickoff_fnc(mfd, NULL);
		return;
		}