drm/i915: s/crtc_mask/pipe_mask/

Rename the encoder->crtc_mask to encoder->pipe_mask to better
reflect what it actually contains.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191002162505.30716-3-ville.syrjala@linux.intel.com
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index 6e398c33a524eb577e6cc586b71b9eb182f2eca5..4cea8ed2bd317fa0132475a3ed917a1c13b4b9d2 100644 (file)
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1584,7 +1584,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
        encoder->get_hw_state = gen11_dsi_get_hw_state;
        encoder->type = INTEL_OUTPUT_DSI;
        encoder->cloneable = 0;
-       encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
+       encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
        encoder->power_domain = POWER_DOMAIN_PORT_DSI;
        encoder->get_power_domains = gen11_dsi_get_power_domains;
 

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index bf576b1e56ae6a4d313740fcddda948e93a74682..b704d2f9fae0618b05af0f55ac3ada6d918c24ba 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -1001,9 +1001,9 @@ void intel_crt_init(struct drm_i915_private *dev_priv)
        crt->base.type = INTEL_OUTPUT_ANALOG;
        crt->base.cloneable = (1 << INTEL_OUTPUT_DVO) | (1 << INTEL_OUTPUT_HDMI);
        if (IS_I830(dev_priv))
-               crt->base.crtc_mask = BIT(PIPE_A);
+               crt->base.pipe_mask = BIT(PIPE_A);
        else
-               crt->base.crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
+               crt->base.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
 
        if (IS_GEN(dev_priv, 2))
                connector->interlace_allowed = 0;

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index fed7fc56dd92a42dbda2c9d231170363226abc99..e4f9868a4addb9a09369fb0c373fb392a747aeb9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4741,7 +4741,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
        intel_encoder->port = port;
        intel_encoder->cloneable = 0;
        for_each_pipe(dev_priv, pipe)
-               intel_encoder->crtc_mask |= BIT(pipe);
+               intel_encoder->pipe_mask |= BIT(pipe);
 
        if (INTEL_GEN(dev_priv) >= 11)
                intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index a23375621185a07c54a61fc675087e89e76b8798..348ce0456696154f762e5059e567c9017c95444c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -15842,7 +15842,7 @@ static u32 intel_encoder_possible_crtcs(struct intel_encoder *encoder)
        u32 possible_crtcs = 0;
 
        for_each_intel_crtc(dev, crtc) {
-               if (encoder->crtc_mask & BIT(crtc->pipe))
+               if (encoder->pipe_mask & BIT(crtc->pipe))
                        possible_crtcs |= drm_crtc_mask(&crtc->base);
        }
 

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 40184e823c842066b0ef8bd5cad6eb09fa9efb1d..4341bd66a4187e1510613480d7cdb4f5170632c2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -128,7 +128,8 @@ struct intel_encoder {
 
        enum intel_output_type type;
        enum port port;
-       unsigned int cloneable;
+       u16 cloneable;
+       u8 pipe_mask;
        enum intel_hotplug_state (*hotplug)(struct intel_encoder *encoder,
                                            struct intel_connector *connector,
                                            bool irq_received);
@@ -187,7 +188,6 @@ struct intel_encoder {
         * device interrupts are disabled.
         */
        void (*suspend)(struct intel_encoder *);
-       int crtc_mask;
        enum hpd_pin hpd_pin;
        enum intel_display_power_domain power_domain;
        /* for communication with audio component; protected by av_mutex */

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 077cc25b7051f4a382c9f61ef6b58960c23a212b..ec3b37f23894c26a9f688ea279a77f09656e8078 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -7571,11 +7571,11 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
        intel_encoder->power_domain = intel_port_to_power_domain(port);
        if (IS_CHERRYVIEW(dev_priv)) {
                if (port == PORT_D)
-                       intel_encoder->crtc_mask = BIT(PIPE_C);
+                       intel_encoder->pipe_mask = BIT(PIPE_C);
                else
-                       intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B);
+                       intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B);
        } else {
-               intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
+               intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
        }
        intel_encoder->cloneable = 0;
        intel_encoder->port = port;

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index bbcab27644dcd578352c2d983b0c5f445eae936c..17f3693fae7ee6b08b65eae09024de7d08914f1e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -618,7 +618,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
        intel_encoder->port = intel_dig_port->base.port;
        intel_encoder->cloneable = 0;
        for_each_pipe(dev_priv, pipe_iter)
-               intel_encoder->crtc_mask |= BIT(pipe_iter);
+               intel_encoder->pipe_mask |= BIT(pipe_iter);
 
        intel_encoder->compute_config = intel_dp_mst_compute_config;
        intel_encoder->disable = intel_mst_disable_dp;

diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c
index 9827f99491d18418b33cca5f51b48e6805212fdf..a6c165d857e0c62cdcea164b557640d9102d06a0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dvo.c
+++ b/drivers/gpu/drm/i915/display/intel_dvo.c
@@ -505,7 +505,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
                intel_encoder->type = INTEL_OUTPUT_DVO;
                intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
                intel_encoder->port = port;
-               intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B);
+               intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B);
 
                switch (dvo->type) {
                case INTEL_DVO_CHIP_TMDS:

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index ff71a4da3d002bf11fc77fb5f729c0359a62bdc7..7605337105b90b8d1a67cb42300b3cd5ec9bb98a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -3283,11 +3283,11 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,
        intel_encoder->port = port;
        if (IS_CHERRYVIEW(dev_priv)) {
                if (port == PORT_D)
-                       intel_encoder->crtc_mask = BIT(PIPE_C);
+                       intel_encoder->pipe_mask = BIT(PIPE_C);
                else
-                       intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B);
+                       intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B);
        } else {
-               intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
+               intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
        }
        intel_encoder->cloneable = 1 << INTEL_OUTPUT_ANALOG;
        /*

diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index cf1cd2295b9bd8e7e6195f199577c36c7a3c54aa..e358a6da5aaf26297d8794dd2b215307f7ed3ec0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -900,9 +900,9 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
        intel_encoder->port = PORT_NONE;
        intel_encoder->cloneable = 0;
        if (INTEL_GEN(dev_priv) < 4)
-               intel_encoder->crtc_mask = BIT(PIPE_B);
+               intel_encoder->pipe_mask = BIT(PIPE_B);
        else
-               intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
+               intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
 
        drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs);
        connector->display_info.subpixel_order = SubPixelHorizontalRGB;

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 47f5d87a938a90cff4a0b0689b74f8953a5d260a..fed738effbc3ca0edab2eb221dab32db38fecf70 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2921,7 +2921,7 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)
                              bytes[0], bytes[1]);
                return false;
        }
-       intel_sdvo->base.crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
+       intel_sdvo->base.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
 
        return true;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
index 5556d8300a888205dd70d0bbe41d3aec4dcc7b56..a329cfcb501de219ab165669b0ab63c060c516b6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tv.c
+++ b/drivers/gpu/drm/i915/display/intel_tv.c
@@ -1947,7 +1947,7 @@ intel_tv_init(struct drm_i915_private *dev_priv)
        intel_encoder->type = INTEL_OUTPUT_TVOUT;
        intel_encoder->power_domain = POWER_DOMAIN_PORT_OTHER;
        intel_encoder->port = PORT_NONE;
-       intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B);
+       intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B);
        intel_encoder->cloneable = 0;
        intel_tv->type = DRM_MODE_CONNECTOR_Unknown;
 

diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index 50064cde0724e32e544866f50faf9ca42af12aa7..11a7c77d64bcd65705790e2271ac8835ae045b8f 100644 (file)
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -1870,11 +1870,11 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
         * port C. BXT isn't limited like this.
         */
        if (IS_GEN9_LP(dev_priv))
-               intel_encoder->crtc_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
+               intel_encoder->pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C);
        else if (port == PORT_A)
-               intel_encoder->crtc_mask = BIT(PIPE_A);
+               intel_encoder->pipe_mask = BIT(PIPE_A);
        else
-               intel_encoder->crtc_mask = BIT(PIPE_B);
+               intel_encoder->pipe_mask = BIT(PIPE_B);
 
        if (dev_priv->vbt.dsi.config->dual_link)
                intel_dsi->ports = BIT(PORT_A) | BIT(PORT_C);