| Message ID | 20161130110131.25668-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 30, 2016 at 12:01:31PM +0100, Daniel Vetter wrote: > Since > > commit 44adece57e2604cec8527a499b48e4d584ab53b8 > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > Date: Wed Aug 10 18:52:34 2016 +0200 > > drm/fb-helper: Add a dummy remove_conflicting_framebuffers > > the drm helpers take care of this for us. > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Still compiles without CONFIG_FB, so Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
On Wed, Nov 30, 2016 at 11:49:23AM +0000, Chris Wilson wrote: > On Wed, Nov 30, 2016 at 12:01:31PM +0100, Daniel Vetter wrote: > > Since > > > > commit 44adece57e2604cec8527a499b48e4d584ab53b8 > > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > > Date: Wed Aug 10 18:52:34 2016 +0200 > > > > drm/fb-helper: Add a dummy remove_conflicting_framebuffers > > > > the drm helpers take care of this for us. > > > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Still compiles without CONFIG_FB, so > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Thanks for double-checking, applied to dinq. -Daniel
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 8dac298461c0..dc80c8ff54e3 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -643,7 +643,6 @@ static int i915_load_modeset_init(struct drm_device *dev) return ret; } -#if IS_ENABLED(CONFIG_FB) static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) { struct apertures_struct *ap; @@ -668,12 +667,6 @@ static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) return ret; } -#else -static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) -{ - return 0; -} -#endif #if !defined(CONFIG_VGA_CONSOLE) static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
Since commit 44adece57e2604cec8527a499b48e4d584ab53b8 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Wed Aug 10 18:52:34 2016 +0200 drm/fb-helper: Add a dummy remove_conflicting_framebuffers the drm helpers take care of this for us. Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/i915_drv.c | 7 ------- 1 file changed, 7 deletions(-)