On Mon, Jul 04, 2016 at 03:40:29PM +0800, Liu Ying wrote: > Hi, > > This is the v3 patch set to convert imx drm into atomic mode setting. > It takes 3 phases to achieve the goal. > > v2->v3: > * Rebase onto Daniel Vetter's open git branch topic/drm-misc so that > we may better support nonblock atomic commit with the aid from > drm atomic helper. > * Remove dw-hdmi bridge driver's legacy drm_connector_funcs struture > step-by-step instead of doing that in patch 04/10 directly. > So, patch 08/10 in this set is newly introduced.
Assuming all my feedback has been addressed: Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch> I'd just go ahead and send Dave Airlie a pull req for this, but hurry up to make it into 4.8. -Daniel > > v1->v2: > * Rebase onto Philipp Zabel's open git branch imx-drm/next as Philipp > required. > * Drop patch 05/14 and 10/14 in v1 which touch drm core to disable > plane in transitional helper drm_helper_crtc_mode_set and in > drm_atomic_helper_disable_all, because we won't get ipu plane > resource in v2 when updating plane and failure won't happen. > * Wait for pending commit on each CRTC for both block and nonblock > atomic mode settings. This way, a block commit will not overwrite > the hardware setting when a nonblock page flip is about to finish, > so that the page flip may wait for vblank successfully. > * See changelogs in each patch for other trivial updates. > > Liu Ying (10): > drm/imx: ipuv3 plane: Check different types of plane separately > gpu: ipu-v3: ipu-dmfc: Use static DMFC FIFO allocation mechanism > drm/imx: atomic phase 1: Use transitional atomic CRTC and plane > helpers > drm/imx: atomic phase 2 step 1: Wire up state ->reset, ->duplicate and > ->destroy > drm/imx: atomic phase 2 step 2: Track plane_state->fb correctly in > ->page_flip > drm/imx: Remove encoders' ->prepare callbacks > drm/imx: atomic phase 3 step 1: Use atomic configuration > drm/bridge: dw-hdmi: Remove the legacy drm_connector_funcs structure > drm/imx: atomic phase 3 step 2: Legacy callback fixups > drm/imx: atomic phase 3 step 3: Advertise DRIVER_ATOMIC > > drivers/gpu/drm/bridge/dw-hdmi.c | 19 +- > drivers/gpu/drm/imx/dw_hdmi-imx.c | 22 +- > drivers/gpu/drm/imx/imx-drm-core.c | 120 +++++--- > drivers/gpu/drm/imx/imx-drm.h | 18 +- > drivers/gpu/drm/imx/imx-ldb.c | 129 ++++---- > drivers/gpu/drm/imx/imx-tve.c | 85 ++---- > drivers/gpu/drm/imx/ipuv3-crtc.c | 370 ++++++---------------- > drivers/gpu/drm/imx/ipuv3-plane.c | 543 > ++++++++++++++++----------------- > drivers/gpu/drm/imx/ipuv3-plane.h | 16 - > drivers/gpu/drm/imx/parallel-display.c | 74 +++-- > drivers/gpu/ipu-v3/ipu-dc.c | 5 +- > drivers/gpu/ipu-v3/ipu-di.c | 3 - > drivers/gpu/ipu-v3/ipu-dmfc.c | 213 +------------ > include/video/imx-ipu-v3.h | 3 - > 14 files changed, 592 insertions(+), 1028 deletions(-) > > -- > 2.7.4 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch