shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-03 19:53:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: Avoid multiple definition

Browse Source 
Change-Id: I091eb45fd4ccc30e648d4b743e1f541a8718cc9d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
This commit is contained in:
Finley Xiao
2017-12-15 17:07:45 +08:00
committed by Tao Huang
parent 98e3aceb3a
commit e8a0df4762
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/rockchip/rockchip_drm_fb.c
View File

@@ -23,6 +23,7 @@
#include <soc/rockchip/rockchip_dmc.h>
#include "rockchip_drm_drv.h"
#include "rockchip_drm_fb.h"
#include "rockchip_drm_gem.h"
#include "rockchip_drm_backlight.h"

15
drivers/gpu/drm/rockchip/rockchip_drm_fb.h
View File

@@ -31,4 +31,19 @@ rockchip_fb_alloc(struct drm_device *dev, struct drm_mode_fb_cmd2 *mode_cmd,
dma_addr_t rockchip_fb_get_dma_addr(struct drm_framebuffer *fb,
unsigned int plane);
#ifdef CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ
int rockchip_dmcfreq_vop_bandwidth_request(unsigned int bw_mbyte);
void rockchip_dmcfreq_vop_bandwidth_update(unsigned int bw_mbyte);
#else
static inline int rockchip_dmcfreq_vop_bandwidth_request(unsigned int bw_mbyte)
{
return 0;
}
static inline void rockchip_dmcfreq_vop_bandwidth_update(unsigned int bw_mbyte)
{
}
#endif
#endif /* _ROCKCHIP_DRM_FB_H */

14
include/soc/rockchip/rockchip_dmc.h
View File

@@ -33,18 +33,4 @@ static inline int rockchip_drm_register_notifier_to_dmc(struct devfreq *devfreq)
}
#endif
#ifdef CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ
int rockchip_dmcfreq_vop_bandwidth_request(unsigned int bw_mbyte);
void rockchip_dmcfreq_vop_bandwidth_update(unsigned int bw_mbyte);
#else
int rockchip_dmcfreq_vop_bandwidth_request(unsigned int bw_mbyte)
{
return 0;
}
void rockchip_dmcfreq_vop_bandwidth_update(unsigned int bw_mbyte)
{
}
#endif
#endif