On Fri, Jun 12, 2020 at 01:41:17PM -0400, Alex Deucher wrote: > On Fri, Jun 12, 2020 at 1:24 PM Harry Wentland <hwent...@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.vet...@intel.com> > > > Cc: Alex Deucher <alexander.deuc...@amd.com> > > > Cc: Nicholas Kazlauskas <nicholas.kazlaus...@amd.com> > > > Cc: Harry Wentland <harry.wentl...@amd.com> > > > Cc: Rodrigo Siqueira <rodrigo.sique...@amd.com> > > > Cc: Bhawanpreet Lakha <bhawanpreet.la...@amd.com> > > > Cc: Roman Li <roman...@amd.com> > > > Cc: Mikita Lipski <mikita.lip...@amd.com> > > > Cc: Stylon Wang <stylon.w...@amd.com> > > > > Reviewed-by: Harry Wentland <harry.wentl...@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-de...@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx