mdss: display-port: add support for suspend and resume events (4e8e859b) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_dp.c

+145 −19

Original line number	Diff line number	Diff line
		@@ -54,6 +54,8 @@ struct mdss_dp_attention_node {

		#define DEFAULT_VIDEO_RESOLUTION HDMI_VFRMT_640x480p60_4_3

		static int mdss_dp_host_init(struct mdss_panel_data *pdata);
		static int mdss_dp_host_deinit(struct mdss_dp_drv_pdata *dp);
		static int mdss_dp_off_irq(struct mdss_dp_drv_pdata *dp_drv);
		static void mdss_dp_mainlink_push_idle(struct mdss_panel_data *pdata);
		static inline void mdss_dp_link_maintenance(struct mdss_dp_drv_pdata *dp,
		@@ -476,6 +478,12 @@ static int mdss_dp_clk_ctrl(struct mdss_dp_drv_pdata *dp_drv,
		else
		dp_drv->link_clks_on = enable;

		pr_debug("%s clocks for %s\n",
		enable ? "enable" : "disable",
		__mdss_dp_pm_name(pm_type));
		pr_debug("link_clks:%s core_clks:%s\n",
		dp_drv->link_clks_on ? "on" : "off",
		dp_drv->core_clks_on ? "on" : "off");
		error:
		return ret;
		}
		@@ -1312,6 +1320,11 @@ static int mdss_dp_enable_mainlink_clocks(struct mdss_dp_drv_pdata *dp)
		if (dp->pixel_clk_rcg && dp->pixel_parent)
		clk_set_parent(dp->pixel_clk_rcg, dp->pixel_parent);

		if (dp->link_clks_on) {
		pr_debug("link clocks already on\n");
		return ret;
		}

		mdss_dp_set_clock_rate(dp, "ctrl_link_clk",
		(dp->link_rate * DP_LINK_RATE_MULTIPLIER) / DP_KHZ_TO_HZ);

		@@ -1336,6 +1349,11 @@ static int mdss_dp_enable_mainlink_clocks(struct mdss_dp_drv_pdata *dp)
		*/
		static void mdss_dp_disable_mainlink_clocks(struct mdss_dp_drv_pdata *dp_drv)
		{
		if (!dp_drv->link_clks_on) {
		pr_debug("link clocks already off\n");
		return;
		}

		mdss_dp_clk_ctrl(dp_drv, DP_CTRL_PM, false);
		}

		@@ -1571,6 +1589,16 @@ int mdss_dp_on(struct mdss_panel_data *pdata)
		return 0;
		}

		/*
		* During device suspend, host_deinit() is called
		* to release DP resources. PM_RESUME can be
		* called for any module wake-up. To avoid multiple host
		* init/deinit during unrelated resume/suspend events,
		* add host initialization call before DP power-on.
		*/
		if (!dp_drv->dp_initialized)
		mdss_dp_host_init(pdata);

		return mdss_dp_on_hpd(dp_drv);
		}

		@@ -1618,25 +1646,7 @@ static int mdss_dp_off_hpd(struct mdss_dp_drv_pdata *dp_drv)

		mdss_dp_audio_enable(&dp_drv->ctrl_io, false);

		mdss_dp_irq_disable(dp_drv);

		mdss_dp_config_gpios(dp_drv, false);
		mdss_dp_pinctrl_set_state(dp_drv, false);

		/*
		* The global reset will need DP link ralated clocks to be
		* running. Add the global reset just before disabling the
		* link clocks and core clocks.
		*/
		mdss_dp_ctrl_reset(&dp_drv->ctrl_io);

		/* Make sure DP is disabled before clk disable */
		wmb();
		mdss_dp_disable_mainlink_clocks(dp_drv);
		mdss_dp_clk_ctrl(dp_drv, DP_CORE_PM, false);

		mdss_dp_regulator_ctrl(dp_drv, false);
		dp_drv->dp_initialized = false;
		mdss_dp_host_deinit(dp_drv);

		dp_drv->power_on = false;
		dp_drv->sink_info_read = false;
		@@ -1836,6 +1846,49 @@ vreg_error:
		return ret;
		}

		/**
		* mdss_dp_host_deinit() - Uninitialize DP controller
		* @dp: Display Port Driver data
		*
		* Perform required steps to uninitialize DP controller
		* and its resources.
		*/
		static int mdss_dp_host_deinit(struct mdss_dp_drv_pdata *dp)
		{
		if (!dp) {
		pr_err("Invalid input data\n");
		return -EINVAL;
		}

		if (!dp->dp_initialized) {
		pr_debug("%s: host deinit done already\n", __func__);
		return 0;
		}

		mdss_dp_irq_disable(dp);

		mdss_dp_config_gpios(dp, false);
		mdss_dp_pinctrl_set_state(dp, false);

		/*
		* The global reset will need DP link ralated clocks to be
		* running. Add the global reset just before disabling the
		* link clocks and core clocks.
		*/
		mdss_dp_ctrl_reset(&dp->ctrl_io);

		/* Make sure DP is disabled before clk disable */
		wmb();
		mdss_dp_disable_mainlink_clocks(dp);
		mdss_dp_clk_ctrl(dp, DP_CORE_PM, false);

		mdss_dp_regulator_ctrl(dp, false);
		dp->dp_initialized = false;
		pr_debug("Host deinitialized successfully\n");

		return 0;
		}

		/**
		* mdss_dp_notify_clients() - notifies DP clients of cable connection
		* @dp: Display Port Driver data
		@@ -2753,6 +2806,22 @@ static void mdss_dp_update_hdcp_info(struct mdss_dp_drv_pdata *dp)
		}
		}

		/**
		* mdss_dp_reset_panel_info() - reset the panel_info data
		* @dp: Display Port Driver data
		*
		* This function will reset the panel resolution to
		* HDMI_VFRMT_UNKNOWN if the sink device is not connected. This will help
		* to reconfigure the panel resolution during cable connect event.
		*/
		static void mdss_dp_reset_panel_info(struct mdss_dp_drv_pdata *dp)
		{
		if (dp->suspend_vic != HDMI_VFRMT_UNKNOWN) {
		dp->suspend_vic = HDMI_VFRMT_UNKNOWN;
		dp_init_panel_info(dp, dp->suspend_vic);
		}
		}

		static int mdss_dp_event_handler(struct mdss_panel_data *pdata,
		int event, void *arg)
		{
		@@ -2820,6 +2889,31 @@ static int mdss_dp_event_handler(struct mdss_panel_data *pdata,
		case MDSS_EVENT_CHECK_PARAMS:
		rc = mdss_dp_check_params(dp, arg);
		break;
		case MDSS_EVENT_SUSPEND:
		/*
		* Make sure DP host_deinit is called
		* when DP host is initialized but not
		* powered ON.
		* For example, this scenerio happens
		* when you connect DP sink while the
		* device is in suspend state.
		*/
		if ((!dp->power_on) && (dp->dp_initialized))
		rc = mdss_dp_host_deinit(dp);

		/*
		* For DP suspend/resume use case, CHECK_PARAMS is
		* not called if the cable status is not changed.
		* Store the sink resolution in suspend and configure
		* the resolution during DP resume path.
		*/
		if (dp->power_on)
		dp->suspend_vic = dp->vic;
		break;
		case MDSS_EVENT_RESUME:
		if (dp->suspend_vic != HDMI_VFRMT_UNKNOWN)
		dp_init_panel_info(dp, dp->suspend_vic);
		break;
		default:
		pr_debug("unhandled event=%d\n", event);
		break;
		@@ -3174,6 +3268,27 @@ static void usbpd_disconnect_callback(struct usbpd_svid_handler *hdlr)
		} else {
		mdss_dp_notify_clients(dp_drv, NOTIFY_DISCONNECT);
		}

		/*
		* If cable is disconnected during device suspend,
		* reset the panel resolution to HDMI_VFRMT_UNKNOWN
		* so that new resolution is configured during
		* cable connect event
		*/
		if ((!dp_drv->power_on) && (!dp_drv->dp_initialized))
		mdss_dp_reset_panel_info(dp_drv);

		/*
		* If a cable/dongle is connected to the TX device but
		* no sink device is connected, we call host
		* initialization where orientation settings are
		* configured. When the cable/dongle is disconnect,
		* call host de-initialization to make sure
		* we re-configure the orientation settings during
		* the next connect event.
		*/
		if ((!dp_drv->power_on) && (dp_drv->dp_initialized))
		mdss_dp_host_deinit(dp_drv);
		}

		static int mdss_dp_validate_callback(u8 cmd,
		@@ -3670,6 +3785,16 @@ static void mdss_dp_process_attention(struct mdss_dp_drv_pdata *dp_drv)
		mdss_dp_notify_clients(dp_drv, NOTIFY_DISCONNECT);
		pr_debug("Attention: Notified clients\n");

		/*
		* When a DP adaptor is connected and if sink is
		* disconnected during device suspend,
		* reset the panel resolution to HDMI_VFRMT_UNKNOWN
		* so that new resolution is configured during
		* connect event.
		*/
		if ((!dp_drv->power_on) && (!dp_drv->dp_initialized))
		mdss_dp_reset_panel_info(dp_drv);

		/**
		* Manually turn off the DP controller if we are in PHY
		* testing mode.
		@@ -3892,6 +4017,7 @@ static int mdss_dp_probe(struct platform_device *pdev)
		dp_drv->hpd_irq_on = false;
		mdss_dp_reset_test_data(dp_drv);
		init_completion(&dp_drv->irq_comp);
		dp_drv->suspend_vic = HDMI_VFRMT_UNKNOWN;

		pr_debug("done\n");

drivers/video/fbdev/msm/mdss_dp.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -450,6 +450,7 @@ struct mdss_dp_drv_pdata {
		bool link_clks_on;
		bool power_on;
		bool sink_info_read;
		u32 suspend_vic;
		bool hpd;
		bool psm_enabled;
		bool audio_test_req;