On Mon, Oct 30, 2017 at 04:39:44PM +0100, Noralf Trønnes wrote:
> This driver can use drm_fb_helper_output_poll_changed() as its
> .output_poll_changed callback.
>
> Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
> Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> Signed-off-by: Noralf Trønnes <noralf@xxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> drivers/gpu/drm/i915/intel_drv.h | 5 -----
> drivers/gpu/drm/i915/intel_fbdev.c | 8 --------
> 3 files changed, 1 insertion(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f780f39e0758..b205e2c782bb 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14123,7 +14123,7 @@ static void intel_atomic_state_free(struct drm_atomic_state *state)
> static const struct drm_mode_config_funcs intel_mode_funcs = {
> .fb_create = intel_user_framebuffer_create,
> .get_format_info = intel_get_format_info,
> - .output_poll_changed = intel_fbdev_output_poll_changed,
> + .output_poll_changed = drm_fb_helper_output_poll_changed,
> .atomic_check = intel_atomic_check,
> .atomic_commit = intel_atomic_commit,
> .atomic_state_alloc = intel_atomic_state_alloc,
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 463ed152e6b1..dfcf5ba220e8 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1607,7 +1607,6 @@ extern void intel_fbdev_initial_config_async(struct drm_device *dev);
> extern void intel_fbdev_unregister(struct drm_i915_private *dev_priv);
> extern void intel_fbdev_fini(struct drm_i915_private *dev_priv);
> extern void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous);
> -extern void intel_fbdev_output_poll_changed(struct drm_device *dev);
> extern void intel_fbdev_restore_mode(struct drm_device *dev);
> #else
> static inline int intel_fbdev_init(struct drm_device *dev)
> @@ -1631,10 +1630,6 @@ 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)
> {
> }
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
> index f2bb8116227c..35babbadfc5a 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -796,14 +796,6 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous
> console_unlock();
> }
>
> -void intel_fbdev_output_poll_changed(struct drm_device *dev)
> -{
> - struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;
> -
> - if (ifbdev)
This removes the NULL check here, and I think we still need that one for
some slightly unclear but probably hilarious reasons.
I guess simplest if you just drop the i915 patch as too tricky.
-Daniel
> - drm_fb_helper_hotplug_event(&ifbdev->helper);
> -}
> -
> void intel_fbdev_restore_mode(struct drm_device *dev)
> {
> struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;
> --
> 2.14.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
