From: Heiko Stuebner Date: Wed, 5 Sep 2018 19:13:02 +0000 (+0200) Subject: drm/rockchip: rgb: add stub functions when rgb encoder is disabled X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~4243^2~30^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3ee22b769fd761c98eeaceab49153c3eb7612821;p=mirror_ubuntu-focal-kernel.git drm/rockchip: rgb: add stub functions when rgb encoder is disabled The newly added internal rgb encoder for Rockchip vops is missing stubs for the case that the rgb output part is not enabled in the kernel config. So add these. Fixes: 1f0f01515172 (drm/rockchip: Add support for Rockchip Soc RGB output interface) Reviewed-by: Sean Paul Signed-off-by: Heiko Stuebner [seanpaul fixed up checkpatch nits] Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20180905191302.26023-1-heiko@sntech.de --- diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.h b/drivers/gpu/drm/rockchip/rockchip_rgb.h index c712a673d1e3..38b52e63b2b0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_rgb.h +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.h @@ -14,7 +14,20 @@ * GNU General Public License for more details. */ +#ifdef CONFIG_ROCKCHIP_RGB struct rockchip_rgb *rockchip_rgb_init(struct device *dev, struct drm_crtc *crtc, struct drm_device *drm_dev); void rockchip_rgb_fini(struct rockchip_rgb *rgb); +#else +static inline struct rockchip_rgb *rockchip_rgb_init(struct device *dev, + struct drm_crtc *crtc, + struct drm_device *drm_dev) +{ + return NULL; +} + +static inline void rockchip_rgb_fini(struct rockchip_rgb *rgb) +{ +} +#endif