diff options
| author | Daniel Vetter | 2015-08-10 13:34:08 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-08-11 14:00:29 +0200 |
| commit | 0695726e85b45f3298f64fa4cee89f40f923fb8c (patch) | |
| tree | 10294957d8c19a0171a7ff79067d4422e11f780f /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/core: Set mode to NULL when connectors in a set drops to 0. (diff) | |
| download | kernel-qcow2-linux-0695726e85b45f3298f64fa4cee89f40f923fb8c.tar.gz kernel-qcow2-linux-0695726e85b45f3298f64fa4cee89f40f923fb8c.tar.xz kernel-qcow2-linux-0695726e85b45f3298f64fa4cee89f40f923fb8c.zip | |
drm/i915: Use CONFIG_DRM_FBDEV_EMULATION
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 43b0f17ad1fa..97ec61c842ed 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10221,7 +10221,7 @@ static struct drm_framebuffer * mode_fits_in_fbdev(struct drm_device *dev, 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_gem_object *obj; struct drm_framebuffer *fb; @@ -14475,7 +14475,7 @@ intel_user_framebuffer_create(struct drm_device *dev, 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) { } |