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

drm/i915/vrr: Tell intel_crtc_update_active_timings() about VRR explicitly 



In order to move VRR enable/disable to a place where it's also
applicable to fastsets we need to be prepared to configure
the pipe into non-VRR mode initially, and then later switch
to VRR mode. To that end allow the active timings to be configured
in non-VRR mode temporarily even when the crtc_state says we're
going to be using VRR.

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


Reviewed-by: default avatarMitul Golani <mitulkumar.ajitkumar.golani@intel.com>
parent fa9e4fce

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

+2 −1
Original line number Diff line number Diff line
@@ -692,7 +692,8 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) 
	 * FIXME Should be synchronized with the start of vblank somehow...

	 */

	if (new_crtc_state->seamless_m_n && intel_crtc_needs_fastset(new_crtc_state))

		intel_crtc_update_active_timings(new_crtc_state);

		intel_crtc_update_active_timings(new_crtc_state,

						 new_crtc_state->vrr.enable);



	local_irq_enable();

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

+2 −1
Original line number Diff line number Diff line
@@ -6910,7 +6910,8 @@ static void intel_enable_crtc(struct intel_atomic_state *state, 
	if (!intel_crtc_needs_modeset(new_crtc_state))

		return;



	intel_crtc_update_active_timings(new_crtc_state);

	intel_crtc_update_active_timings(new_crtc_state,

					 new_crtc_state->vrr.enable);



	dev_priv->display.funcs.display->crtc_enable(state, crtc);

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

+2 −1
Original line number Diff line number Diff line
@@ -559,7 +559,8 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915) 
			 */

			crtc_state->inherited = true;



			intel_crtc_update_active_timings(crtc_state);

			intel_crtc_update_active_timings(crtc_state,

							 crtc_state->vrr.enable);



			intel_crtc_copy_hw_to_uapi_state(crtc_state);

		}

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

+9 −3
Original line number Diff line number Diff line
@@ -488,21 +488,27 @@ static int intel_crtc_scanline_offset(const struct intel_crtc_state *crtc_state) 
	}

}



void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state)

void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state,

				      bool vrr_enable)

{

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

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

	u8 mode_flags = crtc_state->mode_flags;

	struct drm_display_mode adjusted_mode;

	int vmax_vblank_start = 0;

	unsigned long irqflags;



	drm_mode_init(&adjusted_mode, &crtc_state->hw.adjusted_mode);



	if (crtc_state->vrr.enable) {

	if (vrr_enable) {

		drm_WARN_ON(&i915->drm, (mode_flags & I915_MODE_FLAG_VRR) == 0);



		adjusted_mode.crtc_vtotal = crtc_state->vrr.vmax;

		adjusted_mode.crtc_vblank_end = crtc_state->vrr.vmax;

		adjusted_mode.crtc_vblank_start = intel_vrr_vmin_vblank_start(crtc_state);

		vmax_vblank_start = intel_vrr_vmax_vblank_start(crtc_state);

	} else {

		mode_flags &= ~I915_MODE_FLAG_VRR;

	}



	/*
@@ -524,7 +530,7 @@ void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state) 


	crtc->vmax_vblank_start = vmax_vblank_start;



	crtc->mode_flags = crtc_state->mode_flags;

	crtc->mode_flags = mode_flags;



	crtc->scanline_offset = intel_crtc_scanline_offset(crtc_state);

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

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ bool intel_crtc_get_vblank_timestamp(struct drm_crtc *crtc, int *max_error, 
int intel_get_crtc_scanline(struct intel_crtc *crtc);

void intel_wait_for_pipe_scanline_stopped(struct intel_crtc *crtc);

void intel_wait_for_pipe_scanline_moving(struct intel_crtc *crtc);

void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state);

void intel_crtc_update_active_timings(const struct intel_crtc_state *crtc_state,

				      bool vrr_enable);



#endif /* __INTEL_VBLANK_H__ */