diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c index 84fb2d5217..dbeaa8d41a 100644 --- a/msm/sde/sde_crtc.c +++ b/msm/sde/sde_crtc.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "sde_kms.h" #include "sde_hw_lm.h" @@ -3774,7 +3773,6 @@ static void sde_crtc_handle_power_event(u32 event_type, void *arg) struct sde_crtc_irq_info *node = NULL; int ret = 0; struct drm_event event; - struct msm_drm_private *priv; if (!crtc) { SDE_ERROR("invalid crtc\n"); @@ -3782,7 +3780,6 @@ static void sde_crtc_handle_power_event(u32 event_type, void *arg) } sde_crtc = to_sde_crtc(crtc); cstate = to_sde_crtc_state(crtc->state); - priv = crtc->dev->dev_private; mutex_lock(&sde_crtc->crtc_lock); @@ -3790,12 +3787,6 @@ static void sde_crtc_handle_power_event(u32 event_type, void *arg) switch (event_type) { case SDE_POWER_EVENT_POST_ENABLE: - /* disable mdp LUT memory retention */ - ret = sde_power_clk_set_flags(&priv->phandle, "lut_clk", - CLKFLAG_NORETAIN_MEM); - if (ret) - SDE_ERROR("disable LUT memory retention err %d\n", ret); - /* restore encoder; crtc will be programmed during commit */ drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask) { @@ -3819,11 +3810,6 @@ static void sde_crtc_handle_power_event(u32 event_type, void *arg) sde_cp_crtc_post_ipc(crtc); break; case SDE_POWER_EVENT_PRE_DISABLE: - /* enable mdp LUT memory retention */ - ret = sde_power_clk_set_flags(&priv->phandle, "lut_clk", - CLKFLAG_RETAIN_MEM); - if (ret) - SDE_ERROR("enable LUT memory retention err %d\n", ret); drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask) { diff --git a/msm/sde_power_handle.c b/msm/sde_power_handle.c index 1ed7c4885d..43c9d7a5ef 100644 --- a/msm/sde_power_handle.c +++ b/msm/sde_power_handle.c @@ -947,30 +947,6 @@ struct clk *sde_power_clk_get_clk(struct sde_power_handle *phandle, return clk; } -int sde_power_clk_set_flags(struct sde_power_handle *phandle, - char *clock_name, unsigned long flags) -{ - struct clk *clk; - - if (!phandle) { - pr_err("invalid input power handle\n"); - return -EINVAL; - } - - if (!clock_name) { - pr_err("invalid input clock name\n"); - return -EINVAL; - } - - clk = sde_power_clk_get_clk(phandle, clock_name); - if (!clk) { - pr_err("get_clk failed for clk: %s\n", clock_name); - return -EINVAL; - } - - return clk_set_flags(clk, flags); -} - struct sde_power_event *sde_power_handle_register_event( struct sde_power_handle *phandle, u32 event_type, void (*cb_fnc)(u32 event_type, void *usr), diff --git a/msm/sde_power_handle.h b/msm/sde_power_handle.h index 2587c3734f..05e2022176 100644 --- a/msm/sde_power_handle.h +++ b/msm/sde_power_handle.h @@ -235,17 +235,6 @@ u64 sde_power_clk_get_max_rate(struct sde_power_handle *pdata, struct clk *sde_power_clk_get_clk(struct sde_power_handle *phandle, char *clock_name); -/** - * sde_power_clk_set_flags() - set the clock flags - * @pdata: power handle containing the resources - * @clock_name: clock name to get the clk pointer. - * @flags: flags to set - * - * Return: error code. - */ -int sde_power_clk_set_flags(struct sde_power_handle *pdata, - char *clock_name, unsigned long flags); - /** * sde_power_data_bus_set_quota() - set data bus quota for power client * @phandle: power handle containing the resources