Commit ab6214f3 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Move eDP scaling_mode prop setup to the proper place 



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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220912111814.17466-11-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 2f0f603a

drivers/gpu/drm/i915/display/intel_dp.c

+10 −13
Original line number Diff line number Diff line
@@ -5172,19 +5172,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);

}
@@ -5196,6 +5183,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;