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

drm/i915: Extract intel_lvds_add_properties() 



Move the LVDS connector property setup to a dedicated
function to depollute intel_lvds_init() a bit.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220912111814.17466-10-ville.syrjala@linux.intel.com


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

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

+14 −7
Original line number Diff line number Diff line
@@ -814,6 +814,19 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder) 
	return (val & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP;

}



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_lvds_init - setup LVDS connectors on this device

 * @dev_priv: i915 device
@@ -833,7 +846,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) 
	i915_reg_t lvds_reg;

	u32 lvds;

	u8 pin;

	u32 allowed_scalers;



	/* Skip init on machines we know falsely report LVDS */

	if (dmi_check_system(intel_no_lvds)) {
@@ -925,12 +937,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) 


	lvds_encoder->reg = lvds_reg;



	/* create the scaling mode property */

	allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT);

	allowed_scalers |= BIT(DRM_MODE_SCALE_FULLSCREEN);

	allowed_scalers |= BIT(DRM_MODE_SCALE_CENTER);

	drm_connector_attach_scaling_mode_property(connector, allowed_scalers);

	connector->state->scaling_mode = DRM_MODE_SCALE_ASPECT;

	intel_lvds_add_properties(connector);



	intel_lvds_pps_get_hw_state(dev_priv, &lvds_encoder->init_pps);

	lvds_encoder->init_lvds_val = lvds;