Commit 8648c604 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Clean up connector->*_allowed setup

All the connectors are zero initialized so no need to clear
the *_allowed flags we don't support. Only leave the ones we want
to set. And while at it switch to booleans instead of ints.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220912111814.17466-13-ville.syrjala@linux.intel.comReviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 6ac2f04b
...@@ -2038,8 +2038,6 @@ void icl_dsi_init(struct drm_i915_private *dev_priv) ...@@ -2038,8 +2038,6 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
DRM_MODE_CONNECTOR_DSI); DRM_MODE_CONNECTOR_DSI);
drm_connector_helper_add(connector, &gen11_dsi_connector_helper_funcs); drm_connector_helper_add(connector, &gen11_dsi_connector_helper_funcs);
connector->display_info.subpixel_order = SubPixelHorizontalRGB; connector->display_info.subpixel_order = SubPixelHorizontalRGB;
connector->interlace_allowed = false;
connector->doublescan_allowed = false;
intel_connector->get_hw_state = intel_connector_get_hw_state; intel_connector->get_hw_state = intel_connector_get_hw_state;
/* attach connector to encoder */ /* attach connector to encoder */
......
...@@ -1050,11 +1050,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv) ...@@ -1050,11 +1050,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv)
else else
crt->base.pipe_mask = ~0; crt->base.pipe_mask = ~0;
if (DISPLAY_VER(dev_priv) == 2) if (DISPLAY_VER(dev_priv) != 2)
connector->interlace_allowed = 0; connector->interlace_allowed = true;
else
connector->interlace_allowed = 1;
connector->doublescan_allowed = 0;
crt->adpa_reg = adpa_reg; crt->adpa_reg = adpa_reg;
......
...@@ -5411,7 +5411,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, ...@@ -5411,7 +5411,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,
if (!HAS_GMCH(dev_priv)) if (!HAS_GMCH(dev_priv))
connector->interlace_allowed = true; connector->interlace_allowed = true;
connector->doublescan_allowed = 0;
intel_connector->polled = DRM_CONNECTOR_POLL_HPD; intel_connector->polled = DRM_CONNECTOR_POLL_HPD;
......
...@@ -515,8 +515,6 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) ...@@ -515,8 +515,6 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
drm_connector_helper_add(connector, drm_connector_helper_add(connector,
&intel_dvo_connector_helper_funcs); &intel_dvo_connector_helper_funcs);
connector->display_info.subpixel_order = SubPixelHorizontalRGB; connector->display_info.subpixel_order = SubPixelHorizontalRGB;
connector->interlace_allowed = false;
connector->doublescan_allowed = false;
intel_connector_attach_encoder(intel_connector, intel_encoder); intel_connector_attach_encoder(intel_connector, intel_encoder);
if (dvo->type == INTEL_DVO_CHIP_LVDS) { if (dvo->type == INTEL_DVO_CHIP_LVDS) {
......
...@@ -2956,9 +2956,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port, ...@@ -2956,9 +2956,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
ddc); ddc);
drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs); drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs);
connector->interlace_allowed = 1; connector->interlace_allowed = true;
connector->doublescan_allowed = 0; connector->stereo_allowed = true;
connector->stereo_allowed = 1;
if (DISPLAY_VER(dev_priv) >= 10) if (DISPLAY_VER(dev_priv) >= 10)
connector->ycbcr_420_allowed = true; connector->ycbcr_420_allowed = true;
......
...@@ -924,8 +924,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) ...@@ -924,8 +924,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs); drm_connector_helper_add(connector, &intel_lvds_connector_helper_funcs);
connector->display_info.subpixel_order = SubPixelHorizontalRGB; connector->display_info.subpixel_order = SubPixelHorizontalRGB;
connector->interlace_allowed = false;
connector->doublescan_allowed = false;
lvds_encoder->reg = lvds_reg; lvds_encoder->reg = lvds_reg;
......
...@@ -2689,9 +2689,8 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector, ...@@ -2689,9 +2689,8 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector,
drm_connector_helper_add(drm_connector, drm_connector_helper_add(drm_connector,
&intel_sdvo_connector_helper_funcs); &intel_sdvo_connector_helper_funcs);
connector->base.base.interlace_allowed = 1;
connector->base.base.doublescan_allowed = 0;
connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB; connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB;
connector->base.base.interlace_allowed = true;
connector->base.get_hw_state = intel_sdvo_connector_get_hw_state; connector->base.get_hw_state = intel_sdvo_connector_get_hw_state;
intel_connector_attach_encoder(&connector->base, &encoder->base); intel_connector_attach_encoder(&connector->base, &encoder->base);
......
...@@ -2013,8 +2013,6 @@ intel_tv_init(struct drm_i915_private *dev_priv) ...@@ -2013,8 +2013,6 @@ intel_tv_init(struct drm_i915_private *dev_priv)
intel_tv->type = DRM_MODE_CONNECTOR_Unknown; intel_tv->type = DRM_MODE_CONNECTOR_Unknown;
drm_connector_helper_add(connector, &intel_tv_connector_helper_funcs); drm_connector_helper_add(connector, &intel_tv_connector_helper_funcs);
connector->interlace_allowed = false;
connector->doublescan_allowed = false;
intel_tv_add_properties(connector); intel_tv_add_properties(connector);
} }
...@@ -1971,8 +1971,6 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv) ...@@ -1971,8 +1971,6 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
drm_connector_helper_add(connector, &intel_dsi_connector_helper_funcs); drm_connector_helper_add(connector, &intel_dsi_connector_helper_funcs);
connector->display_info.subpixel_order = SubPixelHorizontalRGB; /*XXX*/ connector->display_info.subpixel_order = SubPixelHorizontalRGB; /*XXX*/
connector->interlace_allowed = false;
connector->doublescan_allowed = false;
intel_connector_attach_encoder(intel_connector, intel_encoder); intel_connector_attach_encoder(intel_connector, intel_encoder);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment