On Wed, Sep 05, 2018 at 09:13:02PM +0200, Heiko Stuebner wrote: > 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") > Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx> > --- > drivers/gpu/drm/rockchip/rockchip_rgb.h | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.h b/drivers/gpu/drm/rockchip/rockchip_rgb.h > index c712a673d1e3..bcd903688491 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_rgb.h > +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.h > @@ -14,7 +14,21 @@ > * 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) > +{ > + return; This return is redundant. With that nit fixed, feel free to commit with Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx> > +} > +#endif > -- > 2.17.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel