From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759673AbcAUQwu (ORCPT ); Thu, 21 Jan 2016 11:52:50 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:36356 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759061AbcAUQwq (ORCPT ); Thu, 21 Jan 2016 11:52:46 -0500 Date: Thu, 21 Jan 2016 17:52:51 +0100 From: Daniel Vetter To: John Keeping Cc: Mark Yao , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] drm/rockchip: respect CONFIG_DRM_FBDEV_EMULATION Message-ID: <20160121165251.GO19130@phenom.ffwll.local> Mail-Followup-To: John Keeping , Mark Yao , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org References: <1453384426-32617-1-git-send-email-john@metanate.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1453384426-32617-1-git-send-email-john@metanate.com> X-Operating-System: Linux phenom 4.3.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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