| Message ID | 20200907120026.6360-3-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/atomic-helper: Extract drm_atomic_helper_calc_timestamping_constants() | expand |
On Mon, Sep 07, 2020 at 03:00:26PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > 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> Does this fix some CI fail? I'd kinda expect/hope for that ... Anyway looks like a good idea to not mess with the uapi state like this. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/display/intel_display.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 035840ce3825..a846f414c759 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -13472,12 +13472,6 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) > "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; > } > > @@ -15578,7 +15572,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); > > -- > 2.26.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, Sep 07, 2020 at 08:14:38PM +0200, Daniel Vetter wrote: > On Mon, Sep 07, 2020 at 03:00:26PM +0300, Ville Syrjala wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > 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> > > Does this fix some CI fail? I'd kinda expect/hope for that ... Nah. Just trying to get rid of some of the confusing stuff before we add even more confusing stuff for bigjoiner. > > Anyway looks like a good idea to not mess with the uapi state like this. > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 7 ------- > > 1 file changed, 7 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > > index 035840ce3825..a846f414c759 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -13472,12 +13472,6 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) > > "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; > > } > > > > @@ -15578,7 +15572,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); > > > > -- > > 2.26.2 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 035840ce3825..a846f414c759 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -13472,12 +13472,6 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) "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; } @@ -15578,7 +15572,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);