aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2014-12-02 10:50:30 -0500
committerRob Clark <robdclark@gmail.com>2015-02-01 15:32:44 -0500
commita5ec308ac15d7abf6b801a15e027fe9534cc35a8 (patch)
tree8f19be45e8b32ae228b3058a7df1ce014659503c
parent0045398131e48cba3d759a2ad435d8b45640652e (diff)
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 <robdclark@gmail.com>
-rw-r--r--drivers/gpu/drm/msm/edp/edp_ctrl.c21
1 files 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 5e0f89ea89e5..3e246210c46f 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)
458 DBG("rate=%d lane=%d", ctrl->link_rate, ctrl->lane_cnt); 458 DBG("rate=%d lane=%d", ctrl->link_rate, ctrl->lane_cnt);
459} 459}
460 460
461static int edp_sink_power_state(struct edp_ctrl *ctrl, u8 state)
462{
463 u8 s = state;
464
465 DBG("%d", s);
466
467 if (ctrl->dp_link.revision < 0x11)
468 return 0;
469
470 if (drm_dp_dpcd_write(ctrl->drm_aux, DP_SET_POWER, &s, 1) < 1) {
471 pr_err("%s: Set power state to panel failed\n", __func__);
472 return -ENOLINK;
473 }
474
475 return 0;
476}
477
478static void edp_config_ctrl(struct edp_ctrl *ctrl) 461static void edp_config_ctrl(struct edp_ctrl *ctrl)
479{ 462{
480 u32 data; 463 u32 data;
@@ -1008,7 +991,7 @@ static void edp_ctrl_on_worker(struct work_struct *work)
1008 edp_ctrl_link_enable(ctrl, 1); 991 edp_ctrl_link_enable(ctrl, 1);
1009 992
1010 edp_ctrl_irq_enable(ctrl, 1); 993 edp_ctrl_irq_enable(ctrl, 1);
1011 ret = edp_sink_power_state(ctrl, DP_SET_POWER_D0); 994 ret = drm_dp_link_power_up(ctrl->drm_aux, &ctrl->dp_link);
1012 if (ret) 995 if (ret)
1013 goto fail; 996 goto fail;
1014 997
@@ -1055,7 +1038,7 @@ static void edp_ctrl_off_worker(struct work_struct *work)
1055 1038
1056 edp_state_ctrl(ctrl, 0); 1039 edp_state_ctrl(ctrl, 0);
1057 1040
1058 edp_sink_power_state(ctrl, DP_SET_POWER_D3); 1041 drm_dp_link_power_down(ctrl->drm_aux, &ctrl->dp_link);
1059 1042
1060 edp_ctrl_irq_enable(ctrl, 0); 1043 edp_ctrl_irq_enable(ctrl, 0);
1061 1044