drm/i915: stage modeset output changes

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_drv.h

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 4946282bd32468a0d4f8fa9b0d2e76a7a06406fa..ae807afc5fbf768ab1a8db49ed7790e036ce28e7 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -133,6 +133,12 @@ struct intel_fbdev {
 
 struct intel_encoder {
        struct drm_encoder base;
+       /*
+        * The new crtc this encoder will be driven from. Only differs from
+        * base->crtc while a modeset is in progress.
+        */
+       struct intel_crtc *new_crtc;
+
        int type;
        bool needs_tv_clock;
        /*
@@ -153,7 +159,17 @@ struct intel_encoder {
 
 struct intel_connector {
        struct drm_connector base;
+       /*
+        * The fixed encoder this connector is connected to.
+        */
        struct intel_encoder *encoder;
+
+       /*
+        * The new encoder this connector will be driven. Only differs from
+        * encoder while a modeset is in progress.
+        */
+       struct intel_encoder *new_encoder;
+
        /* Reads out the current hw, returning true if the connector is enabled
         * and active (i.e. dpms ON state). */
        bool (*get_hw_state)(struct intel_connector *);