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

drm/i915: Extract intel_crtc_compute_pipe_mode() 



Pull intel_crtc_compute_pipe_mode() out from
intel_crtc_compute_config(). Since it's semi related
we'll suck in the max dotclock/double wide checks in
as well.

And we'll pimp the debugs while at it.

Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220223131315.18016-9-ville.syrjala@linux.intel.com
parent 9c1197a0

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

+20 −8
Original line number Diff line number Diff line
@@ -2836,17 +2836,12 @@ static int intel_crtc_compute_pipe_src(struct intel_crtc_state *crtc_state) 
	return 0;

}



static int intel_crtc_compute_config(struct intel_crtc *crtc,

				     struct intel_crtc_state *crtc_state)

static int intel_crtc_compute_pipe_mode(struct intel_crtc_state *crtc_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

	struct drm_i915_private *i915 = to_i915(crtc->base.dev);

	struct drm_display_mode *pipe_mode = &crtc_state->hw.pipe_mode;

	int clock_limit = i915->max_dotclk_freq;

	int ret;



	ret = intel_crtc_compute_pipe_src(crtc_state);

	if (ret)

		return ret;



	drm_mode_copy(pipe_mode, &crtc_state->hw.adjusted_mode);
@@ -2872,12 +2867,29 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, 


	if (pipe_mode->crtc_clock > clock_limit) {

		drm_dbg_kms(&i915->drm,

			    "requested pixel clock (%d kHz) too high (max: %d kHz, double wide: %s)\n",

			    "[CRTC:%d:%s] requested pixel clock (%d kHz) too high (max: %d kHz, double wide: %s)\n",

			    crtc->base.base.id, crtc->base.name,

			    pipe_mode->crtc_clock, clock_limit,

			    yesno(crtc_state->double_wide));

		return -EINVAL;

	}



	return 0;

}



static int intel_crtc_compute_config(struct intel_crtc *crtc,

				     struct intel_crtc_state *crtc_state)

{

	int ret;



	ret = intel_crtc_compute_pipe_src(crtc_state);

	if (ret)

		return ret;



	ret = intel_crtc_compute_pipe_mode(crtc_state);

	if (ret)

		return ret;



	intel_crtc_compute_pixel_rate(crtc_state);



	if (crtc_state->has_pch_encoder)