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

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


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

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

+1 −9
Original line number Diff line number Diff line
@@ -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),

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

+18 −0
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/i915/display/intel_connector.h

+1 −0
Original line number Diff line number Diff line
@@ -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__ */

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

+1 −9
Original line number Diff line number Diff line
@@ -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;

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

+1 −9
Original line number Diff line number Diff line
@@ -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);

}



/**