On Thu, Oct 03, 2024 at 05:41:10PM +0200, Louis Chauvet wrote: > Some members of the drm_crtc structure have been deprecated in favor of > equivalent members in the drm_crtc_state structure. As reported by Ville > Syrjala [1], the VKMS driver was still using these deprecated fields. This > commit updates the VKMS driver to use the new drm_crtc_state fields > instead. > > Additionally, this commit removes the call to > `drm_calc_timestamping_constants` in `vkms_enable_vblank` as it is > redundant. This calculation is already performed in > `vkms_atomic_commit_tail` by calling > `drm_atomic_helper_commit_modeset_disables`. One slight difference here is that drm_atomic_helper_calc_timestamping_constants() passes in crtc_state->adjusted_mode instead of crtc_state->mode, but doesn't look look vkms mangles either in any way so they should stay identical after drm_atomic_helper_check_modeset()->mode_fixup() has done the copy. Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > [1]:https://lore.kernel.org/all/20241002182200.15363-1-ville.syrjala@xxxxxxxxxxxxxxx/ > > Signed-off-by: Louis Chauvet <louis.chauvet@xxxxxxxxxxx> > --- > drivers/gpu/drm/vkms/vkms_composer.c | 4 ++-- > drivers/gpu/drm/vkms/vkms_crtc.c | 2 -- > drivers/gpu/drm/vkms/vkms_writeback.c | 4 ++-- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c > index 57a5769fc994..3f0977d746be 100644 > --- a/drivers/gpu/drm/vkms/vkms_composer.c > +++ b/drivers/gpu/drm/vkms/vkms_composer.c > @@ -187,7 +187,7 @@ static void blend(struct vkms_writeback_job *wb, > > const struct pixel_argb_u16 background_color = { .a = 0xffff }; > > - size_t crtc_y_limit = crtc_state->base.crtc->mode.vdisplay; > + size_t crtc_y_limit = crtc_state->base.mode.vdisplay; > > /* > * The planes are composed line-by-line to avoid heavy memory usage. It is a necessary > @@ -270,7 +270,7 @@ static int compose_active_planes(struct vkms_writeback_job *active_wb, > if (WARN_ON(check_format_funcs(crtc_state, active_wb))) > return -EINVAL; > > - line_width = crtc_state->base.crtc->mode.hdisplay; > + line_width = crtc_state->base.mode.hdisplay; > stage_buffer.n_pixels = line_width; > output_buffer.n_pixels = line_width; > > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c > index a40295c18b48..bbf080d32d2c 100644 > --- a/drivers/gpu/drm/vkms/vkms_crtc.c > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c > @@ -64,8 +64,6 @@ static int vkms_enable_vblank(struct drm_crtc *crtc) > struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc); > struct vkms_output *out = drm_crtc_to_vkms_output(crtc); > > - drm_calc_timestamping_constants(crtc, &crtc->mode); > - > hrtimer_init(&out->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); > out->vblank_hrtimer.function = &vkms_vblank_simulate; > out->period_ns = ktime_set(0, vblank->framedur_ns); > diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c > index bc724cbd5e3a..999d5c01ea81 100644 > --- a/drivers/gpu/drm/vkms/vkms_writeback.c > +++ b/drivers/gpu/drm/vkms/vkms_writeback.c > @@ -131,8 +131,8 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn, > struct drm_connector_state *conn_state = wb_conn->base.state; > struct vkms_crtc_state *crtc_state = output->composer_state; > struct drm_framebuffer *fb = connector_state->writeback_job->fb; > - u16 crtc_height = crtc_state->base.crtc->mode.vdisplay; > - u16 crtc_width = crtc_state->base.crtc->mode.hdisplay; > + u16 crtc_height = crtc_state->base.mode.vdisplay; > + u16 crtc_width = crtc_state->base.mode.hdisplay; > struct vkms_writeback_job *active_wb; > struct vkms_frame_info *wb_frame_info; > u32 wb_format = fb->format->format; > > --- > base-commit: cbc1e8696fbea0010a73bf93534c712f9ad177db > change-id: 20241003-remove-legacy-a2683a7bbcd5 > > Best regards, > -- > Louis Chauvet <louis.chauvet@xxxxxxxxxxx> -- Ville Syrjälä Intel
