Remove unused downstream bus scaling apis
cover Remove unused downstream bus scaling apis
MSM bus scaling has moved on to use interconnect framework and downstream bus scaling apis are not present anymore. Remove them as they are nop anyways in the current code, no functional change.
Sai Prakash Ranjan (2):
drm/msm/mdp4: Remove unused downstream bus scaling apis drm/msm/mdp5: Remove unused downstream bus scaling apis
.../gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 51 -------------- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 13 ---- .../gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 47 ------------- .../gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 24 ------- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 68 ------------------- 5 files changed, 203 deletions(-)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 1/2 drm/msm/mdp4: Remove unused downstream bus scaling apis
MSM bus scaling has moved on to use interconnect framework and downstream bus scaling apis are not present anymore. Remove them as they are nop anyways in the current code, no functional change.
--- .../gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 51 ------------------- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 13 ----- .../gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 47 ----------------- 3 files changed, 111 deletions(-)
drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c +0 -51
@@ -25,54 +25,9 @@ static struct mdp4_kms *get_kms(struct drm_encoder *encoder)return to_mdp4_kms (to_mdp_kms (priv->kms)); } -#ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING -#include <mach/board.h> -/* not ironically named at all.. no, really.. */ -static void bs_init (struct mdp4_dtv_encoder *mdp4_dtv_encoder) -{ -struct drm_device *dev = mdp4_dtv_encoder->base.dev; -struct lcdc_platform_data *dtv_pdata =mdp4_find_pdata ("dtv.0" ); - -if (!dtv_pdata) { -DRM_DEV_ERROR (dev->dev,"could not find dtv pdata\n" ); -return ; - } - -if (dtv_pdata->bus_scale_table) { - mdp4_dtv_encoder->bsc =msm_bus_scale_register_client ( - dtv_pdata->bus_scale_table); -DBG ("bus scale client: %08x" , mdp4_dtv_encoder->bsc); -DBG ("lcdc_power_save: %p" , dtv_pdata->lcdc_power_save); -if (dtv_pdata->lcdc_power_save) - dtv_pdata->lcdc_power_save (1 ); - } -} - -static void bs_fini (struct mdp4_dtv_encoder *mdp4_dtv_encoder) -{ -if (mdp4_dtv_encoder->bsc) { -msm_bus_scale_unregister_client (mdp4_dtv_encoder->bsc); - mdp4_dtv_encoder->bsc =0 ; - } -} - -static void bs_set (struct mdp4_dtv_encoder *mdp4_dtv_encoder,int idx) -{ -if (mdp4_dtv_encoder->bsc) { -DBG ("set bus scaling: %d" , idx); -msm_bus_scale_client_update_request (mdp4_dtv_encoder->bsc, idx); - } -} -#else -static void bs_init (struct mdp4_dtv_encoder *mdp4_dtv_encoder) {} -static void bs_fini (struct mdp4_dtv_encoder *mdp4_dtv_encoder) {} -static void bs_set (struct mdp4_dtv_encoder *mdp4_dtv_encoder,int idx) {} -#endif -static void mdp4_dtv_encoder_destroy (struct drm_encoder *encoder) {struct mdp4_dtv_encoder *mdp4_dtv_encoder =to_mdp4_dtv_encoder (encoder); -bs_fini (mdp4_dtv_encoder);drm_encoder_cleanup (encoder);kfree (mdp4_dtv_encoder); }
@@ -162,8 +117,6 @@ static void mdp4_dtv_encoder_disable(struct drm_encoder *encoder)clk_disable_unprepare (mdp4_dtv_encoder->hdmi_clk);clk_disable_unprepare (mdp4_dtv_encoder->mdp_clk); -bs_set (mdp4_dtv_encoder,0 ); - mdp4_dtv_encoder->enabled = false; }
@@ -185,8 +138,6 @@ static void mdp4_dtv_encoder_enable(struct drm_encoder *encoder) MDP4_DMA_CONFIG_PACK(0x21));mdp4_crtc_set_intf (encoder->crtc,INTF_LCDC_DTV ,1 ); -bs_set (mdp4_dtv_encoder,1 ); -DBG ("setting mdp_clk=%lu" , pc); ret =clk_set_rate (mdp4_dtv_encoder->mdp_clk, pc);
@@ -252,8 +203,6 @@ struct drm_encoder *mdp4_dtv_encoder_init(struct drm_device *dev) goto fail; } -bs_init (mdp4_dtv_encoder); -return encoder; fail:
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h +0 -13
@@ -222,17 +222,4 @@ static inline struct clk *mpd4_lvds_pll_init(struct drm_device *dev) }#endif -#ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING -/* bus scaling data is associated with extra pointless platform devices, -* "dtv", etc.. this is a bit of a hack, but we need a way for encoders -* to find their pdata to make the bus-scaling stuff work. -*/ -static inline void *mdp4_find_pdata (const char *devname) -{ -struct device *dev; - dev =bus_find_device_by_name (&platform_bus_type,NULL , devname); -return dev ? dev->platform_data :NULL ; -} -#endif -#endif /* __MDP4_KMS_H__ */
drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c +0 -47
75 lines not on this page · raw message
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/2 drm/msm/mdp5: Remove unused downstream bus scaling apis
In reply to Sai Prakash RanjanMSM bus scaling has moved on to use interconnect framework and downstream bus scaling apis are not present anymore. Remove them as they are nop anyways in the current code, no functional change.
--- .../gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 24 ------- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 68 ------------------- 2 files changed, 92 deletions(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c +0 -24
@@ -14,27 +14,6 @@ static struct mdp5_kms *get_kms(struct drm_encoder *encoder)return to_mdp5_kms (to_mdp_kms (priv->kms)); } -#ifdef DOWNSTREAM_CONFIG_MSM_BUS_SCALING -#include <mach/board.h> -#include <linux/msm-bus.h> -#include <linux/msm-bus-board.h> - -static void bs_set (struct mdp5_encoder *mdp5_cmd_enc,int idx) -{ -if (mdp5_cmd_enc->bsc) { -DBG ("set bus scaling: %d" , idx); -/* HACK: scaling down, and then immediately back up -* seems to leave things broken (underflow).. so -* never disable: -*/ - idx =1 ; -msm_bus_scale_client_update_request (mdp5_cmd_enc->bsc, idx); - } -} -#else -static void bs_set (struct mdp5_encoder *mdp5_cmd_enc,int idx) {} -#endif -#define VSYNC_CLK_RATE 19200000static int pingpong_tearcheck_setup (struct drm_encoder *encoder,struct drm_display_mode *mode)
@@ -146,8 +125,6 @@ void mdp5_cmd_encoder_disable(struct drm_encoder *encoder)mdp5_ctl_set_encoder_state (ctl, pipeline, false);mdp5_ctl_commit (ctl, pipeline,mdp_ctl_flush_mask_encoder (intf), true); -bs_set (mdp5_cmd_enc,0 ); - mdp5_cmd_enc->enabled = false; }
@@ -161,7 +138,6 @@ void mdp5_cmd_encoder_enable(struct drm_encoder *encoder)if (WARN_ON (mdp5_cmd_enc->enabled))return ; -bs_set (mdp5_cmd_enc,1 );if (pingpong_tearcheck_enable (encoder))return ;
drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c +0 -68
95 lines not on this page · raw message
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 6 lines · Sai Prakash Ranjan
MSM bus scaling has moved on to use interconnect framework and downstream bus scaling apis are not present anymore. Remove them as they are nop anyways in the current code, no functional change.
thanks, nice cleanup.. I'm pulling into msm-next-staging
BR,
-R
Quoted 11 lines
Sai Prakash Ranjan (2):
drm/msm/mdp4: Remove unused downstream bus scaling apis drm/msm/mdp5: Remove unused downstream bus scaling apis.../gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 51 -------------- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 13 ---- .../gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 47 ------------- .../gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 24 ------- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 68 ------------------- 5 files changed, 203 deletions(-)
Quoted 4 lines
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel