Skip to contentSkip to conversation

drm/i915: Use drm_fb_helper_output_poll_changed()

PATCH RESEND In review Noralf Trønnes 1 participant 2 messages Nov 6, 2017 – Nov 9, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND v3 5/12 drm/i915: Use drm_fb_helper_output_poll_changed()

This driver can use drm_fb_helper_output_poll_changed() as its .output_poll_changed callback.

---

I'm resending to get a CI run.

Noralf.

 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(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index f780f39e0758..b205e2c782bb 100644
@@ -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,
drivers/gpu/drm/i915/intel_drv.h +0 -5
index 463ed152e6b1..dfcf5ba220e8 100644
@@ -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)
 {
 }
drivers/gpu/drm/i915/intel_fbdev.c +0 -8
index f2bb8116227c..35babbadfc5a 100644
@@ -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)
-		drm_fb_helper_hotplug_event(&ifbdev->helper);
-}
-
 void intel_fbdev_restore_mode(struct drm_device *dev)
 {
 	struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;
Signature · 6 lines
2.14.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

Den 06.11.2017 23.48, skrev Noralf Trønnes:

Quoted 11 lines

This driver can use drm_fb_helper_output_poll_changed() as its .output_poll_changed callback.

---

I'm resending to get a CI run.

This didin't trigger a CI run, anyone know why?

Noralf.

Quoted 52 lines

Noralf.

  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(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index f780f39e0758..b205e2c782bb 100644
@@ -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,
drivers/gpu/drm/i915/intel_drv.h +0 -5
index 463ed152e6b1..dfcf5ba220e8 100644
@@ -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)
  {
  }
drivers/gpu/drm/i915/intel_fbdev.c +0 -1
index f2bb8116227c..35babbadfc5a 100644
@@ -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)

drivers/gpu/drm/i915/intel_fbdev.c void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous · line 801

Quoted 10 lines
drivers/gpu/drm/i915/intel_fbdev.c +0 -7
-{
-	struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;
-
-	if (ifbdev)
-		drm_fb_helper_hotplug_event(&ifbdev->helper);
-}
-
  void intel_fbdev_restore_mode(struct drm_device *dev)
  {
  	struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx