tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/tegra: Remove local fbdev emulation Kconfig option

DRM_TEGRA_FBDEV config is currently used to enable/disable legacy fbdev
emulation for the tegra kms driver.

Remove this local config option and use the top level DRM_FBDEV_EMULATION
config option instead.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1445933459-5249-4-git-send-email-architt@codeaurora.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

authored by

Archit Taneja and committed by
Daniel Vetter b110ef37 c1ff5a7a

+11 -23
-12
drivers/gpu/drm/tegra/Kconfig
··· 16 16 17 17 if DRM_TEGRA 18 18 19 - config DRM_TEGRA_FBDEV 20 - bool "Enable legacy fbdev support" 21 - select DRM_KMS_FB_HELPER 22 - select FB_SYS_FILLRECT 23 - select FB_SYS_COPYAREA 24 - select FB_SYS_IMAGEBLIT 25 - default y 26 - help 27 - Choose this option if you have a need for the legacy fbdev support. 28 - Note that this support also provides the Linux console on top of 29 - the Tegra modesetting driver. 30 - 31 19 config DRM_TEGRA_DEBUG 32 20 bool "NVIDIA Tegra DRM debug support" 33 21 help
+2 -2
drivers/gpu/drm/tegra/drm.c
··· 106 106 107 107 static const struct drm_mode_config_funcs tegra_drm_mode_funcs = { 108 108 .fb_create = tegra_fb_create, 109 - #ifdef CONFIG_DRM_TEGRA_FBDEV 109 + #ifdef CONFIG_DRM_FBDEV_EMULATION 110 110 .output_poll_changed = tegra_fb_output_poll_changed, 111 111 #endif 112 112 .atomic_check = drm_atomic_helper_check, ··· 260 260 261 261 static void tegra_drm_lastclose(struct drm_device *drm) 262 262 { 263 - #ifdef CONFIG_DRM_TEGRA_FBDEV 263 + #ifdef CONFIG_DRM_FBDEV_EMULATION 264 264 struct tegra_drm *tegra = drm->dev_private; 265 265 266 266 tegra_fbdev_restore_mode(tegra->fbdev);
+3 -3
drivers/gpu/drm/tegra/drm.h
··· 30 30 unsigned int num_planes; 31 31 }; 32 32 33 - #ifdef CONFIG_DRM_TEGRA_FBDEV 33 + #ifdef CONFIG_DRM_FBDEV_EMULATION 34 34 struct tegra_fbdev { 35 35 struct drm_fb_helper base; 36 36 struct tegra_fb *fb; ··· 46 46 struct mutex clients_lock; 47 47 struct list_head clients; 48 48 49 - #ifdef CONFIG_DRM_TEGRA_FBDEV 49 + #ifdef CONFIG_DRM_FBDEV_EMULATION 50 50 struct tegra_fbdev *fbdev; 51 51 #endif 52 52 ··· 273 273 void tegra_drm_fb_free(struct drm_device *drm); 274 274 int tegra_drm_fb_init(struct drm_device *drm); 275 275 void tegra_drm_fb_exit(struct drm_device *drm); 276 - #ifdef CONFIG_DRM_TEGRA_FBDEV 276 + #ifdef CONFIG_DRM_FBDEV_EMULATION 277 277 void tegra_fbdev_restore_mode(struct tegra_fbdev *fbdev); 278 278 void tegra_fb_output_poll_changed(struct drm_device *drm); 279 279 #endif
+6 -6
drivers/gpu/drm/tegra/fb.c
··· 18 18 return container_of(fb, struct tegra_fb, base); 19 19 } 20 20 21 - #ifdef CONFIG_DRM_TEGRA_FBDEV 21 + #ifdef CONFIG_DRM_FBDEV_EMULATION 22 22 static inline struct tegra_fbdev *to_tegra_fbdev(struct drm_fb_helper *helper) 23 23 { 24 24 return container_of(helper, struct tegra_fbdev, base); ··· 181 181 return ERR_PTR(err); 182 182 } 183 183 184 - #ifdef CONFIG_DRM_TEGRA_FBDEV 184 + #ifdef CONFIG_DRM_FBDEV_EMULATION 185 185 static struct fb_ops tegra_fb_ops = { 186 186 .owner = THIS_MODULE, 187 187 .fb_fillrect = drm_fb_helper_sys_fillrect, ··· 370 370 371 371 int tegra_drm_fb_prepare(struct drm_device *drm) 372 372 { 373 - #ifdef CONFIG_DRM_TEGRA_FBDEV 373 + #ifdef CONFIG_DRM_FBDEV_EMULATION 374 374 struct tegra_drm *tegra = drm->dev_private; 375 375 376 376 tegra->fbdev = tegra_fbdev_create(drm); ··· 383 383 384 384 void tegra_drm_fb_free(struct drm_device *drm) 385 385 { 386 - #ifdef CONFIG_DRM_TEGRA_FBDEV 386 + #ifdef CONFIG_DRM_FBDEV_EMULATION 387 387 struct tegra_drm *tegra = drm->dev_private; 388 388 389 389 tegra_fbdev_free(tegra->fbdev); ··· 392 392 393 393 int tegra_drm_fb_init(struct drm_device *drm) 394 394 { 395 - #ifdef CONFIG_DRM_TEGRA_FBDEV 395 + #ifdef CONFIG_DRM_FBDEV_EMULATION 396 396 struct tegra_drm *tegra = drm->dev_private; 397 397 int err; 398 398 ··· 407 407 408 408 void tegra_drm_fb_exit(struct drm_device *drm) 409 409 { 410 - #ifdef CONFIG_DRM_TEGRA_FBDEV 410 + #ifdef CONFIG_DRM_FBDEV_EMULATION 411 411 struct tegra_drm *tegra = drm->dev_private; 412 412 413 413 tegra_fbdev_exit(tegra->fbdev);