Merge tag 'drm-misc-next-2020-02-10' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.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 3fd822d536c98fb38309d9cbf0eb08ad3769c55d..fdd943a17de3aec213db6a265177a9b65ecb9769 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -90,8 +90,8 @@ struct intel_framebuffer {
        /* for each plane in the normal GTT view */
        struct {
                unsigned int x, y;
-       } normal[2];
-       /* for each plane in the rotated GTT view */
+       } normal[4];
+       /* for each plane in the rotated GTT view for no-CCS formats */
        struct {
                unsigned int x, y;
                unsigned int pitch; /* pixels */
@@ -555,7 +555,7 @@ struct intel_plane_state {
                 */
                u32 stride;
                int x, y;
-       } color_plane[2];
+       } color_plane[4];
 
        /* plane control register */
        u32 ctl;
@@ -1054,6 +1054,9 @@ struct intel_crtc_state {
 
        /* Bitmask to indicate slaves attached */
        u8 sync_mode_slaves_mask;
+
+       /* Only valid on TGL+ */
+       enum transcoder mst_master_transcoder;
 };
 
 struct intel_crtc {
@@ -1433,9 +1436,9 @@ struct intel_load_detect_pipe {
 };
 
 static inline struct intel_encoder *
-intel_attached_encoder(struct drm_connector *connector)
+intel_attached_encoder(struct intel_connector *connector)
 {
-       return to_intel_connector(connector)->encoder;
+       return connector->encoder;
 }
 
 static inline bool intel_encoder_is_dig_port(struct intel_encoder *encoder)
@@ -1452,12 +1455,12 @@ static inline bool intel_encoder_is_dig_port(struct intel_encoder *encoder)
 }
 
 static inline struct intel_digital_port *
-enc_to_dig_port(struct drm_encoder *encoder)
+enc_to_dig_port(struct intel_encoder *encoder)
 {
-       struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
+       struct intel_encoder *intel_encoder = encoder;
 
        if (intel_encoder_is_dig_port(intel_encoder))
-               return container_of(encoder, struct intel_digital_port,
+               return container_of(&encoder->base, struct intel_digital_port,
                                    base.base);
        else
                return NULL;
@@ -1466,16 +1469,17 @@ enc_to_dig_port(struct drm_encoder *encoder)
 static inline struct intel_digital_port *
 conn_to_dig_port(struct intel_connector *connector)
 {
-       return enc_to_dig_port(&intel_attached_encoder(&connector->base)->base);
+       return enc_to_dig_port(intel_attached_encoder(connector));
 }
 
 static inline struct intel_dp_mst_encoder *
-enc_to_mst(struct drm_encoder *encoder)
+enc_to_mst(struct intel_encoder *encoder)
 {
-       return container_of(encoder, struct intel_dp_mst_encoder, base.base);
+       return container_of(&encoder->base, struct intel_dp_mst_encoder,
+                           base.base);
 }
 
-static inline struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)
+static inline struct intel_dp *enc_to_intel_dp(struct intel_encoder *encoder)
 {
        return &enc_to_dig_port(encoder)->dp;
 }
@@ -1488,14 +1492,14 @@ static inline bool intel_encoder_is_dp(struct intel_encoder *encoder)
                return true;
        case INTEL_OUTPUT_DDI:
                /* Skip pure HDMI/DVI DDI encoders */
-               return i915_mmio_reg_valid(enc_to_intel_dp(&encoder->base)->output_reg);
+               return i915_mmio_reg_valid(enc_to_intel_dp(encoder)->output_reg);
        default:
                return false;
        }
 }
 
 static inline struct intel_lspcon *
-enc_to_intel_lspcon(struct drm_encoder *encoder)
+enc_to_intel_lspcon(struct intel_encoder *encoder)
 {
        return &enc_to_dig_port(encoder)->lspcon;
 }