Skip to content

RFC Atomic/nuclear modeset/pageflip

Rob Clark dri-devel 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 RFC Latest14 patches 17 repliesIn review
  2. v3 RFC14 patches 5 repliesSuperseded
  3. v2 RFC13 patches 4 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v1 RFC12 patches25 repliesSuperseded

Changes since previous from the cover letter

+ convert new properties over to DRM_MODE_PROP_EXTENDED_TYPE, so we aren't consuming one new bit per property type (as suggested by, I think, Ville)
+ Fixed usage of ww_ctx, split things out into 'struct drm_modeset_lock' to make things easier when we start making locking even more fine grained (ie. per-plane locks, etc)
+ Handle connector_ids changes better. In legacy setcrtc path, we implicitly update other CRTCs that are having their connector stolen, whereas in atomic ioctl there is no implicit connector stealing (ie. this is an error if user does not also remove the connector from it's current CRTC.

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14drm: add atomic fxnsdrivers/gpu/drm/Makefile drivers/gpu/drm/ast/ast_drv.c drivers/gpu/drm/ast/ast_drv.h +58 more+619 -1030 replies
2/14drm: convert crtc to ww_mutexdrivers/gpu/drm/drm_atomic_helper.c drivers/gpu/drm/drm_crtc.c drivers/gpu/drm/i915/intel_display.c +6 more+340 -390 replies
3/14drm: add object property typedrivers/gpu/drm/drm_crtc.c include/drm/drm_crtc.h include/uapi/drm/drm_mode.h+88 -130 replies
4/14drm: add signed-range property typedrivers/gpu/drm/drm_crtc.c include/drm/drm_crtc.h include/uapi/drm/drm_mode.h+38 -40 replies
5/14drm: helpers to find mode objectsdrivers/gpu/drm/drm_crtc.c include/drm/drm_crtc.h+63 -670 replies
6/14drm: split propvals out and blob property supportdrivers/gpu/drm/drm_crtc.c drivers/gpu/drm/drm_fb_helper.c drivers/gpu/drm/gma500/cdv_intel_dp.c +18 more+142 -570 replies
7/14drm: Allow drm_mode_object_find() to look up an object of any typedrivers/gpu/drm/drm_crtc.c include/drm/drm_crtc.h+3 -10 replies
8/14drm: Refactor object property check codedrivers/gpu/drm/drm_crtc.c+14 -110 replies
9/14drm: convert plane to properties/statedrivers/gpu/drm/drm_atomic_helper.c drivers/gpu/drm/drm_crtc.c drivers/gpu/drm/drm_fb_helper.c +16 more+654 -18912 replies
10/14drm: convert crtc to properties/statedrivers/gpu/drm/ast/ast_mode.c drivers/gpu/drm/cirrus/cirrus_mode.c drivers/gpu/drm/drm_atomic_helper.c +21 more+818 -2505 replies
11/14drm: push locking down into restore_fbdev_modedrivers/gpu/drm/drm_fb_cma_helper.c drivers/gpu/drm/drm_fb_helper.c drivers/gpu/drm/exynos/exynos_drm_fbdev.c +6 more+19 -370 replies
12/14drm: Atomic modeset ioctldrivers/gpu/drm/drm_crtc.c drivers/gpu/drm/drm_drv.c include/drm/drmP.h +3 more+197 -00 replies
13/14drm/msm: add atomic supportdrivers/gpu/drm/msm/Makefile drivers/gpu/drm/msm/mdp4/mdp4_crtc.c drivers/gpu/drm/msm/mdp4/mdp4_kms.c +6 more+228 -530 replies
14/14HACK: drm: allow FB's in drm_mode_object_finddrivers/gpu/drm/drm_crtc.c+1 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [RFCv4 00/14] Atomic/nuclear modeset/pageflip

Previous Revision:
http://lists.freedesktop.org/archives/dri-devel/2013-November/049363.html

Changes since previous:
+ convert new properties over to DRM_MODE_PROP_EXTENDED_TYPE, so we aren't consuming one new bit per property type (as suggested by, I think, Ville)
+ Fixed usage of ww_ctx, split things out into 'struct drm_modeset_lock' to make things easier when we start making locking even more fine grained (ie. per-plane locks, etc)
+ Handle connector_ids changes better. In legacy setcrtc path, we implicitly update other CRTCs that are having their connector stolen, whereas in atomic ioctl there is no implicit connector stealing (ie. this is an error if user does not also remove the connector from it's current CRTC.

---------------------------------------------------------------------

Description from original RFC (with updated links):

This patchset is the merging of Ville's atomic modeset ioctl, and the drm_{crtc,plane}_state stuff from my original nuclear pageflip RFC.

It is currently working on msm with an updated version of Ville's glplane test app (removing cursor properties and atomic event):

https://github.com/robclark/glplane

the libdrm bits can be found here:

https://github.com/robclark/libdrm/commits/atomic

The msm part is on top of msm-next, the complete branch can be found:

http://cgit.freedesktop.org/~robclark/linux/log/?h=global-thermonuclear-war-9

Compared to my earlier nuclear pageflip RFC, there is now a set of drm_atomic helpers which do most of the non-hw-specific work for the different drivers.

Unlike the crtc helpers, it is intended that the atomic helpers can be used piecemeal by the drivers, either using all or overriding parts as needed.

A naive driver, with no special constraints or hw support for atomic updates may simply add the following to their driver struct:

.atomic_begin = drm_atomic_helper_begin,
.atomic_set_event = drm_atomic_helper_set_event,
.atomic_check = drm_atomic_helper_check,
.atomic_commit = drm_atomic_helper_commit,
.atomic_end = drm_atomic_helper_end,
.atomic_helpers = &drm_atomic_helper_funcs,

In addition, if you're plane/crtc doesn't already have it's own custom properties, then add to your plane/crtc_funcs:

.set_property = drm_atomic_helper_{plane,crtc}_set_property,

A driver which can have (for example) conflicting modes across multiple crtcs (for example, bandwidth limitations or clock/pll configuration restrictions), can wrap drm_atomic_helper_check() with their own driver specific .atomic_check() function.

A driver which can support true atomic updates can wrap drm_atomic_helper_commit().

A driver with custom properties should override the appropriate get_state(), check_state(), and commit_state() functions in .atomic_helpers if it uses the drm-atomic-helpers. Otherwise it is free to use &drm_atomic_helper_funcs as-is.

Rob Clark (11):
drm: add atomic fxns
drm: convert crtc to ww_mutex
drm: add object property type
drm: add signed-range property type
drm: helpers to find mode objects
drm: split propvals out and blob property support
drm: convert plane to properties/state
drm: convert crtc to properties/state
drm: push locking down into restore_fbdev_mode drm/msm: add atomic support
HACK: drm: allow FB's in drm_mode_object_find

Ville Syrjälä (3):
drm: Allow drm_mode_object_find() to look up an object of any type
drm: Refactor object property check code
drm: Atomic modeset ioctl

 drivers/gpu/drm/Makefile                    |    3 +-
 drivers/gpu/drm/ast/ast_drv.c               |    6 +
 drivers/gpu/drm/ast/ast_drv.h               |    1 +
 drivers/gpu/drm/ast/ast_mode.c              |    1 +
 drivers/gpu/drm/cirrus/cirrus_drv.c         |    6 +
 drivers/gpu/drm/cirrus/cirrus_drv.h         |    1 +
 drivers/gpu/drm/cirrus/cirrus_mode.c        |    1 +
 drivers/gpu/drm/drm_atomic_helper.c         |  696 ++++++++++++
 drivers/gpu/drm/drm_crtc.c                  | 1630 +++++++++++++++++++--------
 drivers/gpu/drm/drm_drv.c                   |    1 +
 drivers/gpu/drm/drm_fb_cma_helper.c         |    9 +-
 drivers/gpu/drm/drm_fb_helper.c             |   28 +-
 drivers/gpu/drm/exynos/exynos_drm_crtc.c    |   15 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c     |    7 +
 drivers/gpu/drm/exynos/exynos_drm_encoder.c |    6 +-
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c   |    4 +-
 drivers/gpu/drm/exynos/exynos_drm_plane.c   |   19 +-
 drivers/gpu/drm/gma500/cdv_intel_crt.c      |    4 +-
 drivers/gpu/drm/gma500/cdv_intel_display.c  |    1 +
 drivers/gpu/drm/gma500/cdv_intel_dp.c       |    7 +-
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c     |    7 +-
 drivers/gpu/drm/gma500/cdv_intel_lvds.c     |   10 +-
 drivers/gpu/drm/gma500/mdfld_dsi_output.c   |   12 +-
 drivers/gpu/drm/gma500/psb_drv.c            |   11 +-
 drivers/gpu/drm/gma500/psb_drv.h            |    1 +
 drivers/gpu/drm/gma500/psb_intel_display.c  |    1 +
 drivers/gpu/drm/gma500/psb_intel_drv.h      |    4 +-
 drivers/gpu/drm/gma500/psb_intel_lvds.c     |   10 +-
 drivers/gpu/drm/gma500/psb_intel_sdvo.c     |   23 +-
 drivers/gpu/drm/i2c/ch7006_drv.c            |    4 +-
 drivers/gpu/drm/i915/i915_drv.c             |    8 +
 drivers/gpu/drm/i915/intel_crt.c            |    4 +-
 drivers/gpu/drm/i915/intel_display.c        |   20 +-
 drivers/gpu/drm/i915/intel_dp.c             |    7 +-
 drivers/gpu/drm/i915/intel_drv.h            |    1 +
 drivers/gpu/drm/i915/intel_fbdev.c          |    6 +-
 drivers/gpu/drm/i915/intel_hdmi.c           |    7 +-
 drivers/gpu/drm/i915/intel_lvds.c           |    4 +-
 drivers/gpu/drm/i915/intel_sdvo.c           |   23 +-
 drivers/gpu/drm/i915/intel_sprite.c         |   21 +-
 drivers/gpu/drm/i915/intel_tv.c             |   11 +-
 drivers/gpu/drm/mgag200/mgag200_drv.c       |    7 +
 drivers/gpu/drm/mgag200/mgag200_drv.h       |    1 +
 drivers/gpu/drm/mgag200/mgag200_mode.c      |    1 +
 drivers/gpu/drm/msm/Makefile                |    1 +
 drivers/gpu/drm/msm/mdp4/mdp4_crtc.c        |   69 +-
 drivers/gpu/drm/msm/mdp4/mdp4_kms.c         |    6 +
 drivers/gpu/drm/msm/mdp4/mdp4_kms.h         |    1 +
 drivers/gpu/drm/msm/mdp4/mdp4_plane.c       |   23 +-
 drivers/gpu/drm/msm/msm_atomic.c            |  149 +++
 drivers/gpu/drm/msm/msm_drv.c               |   33 +-
 drivers/gpu/drm/msm/msm_drv.h               |    9 +
 drivers/gpu/drm/msm/msm_gem.c               |   24 +-
 drivers/gpu/drm/msm/msm_gem.h               |   13 +
 drivers/gpu/drm/nouveau/dispnv04/crtc.c     |    1 +
 drivers/gpu/drm/nouveau/dispnv04/overlay.c  |   12 +-
 drivers/gpu/drm/nouveau/dispnv04/tvnv17.c   |    3 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c |    7 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c       |    7 +
 drivers/gpu/drm/nouveau/nouveau_drm.h       |    1 +
 drivers/gpu/drm/nouveau/nv50_display.c      |    1 +
 drivers/gpu/drm/omapdrm/omap_crtc.c         |   31 +-
 drivers/gpu/drm/omapdrm/omap_drv.c          |   16 +-
 drivers/gpu/drm/omapdrm/omap_drv.h          |    5 +-
 drivers/gpu/drm/omapdrm/omap_plane.c        |   37 +-
 drivers/gpu/drm/qxl/qxl_display.c           |    6 +-
 drivers/gpu/drm/qxl/qxl_drv.c               |    9 +
 drivers/gpu/drm/radeon/radeon_connectors.c  |    9 +-
 drivers/gpu/drm/radeon/radeon_display.c     |    2 +
 drivers/gpu/drm/radeon/radeon_drv.c         |    9 +
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c      |    2 +
 drivers/gpu/drm/rcar-du/rcar_du_drv.c       |    7 +
 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c   |    3 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.c     |   12 +-
 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c    |    3 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c   |    8 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.c    |    7 +
 drivers/gpu/drm/shmobile/shmob_drm_plane.c  |    6 +-
 drivers/gpu/drm/tegra/dc.c                  |   16 +-
 drivers/gpu/drm/tegra/fb.c                  |    7 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c        |    1 +
 drivers/gpu/drm/tilcdc/tilcdc_drv.c         |    6 +
 drivers/gpu/drm/tilcdc/tilcdc_drv.h         |    1 +
 drivers/gpu/drm/tilcdc/tilcdc_slave.c       |    3 +-
 drivers/gpu/drm/udl/udl_connector.c         |    6 +-
 drivers/gpu/drm/udl/udl_drv.c               |    8 +
 drivers/gpu/drm/udl/udl_modeset.c           |    2 +
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c         |    7 +
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h         |    1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c         |   12 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h         |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c         |    1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c        |    1 +
 include/drm/drmP.h                          |   88 +-
 include/drm/drm_atomic_helper.h             |  193 ++++
 include/drm/drm_crtc.h                      |  341 +++++-
 include/drm/drm_fb_helper.h                 |    3 +-
 include/uapi/drm/drm.h                      |   12 +
 include/uapi/drm/drm_mode.h                 |   38 +
 99 files changed, 3166 insertions(+), 767 deletions(-)
 create mode 100644 drivers/gpu/drm/drm_atomic_helper.c
 create mode 100644 drivers/gpu/drm/msm/msm_atomic.c
 create mode 100644 include/drm/drm_atomic_helper.h
Signature · 6 lines
1.8.4.2

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel