drm/i915: Extract intel_attach_scaling_mode_property()

Consolidate the scaling_mode property setup into a single
place.

The one slight complicateion here is that GMCH platforms can't
do the CENTER mode except on the LVDS port. But we can deal with
that by just checking the connector type.

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

diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index ed4d93942dbd20c254aaf32c79e94d767adc0459..59546cbcaeda985fd94d416025f931bd62690565 100644 (file)
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1974,16 +1974,8 @@ static void icl_dsi_add_properties(struct intel_connector *connector)
 {
        const struct drm_display_mode *fixed_mode =
                intel_panel_preferred_fixed_mode(connector);
-       u32 allowed_scalers;
 
-       allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT) |
-                          BIT(DRM_MODE_SCALE_FULLSCREEN) |
-                          BIT(DRM_MODE_SCALE_CENTER);
-
-       drm_connector_attach_scaling_mode_property(&connector->base,
-                                                  allowed_scalers);
-
-       connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
+       intel_attach_scaling_mode_property(&connector->base);
 
        drm_connector_set_panel_orientation_with_quirk(&connector->base,
                                                       intel_dsi_get_panel_orientation(connector),

diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
index 6d5cbeb8df4daf21e00f3f6d03f9c0fa5db5f90e..6205ddd3ded030972a2caec5e4738421548447d8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_connector.c
+++ b/drivers/gpu/drm/i915/display/intel_connector.c
@@ -293,3 +293,21 @@ intel_attach_dp_colorspace_property(struct drm_connector *connector)
        if (!drm_mode_create_dp_colorspace_property(connector))
                drm_connector_attach_colorspace_property(connector);
 }
+
+void
+intel_attach_scaling_mode_property(struct drm_connector *connector)
+{
+       struct drm_i915_private *i915 = to_i915(connector->dev);
+       u32 scaling_modes;
+
+       scaling_modes = BIT(DRM_MODE_SCALE_ASPECT) |
+               BIT(DRM_MODE_SCALE_FULLSCREEN);
+
+       /* On GMCH platforms borders are only possible on the LVDS port */
+       if (!HAS_GMCH(i915) || connector->connector_type == DRM_MODE_CONNECTOR_LVDS)
+               scaling_modes |= BIT(DRM_MODE_SCALE_CENTER);
+
+       drm_connector_attach_scaling_mode_property(connector, scaling_modes);
+
+       connector->state->scaling_mode = DRM_MODE_SCALE_ASPECT;
+}

diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
index 661a37a3c6d834893c094e0b5cb66c0593ee0436..7d7b588d2286f87b925bd13ae03f0f2e7a643a7b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_connector.h
+++ b/drivers/gpu/drm/i915/display/intel_connector.h
@@ -32,5 +32,6 @@ void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
 void intel_attach_aspect_ratio_property(struct drm_connector *connector);
 void intel_attach_hdmi_colorspace_property(struct drm_connector *connector);
 void intel_attach_dp_colorspace_property(struct drm_connector *connector);
+void intel_attach_scaling_mode_property(struct drm_connector *connector);
 
 #endif /* __INTEL_CONNECTOR_H__ */

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 2de7773b30ee4ccf7bac8b28d0e3e089a28b354b..0d195f8b190ae368cf84406b00335f2f3baeddb0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5183,16 +5183,8 @@ intel_edp_add_properties(struct intel_dp *intel_dp)
        struct drm_i915_private *i915 = to_i915(connector->base.dev);
        const struct drm_display_mode *fixed_mode =
                intel_panel_preferred_fixed_mode(connector);
-       u32 allowed_scalers;
 
-       allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT) |
-               BIT(DRM_MODE_SCALE_FULLSCREEN);
-       if (!HAS_GMCH(i915))
-               allowed_scalers |= BIT(DRM_MODE_SCALE_CENTER);
-
-       drm_connector_attach_scaling_mode_property(&connector->base, allowed_scalers);
-
-       connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
+       intel_attach_scaling_mode_property(&connector->base);
 
        if (!fixed_mode)
                return;

diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index 7cadb548ad6c496b18bed77092aa4c12e9862d4f..951170af7bb3bea4e52f27f3b19263c2b93756b8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -816,15 +816,7 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)
 
 static void intel_lvds_add_properties(struct drm_connector *connector)
 {
-       u32 allowed_scalers;
-
-       allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT) |
-               BIT(DRM_MODE_SCALE_FULLSCREEN) |
-               BIT(DRM_MODE_SCALE_CENTER);
-
-       drm_connector_attach_scaling_mode_property(connector, allowed_scalers);
-
-       connector->state->scaling_mode = DRM_MODE_SCALE_ASPECT;
+       intel_attach_scaling_mode_property(connector);
 }
 
 /**

diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index b3f5ca280ef2683e16806cd0af59bed38289ad10..421ad02f8e9be96218199e7ee07aad311153bd8b 100644 (file)
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -1659,19 +1659,10 @@ static const struct drm_connector_funcs intel_dsi_connector_funcs = {
 
 static void vlv_dsi_add_properties(struct intel_connector *connector)
 {
-       struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
        const struct drm_display_mode *fixed_mode =
                intel_panel_preferred_fixed_mode(connector);
-       u32 allowed_scalers;
 
-       allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT) | BIT(DRM_MODE_SCALE_FULLSCREEN);
-       if (!HAS_GMCH(dev_priv))
-               allowed_scalers |= BIT(DRM_MODE_SCALE_CENTER);
-
-       drm_connector_attach_scaling_mode_property(&connector->base,
-                                                  allowed_scalers);
-
-       connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
+       intel_attach_scaling_mode_property(&connector->base);
 
        drm_connector_set_panel_orientation_with_quirk(&connector->base,
                                                       intel_dsi_get_panel_orientation(connector),