diff options
| author | Daniel Vetter <[email protected]> | 2015-08-10 11:34:08 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2015-08-11 12:00:29 +0000 |
| commit | 0695726e85b45f3298f64fa4cee89f40f923fb8c (patch) | |
| tree | 10294957d8c19a0171a7ff79067d4422e11f780f /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | drm/core: Set mode to NULL when connectors in a set drops to 0. (diff) | |
| download | kernel-0695726e85b45f3298f64fa4cee89f40f923fb8c.tar.gz kernel-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 <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Reported-by: Maarten Lankhorst <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Reviewed-by: Maarten Lankhorst <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 51580bdd587f..36fe31875737 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1868,7 +1868,7 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data) struct intel_framebuffer *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; ifbdev = dev_priv->fbdev; |