drm/i915: Use BIT() when dealing with output types

Most places that deal with output types already use BIT()
but a few places still use manual shifts. Convert the
stragglers over to BIT().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220912111814.17466-5-ville.syrjala@linux.intel.com
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/g4x_hdmi.c b/drivers/gpu/drm/i915/display/g4x_hdmi.c
index 5fbd2ae..5606c66 100644 (file)
--- a/drivers/gpu/drm/i915/display/g4x_hdmi.c
+++ b/drivers/gpu/drm/i915/display/g4x_hdmi.c
@@ -585,7 +585,7 @@ void g4x_hdmi_init(struct drm_i915_private *dev_priv,
        } else {
                intel_encoder->pipe_mask = ~0;
        }
-       intel_encoder->cloneable = 1 << INTEL_OUTPUT_ANALOG;
+       intel_encoder->cloneable = BIT(INTEL_OUTPUT_ANALOG);
        intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);
        /*
         * BSpec is unclear about HDMI+HDMI cloning on g4x, but it seems
@@ -593,7 +593,7 @@ void g4x_hdmi_init(struct drm_i915_private *dev_priv,
         * only one port anyway, nothing is lost by allowing it.
         */
        if (IS_G4X(dev_priv))
-               intel_encoder->cloneable |= 1 << INTEL_OUTPUT_HDMI;
+               intel_encoder->cloneable |= BIT(INTEL_OUTPUT_HDMI);
 
        dig_port->hdmi.hdmi_reg = hdmi_reg;
        dig_port->dp.output_reg = INVALID_MMIO_REG;

diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index 4a8ff2f..eba5834 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -1044,7 +1044,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)
        intel_connector_attach_encoder(intel_connector, &crt->base);
 
        crt->base.type = INTEL_OUTPUT_ANALOG;
-       crt->base.cloneable = (1 << INTEL_OUTPUT_DVO) | (1 << INTEL_OUTPUT_HDMI);
+       crt->base.cloneable = BIT(INTEL_OUTPUT_DVO) | BIT(INTEL_OUTPUT_HDMI);
        if (IS_I830(dev_priv))
                crt->base.pipe_mask = BIT(PIPE_A);
        else

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index de3b4fb..3f72d0c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4572,8 +4572,8 @@ static bool encoders_cloneable(const struct intel_encoder *a,
                               const struct intel_encoder *b)
 {
        /* masks could be asymmetric, so check both ways */
-       return a == b || (a->cloneable & (1 << b->type) &&
-                         b->cloneable & (1 << a->type));
+       return a == b || (a->cloneable & BIT(b->type) &&
+                         b->cloneable & BIT(a->type));
 }
 
 static bool check_single_encoder_cloning(struct intel_atomic_state *state,

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 0d50200..c09cb8b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -2040,15 +2040,16 @@ static inline bool
 intel_crtc_has_type(const struct intel_crtc_state *crtc_state,
                    enum intel_output_type type)
 {
-       return crtc_state->output_types & (1 << type);
+       return crtc_state->output_types & BIT(type);
 }
+
 static inline bool
 intel_crtc_has_dp_encoder(const struct intel_crtc_state *crtc_state)
 {
        return crtc_state->output_types &
-               ((1 << INTEL_OUTPUT_DP) |
-                (1 << INTEL_OUTPUT_DP_MST) |
-                (1 << INTEL_OUTPUT_EDP));
+               (BIT(INTEL_OUTPUT_DP) |
+                BIT(INTEL_OUTPUT_DP_MST) |
+                BIT(INTEL_OUTPUT_EDP));
 }
 
 static inline bool

diff --git a/drivers/gpu/drm/i915/display/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c
index 5572e43..167c9b7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dvo.c
+++ b/drivers/gpu/drm/i915/display/intel_dvo.c
@@ -491,8 +491,8 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
                intel_encoder->pipe_mask = ~0;
 
                if (dvo->type != INTEL_DVO_CHIP_LVDS)
-                       intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |
-                               (1 << INTEL_OUTPUT_DVO);
+                       intel_encoder->cloneable = BIT(INTEL_OUTPUT_ANALOG) |
+                               BIT(INTEL_OUTPUT_DVO);
 
                switch (dvo->type) {
                case INTEL_DVO_CHIP_TMDS: