leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Use CONFIG_DRM_FBDEV_EMULATION

Browse Source 
Instead of our own duplicated one. This fixes a bug in the driver
unload code if DRM_FBDEV_EMULATION=n but DRM_I915_FBDEV=y because we
try to unregister the nonexistent fbdev drm_framebuffer.

Cc: Archit Taneja <architt@codeaurora.org>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reported-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2015-08-10 13:34:08 +02:00
parent cebbb7396b
commit 0695726e85
7 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/i915/Kconfig
View File

@ -36,21 +36,6 @@ config DRM_I915
i810 driver instead, and the Atom z5xx series has an entirely i810 driver instead, and the Atom z5xx series has an entirely
different implementation. different implementation.
config DRM_I915_FBDEV
bool "Enable legacy fbdev support for the modesetting intel driver"
depends on DRM_I915
select DRM_KMS_FB_HELPER
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
default y
help
Choose this option if you have a need for the legacy fbdev
support. Note that this support also provide the linux console
support on top of the intel modesetting driver.
If in doubt, say "Y".
config DRM_I915_PRELIMINARY_HW_SUPPORT config DRM_I915_PRELIMINARY_HW_SUPPORT
bool "Enable preliminary support for prerelease Intel hardware by default" bool "Enable preliminary support for prerelease Intel hardware by default"
depends on DRM_I915 depends on DRM_I915

2
drivers/gpu/drm/i915/Makefile
View File

@ -59,7 +59,7 @@ i915-y += intel_audio.o \
intel_sideband.o \ intel_sideband.o \
intel_sprite.o intel_sprite.o
i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o
i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o i915-$(CONFIG_DRM_FBDEV_EMULATION) += intel_fbdev.o
# modesetting output/encoder code # modesetting output/encoder code
i915-y += dvo_ch7017.o \ i915-y += dvo_ch7017.o \

2
drivers/gpu/drm/i915/i915_debugfs.c
View File

@ -1868,7 +1868,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
struct intel_framebuffer *fb; struct intel_framebuffer *fb;
struct drm_framebuffer *drm_fb; struct drm_framebuffer *drm_fb;
#ifdef CONFIG_DRM_I915_FBDEV #ifdef CONFIG_DRM_FBDEV_EMULATION
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
ifbdev = dev_priv->fbdev; ifbdev = dev_priv->fbdev;

2
drivers/gpu/drm/i915/i915_drv.h
View File

@ -1854,7 +1854,7 @@ struct drm_i915_private {
struct drm_i915_gem_object *vlv_pctx; struct drm_i915_gem_object *vlv_pctx;
#ifdef CONFIG_DRM_I915_FBDEV #ifdef CONFIG_DRM_FBDEV_EMULATION
/* list of fbdev register on this device */ /* list of fbdev register on this device */
struct intel_fbdev *fbdev; struct intel_fbdev *fbdev;
struct work_struct fbdev_suspend_work; struct work_struct fbdev_suspend_work;

4
drivers/gpu/drm/i915/intel_display.c
View File

@ -10221,7 +10221,7 @@ static struct drm_framebuffer *
mode_fits_in_fbdev(struct drm_device *dev, mode_fits_in_fbdev(struct drm_device *dev,
struct drm_display_mode *mode) struct drm_display_mode *mode)
{ {
#ifdef CONFIG_DRM_I915_FBDEV #ifdef CONFIG_DRM_FBDEV_EMULATION
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
@ -14475,7 +14475,7 @@ intel_user_framebuffer_create(struct drm_device *dev,
return intel_framebuffer_create(dev, mode_cmd, obj); return intel_framebuffer_create(dev, mode_cmd, obj);
} }
#ifndef CONFIG_DRM_I915_FBDEV #ifndef CONFIG_DRM_FBDEV_EMULATION
static inline void intel_fbdev_output_poll_changed(struct drm_device *dev) static inline void intel_fbdev_output_poll_changed(struct drm_device *dev)
{ {
} }

4
drivers/gpu/drm/i915/intel_dp_mst.c
View File

@ -395,7 +395,7 @@ static bool intel_dp_mst_get_hw_state(struct intel_connector *connector)
static void intel_connector_add_to_fbdev(struct intel_connector *connector) static void intel_connector_add_to_fbdev(struct intel_connector *connector)
{ {
#ifdef CONFIG_DRM_I915_FBDEV #ifdef CONFIG_DRM_FBDEV_EMULATION
struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
drm_fb_helper_add_one_connector(&dev_priv->fbdev->helper, &connector->base); drm_fb_helper_add_one_connector(&dev_priv->fbdev->helper, &connector->base);
#endif #endif
@ -403,7 +403,7 @@ static void intel_connector_add_to_fbdev(struct intel_connector *connector)
static void intel_connector_remove_from_fbdev(struct intel_connector *connector) static void intel_connector_remove_from_fbdev(struct intel_connector *connector)
{ {
#ifdef CONFIG_DRM_I915_FBDEV #ifdef CONFIG_DRM_FBDEV_EMULATION
struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
drm_fb_helper_remove_one_connector(&dev_priv->fbdev->helper, &connector->base); drm_fb_helper_remove_one_connector(&dev_priv->fbdev->helper, &connector->base);
#endif #endif

2
drivers/gpu/drm/i915/intel_drv.h
View File

@ -1203,7 +1203,7 @@ void intel_dvo_init(struct drm_device *dev);
/* legacy fbdev emulation in intel_fbdev.c */ /* legacy fbdev emulation in intel_fbdev.c */
#ifdef CONFIG_DRM_I915_FBDEV #ifdef CONFIG_DRM_FBDEV_EMULATION
extern int intel_fbdev_init(struct drm_device *dev); extern int intel_fbdev_init(struct drm_device *dev);
extern void intel_fbdev_initial_config(void *data, async_cookie_t cookie); extern void intel_fbdev_initial_config(void *data, async_cookie_t cookie);
extern void intel_fbdev_fini(struct drm_device *dev); extern void intel_fbdev_fini(struct drm_device *dev);