Commit 4b93f49d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/panel: mass rename functions to have intel_panel_ prefix 



Follow the usual naming conventions. Also pull HAS_GMCH() check to
intel_panel_fitting(). No functional changes.

Cc: Lyude Paul <lyude@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9ff6e42e377bdb0c9349f50d9ea79671059633c7.1629888677.git.jani.nikula@intel.com
parent c0a52f8b

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

+2 −2
Original line number Diff line number Diff line
@@ -1652,9 +1652,9 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, 
	int ret;



	pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;

	intel_fixed_panel_mode(fixed_mode, adjusted_mode);

	intel_panel_fixed_mode(fixed_mode, adjusted_mode);



	ret = intel_pch_panel_fitting(pipe_config, conn_state);

	ret = intel_panel_fitting(pipe_config, conn_state);

	if (ret)

		return ret;

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

+3 −6
Original line number Diff line number Diff line
@@ -1738,7 +1738,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, 
							    adjusted_mode);



	if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420) {

		ret = intel_pch_panel_fitting(pipe_config, conn_state);

		ret = intel_panel_fitting(pipe_config, conn_state);

		if (ret)

			return ret;

	}
@@ -1751,13 +1751,10 @@ intel_dp_compute_config(struct intel_encoder *encoder, 
		pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON;



	if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) {

		intel_fixed_panel_mode(intel_connector->panel.fixed_mode,

		intel_panel_fixed_mode(intel_connector->panel.fixed_mode,

				       adjusted_mode);



		if (HAS_GMCH(dev_priv))

			ret = intel_gmch_panel_fitting(pipe_config, conn_state);

		else

			ret = intel_pch_panel_fitting(pipe_config, conn_state);

		ret = intel_panel_fitting(pipe_config, conn_state);

		if (ret)

			return ret;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int intel_dvo_compute_config(struct intel_encoder *encoder, 
	 * of the original mode.

	 */

	if (fixed_mode)

		intel_fixed_panel_mode(fixed_mode, adjusted_mode);

		intel_panel_fixed_mode(fixed_mode, adjusted_mode);



	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)

		return -EINVAL;

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

+1 −1
Original line number Diff line number Diff line
@@ -2210,7 +2210,7 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, 
		return ret;



	if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420) {

		ret = intel_pch_panel_fitting(pipe_config, conn_state);

		ret = intel_panel_fitting(pipe_config, conn_state);

		if (ret)

			return ret;

	}

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

+2 −5
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static int intel_lvds_compute_config(struct intel_encoder *intel_encoder, 
	 * with the panel scaling set up to source from the H/VDisplay

	 * of the original mode.

	 */

	intel_fixed_panel_mode(intel_connector->panel.fixed_mode,

	intel_panel_fixed_mode(intel_connector->panel.fixed_mode,

			       adjusted_mode);



	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
@@ -451,10 +451,7 @@ static int intel_lvds_compute_config(struct intel_encoder *intel_encoder, 
	if (HAS_PCH_SPLIT(dev_priv))

		pipe_config->has_pch_encoder = true;



	if (HAS_GMCH(dev_priv))

		ret = intel_gmch_panel_fitting(pipe_config, conn_state);

	else

		ret = intel_pch_panel_fitting(pipe_config, conn_state);

	ret = intel_panel_fitting(pipe_config, conn_state);

	if (ret)

		return ret;