提交 0632fef6 编写于 作者: D Daniel Vetter

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: NChon Ming Lee <chon.ming.lee@intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 4520f53a
...@@ -53,7 +53,7 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o ...@@ -53,7 +53,7 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o
i915-$(CONFIG_ACPI) += intel_acpi.o i915-$(CONFIG_ACPI) += intel_acpi.o
i915-$(CONFIG_DRM_I915_FBDEV) += intel_fb.o i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
obj-$(CONFIG_DRM_I915) += i915.o obj-$(CONFIG_DRM_I915) += i915.o
......
...@@ -1853,7 +1853,7 @@ void i915_driver_lastclose(struct drm_device * dev) ...@@ -1853,7 +1853,7 @@ void i915_driver_lastclose(struct drm_device * dev)
return; return;
if (drm_core_check_feature(dev, DRIVER_MODESET)) { if (drm_core_check_feature(dev, DRIVER_MODESET)) {
intel_fb_restore_mode(dev); intel_fbdev_restore_mode(dev);
vga_switcheroo_process_delayed_switch(); vga_switcheroo_process_delayed_switch();
return; return;
} }
......
...@@ -10106,14 +10106,14 @@ intel_user_framebuffer_create(struct drm_device *dev, ...@@ -10106,14 +10106,14 @@ intel_user_framebuffer_create(struct drm_device *dev,
} }
#ifndef CONFIG_DRM_I915_FBDEV #ifndef CONFIG_DRM_I915_FBDEV
static inline void intel_fb_output_poll_changed(struct drm_device *dev) static inline void intel_fbdev_output_poll_changed(struct drm_device *dev)
{ {
} }
#endif #endif
static const struct drm_mode_config_funcs intel_mode_funcs = { static const struct drm_mode_config_funcs intel_mode_funcs = {
.fb_create = intel_user_framebuffer_create, .fb_create = intel_user_framebuffer_create,
.output_poll_changed = intel_fb_output_poll_changed, .output_poll_changed = intel_fbdev_output_poll_changed,
}; };
/* Set up chip specific display functions */ /* Set up chip specific display functions */
......
...@@ -713,14 +713,14 @@ bool intel_dsi_init(struct drm_device *dev); ...@@ -713,14 +713,14 @@ bool intel_dsi_init(struct drm_device *dev);
void intel_dvo_init(struct drm_device *dev); void intel_dvo_init(struct drm_device *dev);
/* legacy fbdev emulation in intel_fb.c */ /* legacy fbdev emulation in intel_fbdev.c */
#ifdef CONFIG_DRM_I915_FBDEV #ifdef CONFIG_DRM_I915_FBDEV
extern int intel_fbdev_init(struct drm_device *dev); extern int intel_fbdev_init(struct drm_device *dev);
extern void intel_fbdev_initial_config(struct drm_device *dev); extern void intel_fbdev_initial_config(struct drm_device *dev);
extern void intel_fbdev_fini(struct drm_device *dev); extern void intel_fbdev_fini(struct drm_device *dev);
extern void intel_fbdev_set_suspend(struct drm_device *dev, int state); extern void intel_fbdev_set_suspend(struct drm_device *dev, int state);
extern void intel_fb_output_poll_changed(struct drm_device *dev); extern void intel_fbdev_output_poll_changed(struct drm_device *dev);
extern void intel_fb_restore_mode(struct drm_device *dev); extern void intel_fbdev_restore_mode(struct drm_device *dev);
#else #else
static inline int intel_fbdev_init(struct drm_device *dev) static inline int intel_fbdev_init(struct drm_device *dev)
{ {
...@@ -739,7 +739,7 @@ static inline void intel_fbdev_set_suspend(struct drm_device *dev, int state) ...@@ -739,7 +739,7 @@ static inline void intel_fbdev_set_suspend(struct drm_device *dev, int state)
{ {
} }
static inline void intel_fb_restore_mode(struct drm_device *dev) static inline void intel_fbdev_restore_mode(struct drm_device *dev)
{ {
} }
#endif #endif
......
...@@ -299,13 +299,13 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state) ...@@ -299,13 +299,13 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state)
MODULE_LICENSE("GPL and additional rights"); MODULE_LICENSE("GPL and additional rights");
void intel_fb_output_poll_changed(struct drm_device *dev) void intel_fbdev_output_poll_changed(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper); drm_fb_helper_hotplug_event(&dev_priv->fbdev->helper);
} }
void intel_fb_restore_mode(struct drm_device *dev) void intel_fbdev_restore_mode(struct drm_device *dev)
{ {
int ret; int ret;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册