| Message ID | 20200612160056.2082681-2-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/8] drm/atomic-helper: reset vblank on crtc reset | expand |
On 2020-06-12 12:00 p.m., Daniel Vetter wrote: > Now also comes with the added benefit of doing a drm_crtc_vblank_off(), > which means vblank state isn't ill-defined and fail-y at driver load > before the first modeset on each crtc. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> > Cc: Harry Wentland <harry.wentland@amd.com> > Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> > Cc: Roman Li <roman.li@amd.com> > Cc: Mikita Lipski <mikita.lipski@amd.com> > Cc: Stylon Wang <stylon.wang@amd.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index 68a73065b516..36d605a6eb16 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -4594,9 +4594,7 @@ static void dm_crtc_reset_state(struct drm_crtc *crtc) > if (WARN_ON(!state)) > return; > > - crtc->state = &state->base; > - crtc->state->crtc = crtc; > - > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > } > > static struct drm_crtc_state * >
On Fri, Jun 12, 2020 at 1:24 PM Harry Wentland <hwentlan@amd.com> wrote: > > On 2020-06-12 12:00 p.m., Daniel Vetter wrote: > > Now also comes with the added benefit of doing a drm_crtc_vblank_off(), > > which means vblank state isn't ill-defined and fail-y at driver load > > before the first modeset on each crtc. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Cc: Alex Deucher <alexander.deucher@amd.com> > > Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> > > Cc: Harry Wentland <harry.wentland@amd.com> > > Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > > Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> > > Cc: Roman Li <roman.li@amd.com> > > Cc: Mikita Lipski <mikita.lipski@amd.com> > > Cc: Stylon Wang <stylon.wang@amd.com> > > Reviewed-by: Harry Wentland <harry.wentland@amd.com> > Daniel, do you want to take the whole series, or should I pull this in through my tree? Either way works for me. Thanks for the patch! Alex > Harry > > > --- > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > index 68a73065b516..36d605a6eb16 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > @@ -4594,9 +4594,7 @@ static void dm_crtc_reset_state(struct drm_crtc *crtc) > > if (WARN_ON(!state)) > > return; > > > > - crtc->state = &state->base; > > - crtc->state->crtc = crtc; > > - > > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > > } > > > > static struct drm_crtc_state * > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Fri, Jun 12, 2020 at 01:41:17PM -0400, Alex Deucher wrote: > On Fri, Jun 12, 2020 at 1:24 PM Harry Wentland <hwentlan@amd.com> wrote: > > > > On 2020-06-12 12:00 p.m., Daniel Vetter wrote: > > > Now also comes with the added benefit of doing a drm_crtc_vblank_off(), > > > which means vblank state isn't ill-defined and fail-y at driver load > > > before the first modeset on each crtc. > > > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > > Cc: Alex Deucher <alexander.deucher@amd.com> > > > Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> > > > Cc: Harry Wentland <harry.wentland@amd.com> > > > Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > > > Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> > > > Cc: Roman Li <roman.li@amd.com> > > > Cc: Mikita Lipski <mikita.lipski@amd.com> > > > Cc: Stylon Wang <stylon.wang@amd.com> > > > > Reviewed-by: Harry Wentland <harry.wentland@amd.com> > > > > Daniel, do you want to take the whole series, or should I pull this in > through my tree? Either way works for me. Thanks for the patch! Merged the entire series through drm-misc-next now. -Daniel > > Alex > > > Harry > > > > > --- > > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +--- > > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > index 68a73065b516..36d605a6eb16 100644 > > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > @@ -4594,9 +4594,7 @@ static void dm_crtc_reset_state(struct drm_crtc *crtc) > > > if (WARN_ON(!state)) > > > return; > > > > > > - crtc->state = &state->base; > > > - crtc->state->crtc = crtc; > > > - > > > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > > > } > > > > > > static struct drm_crtc_state * > > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 68a73065b516..36d605a6eb16 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4594,9 +4594,7 @@ static void dm_crtc_reset_state(struct drm_crtc *crtc) if (WARN_ON(!state)) return; - crtc->state = &state->base; - crtc->state->crtc = crtc; - + __drm_atomic_helper_crtc_reset(crtc, &state->base); } static struct drm_crtc_state *
Now also comes with the added benefit of doing a drm_crtc_vblank_off(), which means vblank state isn't ill-defined and fail-y at driver load before the first modeset on each crtc. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Cc: Harry Wentland <harry.wentland@amd.com> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Cc: Roman Li <roman.li@amd.com> Cc: Mikita Lipski <mikita.lipski@amd.com> Cc: Stylon Wang <stylon.wang@amd.com> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)