drm/i915/dp: abstract struct intel_dp pps members to a sub-struct

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / display / intel_display_types.h

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index b601e80..1a92434 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1369,6 +1369,38 @@ struct intel_dp_pcon_frl {
        int trained_rate_gbps;
 };
 
+struct intel_pps {
+       int panel_power_up_delay;
+       int panel_power_down_delay;
+       int panel_power_cycle_delay;
+       int backlight_on_delay;
+       int backlight_off_delay;
+       struct delayed_work panel_vdd_work;
+       bool want_panel_vdd;
+       unsigned long last_power_on;
+       unsigned long last_backlight_off;
+       ktime_t panel_power_off_time;
+       intel_wakeref_t vdd_wakeref;
+
+       /*
+        * Pipe whose power sequencer is currently locked into
+        * this port. Only relevant on VLV/CHV.
+        */
+       enum pipe pps_pipe;
+       /*
+        * Pipe currently driving the port. Used for preventing
+        * the use of the PPS for any pipe currentrly driving
+        * external DP as that will mess things up on VLV.
+        */
+       enum pipe active_pipe;
+       /*
+        * Set if the sequencer may be reset due to a power transition,
+        * requiring a reinitialization. Only relevant on BXT.
+        */
+       bool pps_reset;
+       struct edp_power_seq pps_delays;
+};
+
 struct intel_dp {
        i915_reg_t output_reg;
        u32 DP;
@@ -1408,35 +1440,8 @@ struct intel_dp {
        struct drm_dp_aux aux;
        u32 aux_busy_last_status;
        u8 train_set[4];
-       int panel_power_up_delay;
-       int panel_power_down_delay;
-       int panel_power_cycle_delay;
-       int backlight_on_delay;
-       int backlight_off_delay;
-       struct delayed_work panel_vdd_work;
-       bool want_panel_vdd;
-       unsigned long last_power_on;
-       unsigned long last_backlight_off;
-       ktime_t panel_power_off_time;
-       intel_wakeref_t vdd_wakeref;
 
-       /*
-        * Pipe whose power sequencer is currently locked into
-        * this port. Only relevant on VLV/CHV.
-        */
-       enum pipe pps_pipe;
-       /*
-        * Pipe currently driving the port. Used for preventing
-        * the use of the PPS for any pipe currentrly driving
-        * external DP as that will mess things up on VLV.
-        */
-       enum pipe active_pipe;
-       /*
-        * Set if the sequencer may be reset due to a power transition,
-        * requiring a reinitialization. Only relevant on BXT.
-        */
-       bool pps_reset;
-       struct edp_power_seq pps_delays;
+       struct intel_pps pps;
 
        bool can_mst; /* this port supports mst */
        bool is_mst;