Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9c409d6 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: keep CONFIG_DRM_FBDEV_EMULATION=n function stubs together 



Move the outcast intel_fbdev_output_poll_changed() stub for
CONFIG_DRM_FBDEV_EMULATION=n next to its friends.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1475567628-5529-1-git-send-email-jani.nikula@intel.com
parent 348b9b11

drivers/gpu/drm/i915/intel_display.c

+0 −6
Original line number Diff line number Diff line
@@ -15827,12 +15827,6 @@ intel_user_framebuffer_create(struct drm_device *dev, 
	return fb;

}



#ifndef CONFIG_DRM_FBDEV_EMULATION

static inline void intel_fbdev_output_poll_changed(struct drm_device *dev)

{

}

#endif



static const struct drm_mode_config_funcs intel_mode_funcs = {

	.fb_create = intel_user_framebuffer_create,

	.output_poll_changed = intel_fbdev_output_poll_changed,

drivers/gpu/drm/i915/intel_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -1488,6 +1488,10 @@ static inline void intel_fbdev_set_suspend(struct drm_device *dev, int state, bo 
{

}



static inline void intel_fbdev_output_poll_changed(struct drm_device *dev)

{

}



static inline void intel_fbdev_restore_mode(struct drm_device *dev)

{

}