From a5ec308ac15d7abf6b801a15e027fe9534cc35a8 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 2 Dec 2014 10:50:30 -0500 Subject: [PATCH] drm/msm/dp: use link power helpers Now that we have a helper for drm_dp_link_power_down(), use dp helpers instead of rolling our own. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/edp/edp_ctrl.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c index 5e0f89e..3e24621 100644 --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c @@ -458,23 +458,6 @@ static void edp_fill_link_cfg(struct edp_ctrl *ctrl) DBG("rate=%d lane=%d", ctrl->link_rate, ctrl->lane_cnt); } -static int edp_sink_power_state(struct edp_ctrl *ctrl, u8 state) -{ - u8 s = state; - - DBG("%d", s); - - if (ctrl->dp_link.revision < 0x11) - return 0; - - if (drm_dp_dpcd_write(ctrl->drm_aux, DP_SET_POWER, &s, 1) < 1) { - pr_err("%s: Set power state to panel failed\n", __func__); - return -ENOLINK; - } - - return 0; -} - static void edp_config_ctrl(struct edp_ctrl *ctrl) { u32 data; @@ -1008,7 +991,7 @@ static void edp_ctrl_on_worker(struct work_struct *work) edp_ctrl_link_enable(ctrl, 1); edp_ctrl_irq_enable(ctrl, 1); - ret = edp_sink_power_state(ctrl, DP_SET_POWER_D0); + ret = drm_dp_link_power_up(ctrl->drm_aux, &ctrl->dp_link); if (ret) goto fail; @@ -1055,7 +1038,7 @@ static void edp_ctrl_off_worker(struct work_struct *work) edp_state_ctrl(ctrl, 0); - edp_sink_power_state(ctrl, DP_SET_POWER_D3); + drm_dp_link_power_down(ctrl->drm_aux, &ctrl->dp_link); edp_ctrl_irq_enable(ctrl, 0); -- 2.7.4