[PATCH 0/7] gem_bo.resv prime unification, leftovers

Daniel Vetter daniel.vetter at ffwll.ch
Tue Jun 25 20:42:01 UTC 2019


Hi all,

Here's the unmerged leftovers from my big prime cleanup series:
- using the prepare_fb helper in vc4&msm, now hopefully fixed up. The
  helper should be now even more useful.

- amd&nv driver ->gem_prime_res_obj callback removal. I think this one
  might have functional conflicts with Gerd's patch series to embed
  drm_gem_object in ttm_bo, or at least needs to be re-reviewed before we
  merge the 2nd series.

Comments, testing, feedback as usual very much welcome.

Thanks, Daniel

Daniel Vetter (7):
  drm/fb-helper: use gem_bo.resv, not dma_buf.resv in prepare_fb
  drm/msm: Use drm_gem_fb_prepare_fb
  drm/vc4: Use drm_gem_fb_prepare_fb
  drm/radeon: Fill out gem_object->resv
  drm/nouveau: Fill out gem_object->resv
  drm/amdgpu: Fill out gem_object->resv
  drm/prime: Ditch gem_prime_res_obj hook

 Documentation/gpu/todo.rst                   |  9 ------
 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c  | 17 +-----------
 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h  |  1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c      |  1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c   |  2 ++
 drivers/gpu/drm/drm_gem_framebuffer_helper.c | 29 ++++++++++----------
 drivers/gpu/drm/drm_prime.c                  |  3 --
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c    |  8 ++----
 drivers/gpu/drm/msm/msm_atomic.c             |  8 ++----
 drivers/gpu/drm/nouveau/nouveau_bo.c         |  2 ++
 drivers/gpu/drm/nouveau/nouveau_drm.c        |  1 -
 drivers/gpu/drm/nouveau/nouveau_gem.h        |  1 -
 drivers/gpu/drm/nouveau/nouveau_prime.c      |  7 -----
 drivers/gpu/drm/radeon/radeon_drv.c          |  2 --
 drivers/gpu/drm/radeon/radeon_object.c       |  1 +
 drivers/gpu/drm/radeon/radeon_prime.c        |  7 -----
 drivers/gpu/drm/vc4/vc4_plane.c              |  5 ++--
 include/drm/drm_drv.h                        | 12 --------
 18 files changed, 26 insertions(+), 90 deletions(-)

-- 
2.20.1



More information about the dri-devel mailing list