drm/modesetting: another re-org of some internals.

Move dpms into the helper functions.
Move crtc into the encoder.
Move disable unused functions into the helper.

1 files changed, 17 insertions, 15 deletions

diff --git a/linux-core/drm_crtc_helper.h b/linux-core/drm_crtc_helper.h
index 10420065..063d1f7a 100644
--- a/linux-core/drm_crtc_helper.h
+++ b/linux-core/drm_crtc_helper.h
@@ -21,6 +21,11 @@
 #include <linux/fb.h>
 
 struct drm_crtc_helper_funcs {
+	/*
+	 * Control power levels on the CRTC.  If the mode passed in is
+	 * unsupported, the provider must use the next lowest power level.
+	 */
+	void (*dpms)(struct drm_crtc *crtc, int mode);
   	void (*prepare)(struct drm_crtc *crtc);
 	void (*commit)(struct drm_crtc *crtc);
 
@@ -36,26 +41,23 @@ struct drm_crtc_helper_funcs {
 	void (*mode_set_base)(struct drm_crtc *crtc, int x, int y);
 };
 
-struct drm_connector_helper_funcs {
-	bool (*mode_fixup)(struct drm_connector *connector,
+struct drm_encoder_helper_funcs {
+	void (*dpms)(struct drm_encoder *encoder, int mode);
+	void (*save)(struct drm_encoder *encoder);
+	void (*restore)(struct drm_encoder *encoder);
+
+	bool (*mode_fixup)(struct drm_encoder *encoder,
 			   struct drm_display_mode *mode,
 			   struct drm_display_mode *adjusted_mode);
-	void (*prepare)(struct drm_connector *connector);
-	void (*commit)(struct drm_connector *connector);
-	void (*mode_set)(struct drm_connector *connector,
-			 struct drm_display_mode *mode,
-			 struct drm_display_mode *adjusted_mode);
-};
-
-struct drm_encoder_helper_funcs {
-	void (*prepare)(struct drm_connector *connector);
-	void (*commit)(struct drm_connector *connector);
-	void (*mode_set)(struct drm_connector *connector,
+	void (*prepare)(struct drm_encoder *encoder);
+	void (*commit)(struct drm_encoder *encoder);
+	void (*mode_set)(struct drm_encoder *encoder,
 			 struct drm_display_mode *mode,
 			 struct drm_display_mode *adjusted_mode);
 };
 	
 
+extern void drm_helper_disable_unused_functions(struct drm_device *dev);
 extern int drm_helper_hotplug_stage_two(struct drm_device *dev, struct drm_connector *connector,
 					bool connected);
 extern bool drm_helper_initial_config(struct drm_device *dev, bool can_grow);
@@ -68,9 +70,9 @@ static inline void drm_crtc_helper_add(struct drm_crtc *crtc, const struct drm_c
 	crtc->helper_private = (void *)funcs;
 }
 
-static inline void drm_connector_helper_add(struct drm_connector *connector, const struct drm_connector_helper_funcs *funcs)
+static inline void drm_encoder_helper_add(struct drm_encoder *encoder, const struct drm_encoder_helper_funcs *funcs)
 {
-	connector->helper_private = (void *)funcs;
+	encoder->helper_private = (void *)funcs;
 }