Merge "msm: mdss: Enable continuous splash on bridge chip" (676c9bc2) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_dba_utils.c

+10 −9

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -652,13 +652,6 @@ void mdss_dba_utils_init(struct mdss_dba_utils_init_data uid)
		udata->kobj = uid->kobj;
		udata->pinfo = uid->pinfo;

		/* register display and audio switch devices */
		ret = mdss_dba_utils_init_switch_dev(udata, uid->fb_node);
		if (ret) {
		pr_err("switch dev registration failed\n");
		goto error;
		}

		/* Initialize EDID feature */
		edid_init_data.kobj = uid->kobj;
		edid_init_data.ds_data.ds_registered = true;
		@@ -714,10 +707,18 @@ void mdss_dba_utils_init(struct mdss_dba_utils_init_data uid)
		* this explicit calls to bridge chip driver.
		*/
		if (!uid->pinfo->is_pluggable) {
		if (udata->ops.power_on)
		if (udata->ops.power_on && !(uid->cont_splash_enabled))
		udata->ops.power_on(udata->dba_data, true, 0);
		if (udata->ops.check_hpd)
		udata->ops.check_hpd(udata->dba_data, 0);
		} else {
		/* register display and audio switch devices */
		ret = mdss_dba_utils_init_switch_dev(udata,
		uid->fb_node);
		if (ret) {
		pr_err("switch dev registration failed\n");
		goto error;
		}
		}
		}

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -24,6 +24,7 @@
		* @chip_name: Name of the device registered with DBA
		* @client_name: Name of the client registering with DBA
		* @pinfo: Detailed panel information
		* @cont_splash_enabled: Flag to check if cont splash was enabled on bridge
		*
		* This structure's instance is needed to be passed as parameter
		* to register API to let the DBA utils module configure and
		@@ -36,6 +37,7 @@ struct mdss_dba_utils_init_data {
		char *chip_name;
		char *client_name;
		struct mdss_panel_info *pinfo;
		bool cont_splash_enabled;
		};

		int mdss_dba_utils_video_on(void data, struct mdss_panel_info pinfo);

+8 −1

Original line number	Diff line number	Diff line
		@@ -2265,10 +2265,17 @@ static void mdss_dsi_dba_work(struct work_struct *work)

		utils_init_data.chip_name = "adv7533";
		utils_init_data.client_name = "dsi";
		utils_init_data.instance_id = 0;
		utils_init_data.instance_id = pinfo->pdest;
		utils_init_data.fb_node = ctrl_pdata->fb_node;
		utils_init_data.kobj = ctrl_pdata->kobj;
		utils_init_data.pinfo = pinfo;
		if (ctrl_pdata->mdss_util)
		utils_init_data.cont_splash_enabled =
		ctrl_pdata->mdss_util->panel_intf_status(
		ctrl_pdata->panel_data.panel_info.pdest,
		MDSS_PANEL_INTF_DSI) ? true : false;
		else
		utils_init_data.cont_splash_enabled = false;

		pinfo->dba_data = mdss_dba_utils_init(&utils_init_data);

+1 −1

Original line number	Diff line number	Diff line
		@@ -696,7 +696,7 @@ static int mdss_dsi_panel_on(struct mdss_panel_data *pdata)
		if (pinfo->compression_mode == COMPRESSION_DSC)
		mdss_dsi_panel_dsc_pps_send(ctrl, pinfo);

		if (ctrl->ds_registered && pinfo->is_pluggable)
		if (ctrl->ds_registered)
		mdss_dba_utils_video_on(pinfo->dba_data, pinfo);
		end:
		pr_debug("%s:-\n", __func__);

+0 −2

Original line number	Diff line number	Diff line
		@@ -1888,8 +1888,6 @@ static int adv7533_register_dba(struct adv7533 *pdata)
		strlcpy(pdata->dev_info.chip_name, "adv7533",
		sizeof(pdata->dev_info.chip_name));

		pdata->dev_info.instance_id = 0;

		mutex_init(&pdata->dev_info.dev_mutex);

		INIT_LIST_HEAD(&pdata->dev_info.client_list);