Skip to content

Commit fb64f55

Browse files
committed
drm/i915/cdclk: Do cdclk post plane programming later
We currently call intel_set_cdclk_post_plane_update() far too early. When pipes are active during the reprogramming the current spot only works for the cd2x divider update case, as that is synchronize to the pipe's vblank. Squashing and crawling are not synchronized in any way, so doing the programming while the pipes/planes are potentially still using the old hardware state could lead to underruns. Move the post plane reprgramming to a spot where we know that the pipes/planes have switched over the new hardware state. Cc: [email protected] Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Vinod Govindapillai <[email protected]>
1 parent 41ff0b4 commit fb64f55

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7354,9 +7354,6 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
73547354

73557355
intel_program_dpkgc_latency(state);
73567356

7357-
if (state->modeset)
7358-
intel_set_cdclk_post_plane_update(state);
7359-
73607357
intel_wait_for_vblank_workers(state);
73617358

73627359
/* FIXME: We should call drm_atomic_helper_commit_hw_done() here
@@ -7433,6 +7430,8 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
74337430
intel_verify_planes(state);
74347431

74357432
intel_sagv_post_plane_update(state);
7433+
if (state->modeset)
7434+
intel_set_cdclk_post_plane_update(state);
74367435
intel_pmdemand_post_plane_update(state);
74377436

74387437
drm_atomic_helper_commit_hw_done(&state->base);

0 commit comments

Comments
 (0)