diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-08 11:44:49 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-11 17:37:33 -0400 |
commit | 0632fef669912a63c99c8ce4c2ca10c6ea04f0df (patch) | |
tree | cf2cf2dcf9409f2c8244a5abe4f5c02b8f8655c5 /drivers/gpu/drm/i915 | |
parent | 4520f53a159fb81b8c27afe52428a0959aff259c (diff) |
drm/i915: rename intel_fb.c to intel_fbdev.c
This file is all about the legacy fbdev support. If we want to extract
framebuffer functions, we better put those into a separate file.
Also rename functions accordingly, only two have used the intel_fb_
prefix anyway.
Reviewed-by: Chon Ming Lee <chon.ming.lee@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c (renamed from drivers/gpu/drm/i915/intel_fb.c) | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 45e14a8db2f3..41838eaa799c 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile | |||
@@ -53,7 +53,7 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o | |||
53 | 53 | ||
54 | i915-$(CONFIG_ACPI) += intel_acpi.o | 54 | i915-$(CONFIG_ACPI) += intel_acpi.o |
55 | 55 | ||
56 | i915-$(CONFIG_DRM_I915_FBDEV) += intel_fb.o | 56 | i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o |
57 | 57 | ||
58 | obj-$(CONFIG_DRM_I915) += i915.o | 58 | obj-$(CONFIG_DRM_I915) += i915.o |
59 | 59 | ||
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 53c958ce3a02..42cddc11c23c 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1853,7 +1853,7 @@ void i915_driver_lastclose(struct drm_device * dev) | |||
1853 | return; | 1853 | return; |
1854 | 1854 | ||
1855 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { | 1855 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
1856 | intel_fb_restore_mode(dev); | 1856 | intel_fbdev_restore_mode(dev); |
1857 | vga_switcheroo_process_delayed_switch(); | 1857 | vga_switcheroo_process_delayed_switch(); |
1858 | return; | 1858 | return; |
1859 | } | 1859 | } |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index fd38c3762518..4a8a2e4a332b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -10106,14 +10106,14 @@ intel_user_framebuffer_create(struct drm_device *dev, | |||
10106 | } | 10106 | } |
10107 | 10107 | ||
10108 | #ifndef CONFIG_DRM_I915_FBDEV | 10108 | #ifndef CONFIG_DRM_I915_FBDEV |
10109 | static inline void intel_fb_output_poll_changed(struct drm_device *dev) | 10109 | static inline void intel_fbdev_output_poll_changed(struct drm_device *dev) |
10110 | { | 10110 | { |
10111 | } | 10111 | } |
10112 | #endif | 10112 | #endif |
10113 | 10113 | ||
10114 | static const struct drm_mode_config_funcs intel_mode_funcs = { | 10114 | static const struct drm_mode_config_funcs intel_mode_funcs = { |
10115 | .fb_create = intel_user_framebuffer_create, | 10115 | .fb_create = intel_user_framebuffer_create, |
10116 | .output_poll_changed = intel_fb_output_poll_changed, | 10116 | .output_poll_changed = intel_fbdev_output_poll_changed, |
10117 | }; | 10117 | }; |
10118 | 10118 | ||
10119 | /* Set up chip specific display functions */ | 10119 | /* Set up chip specific display functions */ |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 0f8402bc4222..189257df7a0f 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -713,14 +713,14 @@ bool intel_dsi_init(struct drm_device *dev); | |||
713 | void intel_dvo_init(struct drm_device *dev); | 713 | void intel_dvo_init(struct drm_device *dev); |
714 | 714 | ||
715 | 715 | ||
716 | /* legacy fbdev emulation in intel_fb.c */ | 716 | /* legacy fbdev emulation in intel_fbdev.c */ |
717 | #ifdef CONFIG_DRM_I915_FBDEV | 717 | #ifdef CONFIG_DRM_I915_FBDEV |
718 | extern int intel_fbdev_init(struct drm_device *dev); | 718 | extern int intel_fbdev_init(struct drm_device *dev); |
719 | extern void intel_fbdev_initial_config(struct drm_device *dev); | 719 | extern void intel_fbdev_initial_config(struct drm_device *dev); |
720 | extern void intel_fbdev_fini(struct drm_device *dev); | 720 | extern void intel_fbdev_fini(struct drm_device *dev); |
721 | extern void intel_fbdev_set_suspend(struct drm_device *dev, int state); | 721 | extern void intel_fbdev_set_suspend(struct drm_device *dev, int state); |
722 | extern void intel_fb_output_poll_changed(struct drm_device *dev); | 722 | extern void intel_fbdev_output_poll_changed(struct drm_device *dev); |
723 | extern void intel_fb_restore_mode(struct drm_device *dev); | 723 | extern void intel_fbdev_restore_mode(struct drm_device *dev); |
724 | #else | 724 | #else |
725 | static inline int intel_fbdev_init(struct drm_device *dev) | 725 | static inline int intel_fbdev_init(struct drm_device *dev) |
726 | { | 726 | { |
@@ -739,7 +739,7 @@ static inline void intel_fbdev_set_suspend(struct drm_device *dev, int state) | |||
739 | { | 739 | { |
740 | } | 740 | } |
741 | 741 | ||
742 | static inline void intel_fb_restore_mode(struct drm_device *dev) | 742 | static inline void intel_fbdev_restore_mode(struct drm_device *dev) |
743 | { | 743 | { |
744 | } | 744 | } |
745 | #endif | 745 | #endif |
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fbdev.c index d883b77b1b78..acc839569c3f 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c | |||
@@ -299,13 +299,13 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state) | |||
299 | 299 | ||
300 | MODULE_LICENSE("GPL and additional rights"); | 300 | MODULE_LICENSE("GPL and additional rights"); |
301 | 301 | ||
302 | void intel_fb_output_poll_changed(struct drm_device *dev) | 302 | void intel_fbdev_output_poll_changed(struct drm_device *dev) |
303 | { | 303 | { |
304 | struct drm_i915_private *dev_priv = dev->dev_private; | 304 | struct drm_i915_private *dev_priv = dev->dev_private; |
305 | drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper); | 305 | drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper); |
306 | } | 306 | } |
307 | 307 | ||
308 | void intel_fb_restore_mode(struct drm_device *dev) | 308 | void intel_fbdev_restore_mode(struct drm_device *dev) |
309 | { | 309 | { |
310 | int ret; | 310 | int ret; |
311 | struct drm_i915_private *dev_priv = dev->dev_private; | 311 | struct drm_i915_private *dev_priv = dev->dev_private; |