drm/i915: Drop the drm_atomic_helper_calc_timestamping_constants() call
We update the timestamping constants per-crtc explicitly in intel_crtc_update_active_timings(). Furtermore the helper will use uapi.adjusted_mode whereas we want hw.adjusted_mode. Thus let's drop the helper call an rely on what we already have in intel_crtc_update_active_timings(). We can now also drop the hw.adjusted_mode -> uapi.adjusted_mode copy hack that was added to keep the helper from deriving the timestamping constants from the wrong thing. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200907120026.6360-3-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
441959ebc9
commit
79628c543e
@ -13471,12 +13471,6 @@ encoder_retry:
|
||||
"hw max bpp: %i, pipe bpp: %i, dithering: %i\n",
|
||||
base_bpp, pipe_config->pipe_bpp, pipe_config->dither);
|
||||
|
||||
/*
|
||||
* Make drm_calc_timestamping_constants in
|
||||
* drm_atomic_helper_update_legacy_modeset_state() happy
|
||||
*/
|
||||
pipe_config->uapi.adjusted_mode = pipe_config->hw.adjusted_mode;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -15577,7 +15571,6 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
|
||||
|
||||
if (state->modeset) {
|
||||
drm_atomic_helper_update_legacy_modeset_state(dev, &state->base);
|
||||
drm_atomic_helper_calc_timestamping_constants(&state->base);
|
||||
|
||||
intel_set_cdclk_pre_plane_update(state);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user