Skip to content

drm/msm: drm scheduler conversion and cleanups

Rob Clark dri-devel linux-arm-msm linux-media lkml 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest13 patches 21 repliesIn review
  2. v313 patches 0 repliesSuperseded
  3. v212 patches 0 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v111 patches7 repliesSuperseded

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/13drm/msm: Docs and misc cleanupdrivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_submit.c drivers/gpu/drm/msm/msm_gpu.h +2 more+23 -70 replies
2/13drm/msm: Small submitqueue creation cleanupdrivers/gpu/drm/msm/msm_submitqueue.c+11 -110 replies
3/13drm/msm: drop drm_gem_object_put_locked()drivers/gpu/drm/msm/adreno/a5xx_debugfs.c drivers/gpu/drm/msm/adreno/a5xx_gpu.c drivers/gpu/drm/msm/adreno/a5xx_power.c +10 more+33 -770 replies
4/13drm: Drop drm_gem_object_put_locked()drivers/gpu/drm/drm_gem.c include/drm/drm_gem.h+0 -240 replies
5/13drm/msm/submit: Simplify out-fence-fd handlingdrivers/gpu/drm/msm/msm_gem_submit.c+3 -70 replies
6/13drm/msm: Consolidate submit bo statedrivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_submit.c drivers/gpu/drm/msm/msm_gpu.c+75 -480 replies
7/13drm/msm: Track "seqno" fences by idrdrivers/gpu/drm/msm/msm_drv.c drivers/gpu/drm/msm/msm_fence.c drivers/gpu/drm/msm/msm_fence.h +4 more+61 -484 replies
8/13drm/msm: Return ERR_PTR() from submit_create()drivers/gpu/drm/msm/msm_gem_submit.c+9 -120 replies
9/13drm/msm: Conversion to drm schedulerdrivers/gpu/drm/msm/Kconfig drivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h +7 more+217 -1310 replies
10/13drm/msm: Drop submit bo_listdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem.h drivers/gpu/drm/msm/msm_gem_submit.c+13 -240 replies
11/13drm/msm: Drop struct_mutex in submit pathdrivers/gpu/drm/msm/msm_gem_submit.c+5 -70 replies
12/13drm/msm: Utilize gpu scheduler prioritiesdrivers/gpu/drm/msm/adreno/adreno_gpu.c drivers/gpu/drm/msm/msm_gem_submit.c drivers/gpu/drm/msm/msm_gpu.h +2 more+88 -2717 replies
13/13drm/msm/gem: Mark active before pinningdrivers/gpu/drm/msm/msm_gem.c drivers/gpu/drm/msm/msm_gem_submit.c+20 -100 replies

Reviews trailers per patch

11 of 13 patches have a Reviewed-by or Acked-by.

PatchChristian KönigDaniel Vetter
1/13A-b
2/13A-b
3/13A-b
4/13A-b R-b
5/13A-b
6/13A-b
7/13A-b
8/13A-b
9/13A-b
10/13
11/13A-b
12/13A-b
13/13

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/13] drm/msm: drm scheduler conversion and cleanups

From: Rob Clark <[email protected]>

Conversion to gpu_scheduler, and bonus removal of
drm_gem_object_put_locked()

v2: Fix priority mixup (msm UAPI has lower numeric priority value as
higher priority, inverse of drm/scheduler) and add some comments in the UAPI header to clarify.

Now that we move active refcnt get into msm_gem_submit, add a patch to mark all bos busy before pinning, to avoid evicting bos used in same batch.

Fix bo locking for cmdstream dumping ($debugfs/n/{rd,hangrd})

v3: Add a patch to drop submit bo_list and instead use -EALREADY
to detect errors with same obj appearing multiple times in the submit ioctl bos table. Otherwise, with struct_mutex locking dropped, we'd need to move insertion into and removal from bo_list under the obj lock.

v4: One last small tweak, drop unused wait_queue_head_t in
msm_fence_context

Rob Clark (13):
drm/msm: Docs and misc cleanup
drm/msm: Small submitqueue creation cleanup
drm/msm: drop drm_gem_object_put_locked()
drm: Drop drm_gem_object_put_locked()
drm/msm/submit: Simplify out-fence-fd handling
drm/msm: Consolidate submit bo state
drm/msm: Track "seqno" fences by idr
drm/msm: Return ERR_PTR() from submit_create()
drm/msm: Conversion to drm scheduler
drm/msm: Drop submit bo_list
drm/msm: Drop struct_mutex in submit path
drm/msm: Utilize gpu scheduler priorities
drm/msm/gem: Mark active before pinning

 drivers/gpu/drm/drm_gem.c                   |  22 --
 drivers/gpu/drm/msm/Kconfig                 |   1 +
 drivers/gpu/drm/msm/adreno/a5xx_debugfs.c   |   4 +-
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c       |   6 +-
 drivers/gpu/drm/msm/adreno/a5xx_power.c     |   2 +-
 drivers/gpu/drm/msm/adreno/a5xx_preempt.c   |   7 +-
 drivers/gpu/drm/msm/adreno/a6xx_gmu.c       |  12 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c       |   2 +-
 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c |   4 +-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c     |   6 +-
 drivers/gpu/drm/msm/msm_drv.c               |  30 +-
 drivers/gpu/drm/msm/msm_fence.c             |  42 ---
 drivers/gpu/drm/msm/msm_fence.h             |   3 -
 drivers/gpu/drm/msm/msm_gem.c               |  94 +-----
 drivers/gpu/drm/msm/msm_gem.h               |  47 +--
 drivers/gpu/drm/msm/msm_gem_submit.c        | 344 ++++++++++++--------
 drivers/gpu/drm/msm/msm_gpu.c               |  46 +--
 drivers/gpu/drm/msm/msm_gpu.h               |  78 ++++-
 drivers/gpu/drm/msm/msm_rd.c                |   6 +-
 drivers/gpu/drm/msm/msm_ringbuffer.c        |  70 +++-
 drivers/gpu/drm/msm/msm_ringbuffer.h        |  12 +
 drivers/gpu/drm/msm/msm_submitqueue.c       |  53 ++-
 include/drm/drm_gem.h                       |   2 -
 include/uapi/drm/msm_drm.h                  |  14 +-
 24 files changed, 516 insertions(+), 391 deletions(-)
Signature · 1 line
2.31.1