Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1314347

Re: [PATCH] drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION

Show all headers | View raw

On Thu, Jan 21, 2016 at 01:53:46PM +0000, John Keeping wrote:
> If DRM_FBDEV_EMULATION is not selected in the config then we should not
> setup a framebuffer console.

It should just magically work, and this patch here just removes a bit more
dead code in the rockchip driver itself that's not needed in case fbdev
emulation is disabled.

Can you please double-check this is the case and then resend with a
clarified commit message?

Thanks, Daniel

> 
> Signed-off-by: John Keeping <john@metanate.com>
> ---
>  drivers/gpu/drm/rockchip/Makefile             |  3 ++-
>  drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h | 11 +++++++++++
>  2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
> index a4e03bc..f6a809a 100644
> --- a/drivers/gpu/drm/rockchip/Makefile
> +++ b/drivers/gpu/drm/rockchip/Makefile
> @@ -2,8 +2,9 @@
>  # Makefile for the drm device driver.  This driver provides support for the
>  # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>  
> -rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o rockchip_drm_fbdev.o \
> +rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \
>  		rockchip_drm_gem.o rockchip_drm_vop.o
> +rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o
>  
>  obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
>  obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h
> index 50432e9..73718c5 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h
> @@ -15,7 +15,18 @@
>  #ifndef _ROCKCHIP_DRM_FBDEV_H
>  #define _ROCKCHIP_DRM_FBDEV_H
>  
> +#ifdef CONFIG_DRM_FBDEV_EMULATION
>  int rockchip_drm_fbdev_init(struct drm_device *dev);
>  void rockchip_drm_fbdev_fini(struct drm_device *dev);
> +#else
> +static inline int rockchip_drm_fbdev_init(struct drm_device *dev)
> +{
> +	return 0;
> +}
> +
> +static inline void rockchip_drm_fbdev_fini(struct drm_device *dev)
> +{
> +}
> +#endif
>  
>  #endif /* _ROCKCHIP_DRM_FBDEV_H */
> -- 
> 2.7.0.226.gfe986fe
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION John Keeping <john@metanate.com> - 2016-01-21 15:00 +0100
  Re: [PATCH] drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION Daniel Vetter <daniel@ffwll.ch> - 2016-01-21 18:00 +0100
    [PATCH v2] drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION John Keeping <john@metanate.com> - 2016-01-21 19:30 +0100
      Re: [PATCH v2] drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION Mark yao <mark.yao@rock-chips.com> - 2016-01-22 02:10 +0100

csiph-web