On Wed, Apr 05, 2017 at 03:45:41PM -0400, Alex Deucher wrote: > On Mon, Apr 3, 2017 at 4:32 AM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > > Hi all, > > > > Partially this is a resend of the patches now unblocked by the vmwgfx atomic > > conversion just merged. I could entirely drop the vmwgfx patch since it's all > > fixed now. > > > > Then a bit of follow-up, plus converting the gamma_set/get ioctls. fbdev > > emulation and the property paths are still infested by drm_modeset_lock_all, but > > I think at least for fbdev we now have a semi-clear path with Thierry's series. > > Properties are still unclear to me, because it's a rather layered maze with lots > > of different callsites. > > > > As always, comments and review highly welcome. > > Patches 1-3, 5-8, 10-15: > Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> > > Patch 4: > typo in the commit message. With that fixed: > Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> Thanks for going through, unfortunately I applied 1-8 already. Pulled in 10-15 now too. -Daniel > > > > > > Cheers, Daniel > > > > Daniel Vetter (15): > > drm: Make drm_modeset_lock_crtc internal > > drm: Remove drm_modeset_(un)lock_crtc > > drm: Remove drm_modeset_legacy_acquire_ctx and crtc->acquire_ctx > > drm/atomic-helper: remove modeset_lock_all from helper_resume > > drm: drop modeset_lock_all from drm_state_info > > drm: Drop modeset_lock_all from the getproperty ioctl > > drm: Only take crtc lock in get_gamma ioctl > > drm/i915: Nuke intel_atomic_legacy_gamma_set > > drm/msm: Nerf zpos property > > drm/fb-helper: Give up on kgdb for atomic drivers > > drm: Add explicit acquire ctx handling around ->gamma_set > > drm: Add acquire ctx to ->gamma_set hook > > drm/atomic-helper: Remove legacy backoff hack from gamma_set > > drm: extract legacy framebuffer remove > > drm/fb-helper: Extract _legacy kms functions > > > > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 3 +- > > drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 +- > > drivers/gpu/drm/ast/ast_mode.c | 3 +- > > drivers/gpu/drm/cirrus/cirrus_mode.c | 3 +- > > drivers/gpu/drm/drm_atomic.c | 162 +++++++----------------------- > > drivers/gpu/drm/drm_atomic_helper.c | 35 +++---- > > drivers/gpu/drm/drm_color_mgmt.c | 51 +++++----- > > drivers/gpu/drm/drm_crtc_internal.h | 1 - > > drivers/gpu/drm/drm_fb_helper.c | 81 +++++++++------ > > drivers/gpu/drm/drm_framebuffer.c | 137 +++++++++++++++++++++---- > > drivers/gpu/drm/drm_modeset_lock.c | 102 ------------------- > > drivers/gpu/drm/drm_plane.c | 49 +++++---- > > drivers/gpu/drm/drm_property.c | 72 ++++++------- > > drivers/gpu/drm/gma500/gma_display.c | 3 +- > > drivers/gpu/drm/gma500/gma_display.h | 3 +- > > drivers/gpu/drm/i915/intel_display.c | 60 +---------- > > drivers/gpu/drm/i915/intel_pipe_crc.c | 2 +- > > drivers/gpu/drm/mgag200/mgag200_mode.c | 3 +- > > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 2 - > > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 3 +- > > drivers/gpu/drm/nouveau/nv50_display.c | 13 +-- > > drivers/gpu/drm/radeon/radeon_display.c | 3 +- > > drivers/gpu/drm/vc4/vc4_crtc.c | 3 +- > > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +- > > drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 3 +- > > include/drm/drm_atomic_helper.h | 3 +- > > include/drm/drm_crtc.h | 12 +-- > > include/drm/drm_modeset_lock.h | 5 - > > 31 files changed, 344 insertions(+), 488 deletions(-) > > > > -- > > 2.11.0 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@xxxxxxxxxxxxxxxxxxxxx > > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx