diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h index a2351124c4c8..6ddfd5e1c8e7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h @@ -33,26 +33,6 @@ dma_addr_t rockchip_fb_get_dma_addr(struct drm_framebuffer *fb, unsigned int plane); void *rockchip_fb_get_kvaddr(struct drm_framebuffer *fb, unsigned int plane); -#ifdef CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ -int rockchip_dmcfreq_vop_bandwidth_request(struct devfreq *devfreq, - unsigned int bw_mbyte); -void rockchip_dmcfreq_vop_bandwidth_update(struct devfreq *devfreq, - unsigned int bw_mbyte); -#else -static inline int -rockchip_dmcfreq_vop_bandwidth_request(struct devfreq *devfreq, - unsigned int bw_mbyte) -{ - return 0; -} - -static inline void -rockchip_dmcfreq_vop_bandwidth_update(struct devfreq *devfreq, - unsigned int bw_mbyte) -{ -} -#endif - #define to_rockchip_fb(x) container_of(x, struct rockchip_drm_fb, fb) struct rockchip_drm_fb { diff --git a/include/soc/rockchip/rockchip_dmc.h b/include/soc/rockchip/rockchip_dmc.h index 6c1bb871c972..f8d6addfa8b4 100644 --- a/include/soc/rockchip/rockchip_dmc.h +++ b/include/soc/rockchip/rockchip_dmc.h @@ -26,11 +26,29 @@ static inline int rockchip_drm_register_notifier_to_dmc(struct devfreq *devfreq) #ifdef CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ int rockchip_dmcfreq_wait_complete(void); +int rockchip_dmcfreq_vop_bandwidth_request(struct devfreq *devfreq, + unsigned int bw_mbyte); +void rockchip_dmcfreq_vop_bandwidth_update(struct devfreq *devfreq, + unsigned int bw_mbyte); + #else static inline int rockchip_dmcfreq_wait_complete(void) { return 0; } + +static inline int +rockchip_dmcfreq_vop_bandwidth_request(struct devfreq *devfreq, + unsigned int bw_mbyte) +{ + return 0; +} + +static inline void +rockchip_dmcfreq_vop_bandwidth_update(struct devfreq *devfreq, + unsigned int bw_mbyte) +{ +} #endif #endif