Commit 0632fef6 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarChon Ming Lee <chon.ming.lee@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4520f53a

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

	}

	}

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 */

drivers/gpu/drm/i915/intel_drv.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -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) 
{

{

}

}





static inline void intel_fb_restore_mode(struct drm_device *dev)

static inline void intel_fbdev_restore_mode(struct drm_device *dev)

{

{

}

}

#endif

#endif

drivers/gpu/drm/i915/intel_fb.c→drivers/gpu/drm/i915/intel_fbdev.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE