Merge drm/drm-next into drm-intel-next-queued

[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 9126706..0d8a643 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -141,6 +141,9 @@ struct intel_encoder {
        int (*compute_config)(struct intel_encoder *,
                              struct intel_crtc_state *,
                              struct drm_connector_state *);
+       int (*compute_config_late)(struct intel_encoder *,
+                                  struct intel_crtc_state *,
+                                  struct drm_connector_state *);
        void (*update_prepare)(struct intel_atomic_state *,
                               struct intel_encoder *,
                               struct intel_crtc *);
@@ -496,7 +499,7 @@ struct intel_atomic_state {
        bool global_state_changed;
 
        /* Number of enabled DBuf slices */
-       u8 enabled_dbuf_slices_num;
+       u8 enabled_dbuf_slices_mask;
 
        struct i915_sw_fence commit_ready;
 
@@ -1165,8 +1168,6 @@ struct intel_hdmi {
 };
 
 struct intel_dp_mst_encoder;
-#define DP_MAX_DOWNSTREAM_PORTS                0x10
-
 /*
  * enum link_m_n_set:
  *     When platform provides two set of M_N registers for dp, we can