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

drm/i915/vrr: Plumb the DSB into intel_vrr_send_push() 



Plumb the DSB down into intel_vrr_send_push() so that we can
perform the opration on the DSB.

TRANS_PUSH, being a transcoder register, needs non-posted writes
to make it through.

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


Reviewed-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
parent 8b85eada

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

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ void intel_pipe_update_end(struct intel_atomic_state *state, 
	 * which would cause the next frame to terminate already at vmin

	 * vblank start instead of vmax vblank start.

	 */

	intel_vrr_send_push(new_crtc_state);

	intel_vrr_send_push(NULL, new_crtc_state);



	local_irq_enable();

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

+11 −3
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ void intel_vrr_set_transcoder_timings(const struct intel_crtc_state *crtc_state) 
		       crtc_state->vrr.flipline - 1);

}



void intel_vrr_send_push(const struct intel_crtc_state *crtc_state)

void intel_vrr_send_push(struct intel_dsb *dsb,

			 const struct intel_crtc_state *crtc_state)

{

	struct intel_display *display = to_intel_display(crtc_state);

	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
@@ -398,8 +399,15 @@ void intel_vrr_send_push(const struct intel_crtc_state *crtc_state) 
	if (!crtc_state->vrr.enable)

		return;



	intel_de_write(display, TRANS_PUSH(display, cpu_transcoder),

	if (dsb)

		intel_dsb_nonpost_start(dsb);



	intel_de_write_dsb(display, dsb,

			   TRANS_PUSH(display, cpu_transcoder),

			   TRANS_PUSH_EN | TRANS_PUSH_SEND);



	if (dsb)

		intel_dsb_nonpost_end(dsb);

}



bool intel_vrr_is_push_sent(const struct intel_crtc_state *crtc_state)

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

+3 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct drm_connector_state; 
struct intel_atomic_state;

struct intel_connector;

struct intel_crtc_state;

struct intel_dsb;



bool intel_vrr_is_capable(struct intel_connector *connector);

bool intel_vrr_is_in_range(struct intel_connector *connector, int vrefresh);
@@ -22,7 +23,8 @@ void intel_vrr_compute_config(struct intel_crtc_state *crtc_state, 
void intel_vrr_compute_config_late(struct intel_crtc_state *crtc_state);

void intel_vrr_set_transcoder_timings(const struct intel_crtc_state *crtc_state);

void intel_vrr_enable(const struct intel_crtc_state *crtc_state);

void intel_vrr_send_push(const struct intel_crtc_state *crtc_state);

void intel_vrr_send_push(struct intel_dsb *dsb,

			 const struct intel_crtc_state *crtc_state);

bool intel_vrr_is_push_sent(const struct intel_crtc_state *crtc_state);

void intel_vrr_disable(const struct intel_crtc_state *old_crtc_state);

void intel_vrr_get_config(struct intel_crtc_state *crtc_state);