[Intel-gfx] [PATCH 10/15] drm/i915: Move eDP scaling_mode prop setup to the proper place

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

We have an eDP specific intel_edp_add_properties() so move
the eDP scaling_mode property setup there from
intel_dp_add_properties().

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index de5a4d2df78e..049228a09364 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5183,19 +5183,6 @@ intel_dp_add_properties(struct intel_dp *intel_dp, 
struct drm_connector *connect
        if (has_gamut_metadata_dip(dev_priv, port))
                drm_connector_attach_hdr_output_metadata_property(connector);
 
-       if (intel_dp_is_edp(intel_dp)) {
-               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, 
allowed_scalers);
-
-               connector->state->scaling_mode = DRM_MODE_SCALE_ASPECT;
-
-       }
-
        if (HAS_VRR(dev_priv))
                drm_connector_attach_vrr_capable_property(connector);
 }
@@ -5207,6 +5194,16 @@ 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;
 
        if (!fixed_mode)
                return;
-- 
2.35.1