Skip to content

Commit 0a00038

Browse files
vsyrjalalutzbichler
authored andcommitted
drm/i915: Extract intel_mode_vblank_delay()
Extract the code that computes the hardware centric view of the vblank delay into a helper. We'll need a slightly different variant for VRR soon. Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Ankit Nautiyal <[email protected]>
1 parent 37cdb25 commit 0a00038

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ pre_commit_crtc_state(struct intel_atomic_state *state,
130130

131131
static int dsb_vblank_delay(const struct intel_crtc_state *crtc_state)
132132
{
133-
return intel_mode_vblank_start(&crtc_state->hw.adjusted_mode) -
134-
intel_mode_vdisplay(&crtc_state->hw.adjusted_mode);
133+
return intel_mode_vblank_delay(&crtc_state->hw.adjusted_mode);
135134
}
136135

137136
static int dsb_vtotal(struct intel_atomic_state *state,

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,11 @@ int intel_mode_vtotal(const struct drm_display_mode *mode)
591591
return vtotal;
592592
}
593593

594+
int intel_mode_vblank_delay(const struct drm_display_mode *mode)
595+
{
596+
return intel_mode_vblank_start(mode) - intel_mode_vdisplay(mode);
597+
}
598+
594599
void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state,
595600
const struct intel_crtc_state *new_crtc_state,
596601
struct intel_vblank_evade_ctx *evade)
@@ -647,8 +652,7 @@ void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state,
647652
*/
648653
if (intel_color_uses_dsb(new_crtc_state) ||
649654
new_crtc_state->update_m_n || new_crtc_state->update_lrr)
650-
evade->min -= intel_mode_vblank_start(adjusted_mode) -
651-
intel_mode_vdisplay(adjusted_mode);
655+
evade->min -= intel_mode_vblank_delay(adjusted_mode);
652656
}
653657

654658
/* must be called with vblank interrupt already enabled! */

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ int intel_mode_vdisplay(const struct drm_display_mode *mode);
2424
int intel_mode_vblank_start(const struct drm_display_mode *mode);
2525
int intel_mode_vblank_end(const struct drm_display_mode *mode);
2626
int intel_mode_vtotal(const struct drm_display_mode *mode);
27+
int intel_mode_vblank_delay(const struct drm_display_mode *mode);
2728

2829
void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state,
2930
const struct intel_crtc_state *new_crtc_state,

0 commit comments

Comments
 (0)