Mesa (master): r300,r600,radeonsi: inline struct radeon_cmdbuf to remove dereferences

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3bd9db5be3c0e28443098dd0108e01a73c2b83e2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3bd9db5be3c0e28443098dd0108e01a73c2b83e2

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Nov 29 04:09:02 2020 -0500

r300,r600,radeonsi: inline struct radeon_cmdbuf to remove dereferences

It's straightforward except that the amdgpu winsys had to be cleaned up
to allow this.

radeon_cmdbuf is inlined and optionally the winsys can save the pointer
to it. radeon_cmdbuf::priv points to the winsys cs structure.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7907>

---

 src/gallium/drivers/r300/r300_blit.c               |   6 +-
 src/gallium/drivers/r300/r300_context.c            |  15 +-
 src/gallium/drivers/r300/r300_context.h            |   2 +-
 src/gallium/drivers/r300/r300_cs.h                 |   2 +-
 src/gallium/drivers/r300/r300_emit.c               |  20 +--
 src/gallium/drivers/r300/r300_flush.c              |   8 +-
 src/gallium/drivers/r300/r300_query.c              |   2 +-
 src/gallium/drivers/r300/r300_render.c             |   8 +-
 src/gallium/drivers/r300/r300_screen_buffer.c      |   4 +-
 src/gallium/drivers/r300/r300_transfer.c           |   6 +-
 src/gallium/drivers/r600/evergreen_compute.c       |  10 +-
 src/gallium/drivers/r600/evergreen_hw_context.c    |   4 +-
 src/gallium/drivers/r600/evergreen_state.c         |  52 +++---
 src/gallium/drivers/r600/r600_buffer_common.c      |  22 +--
 src/gallium/drivers/r600/r600_cs.h                 |   6 +-
 src/gallium/drivers/r600/r600_hw_context.c         |  22 +--
 src/gallium/drivers/r600/r600_pipe.c               |   4 +-
 src/gallium/drivers/r600/r600_pipe_common.c        |  67 ++++----
 src/gallium/drivers/r600/r600_pipe_common.h        |   2 +-
 src/gallium/drivers/r600/r600_query.c              |   8 +-
 src/gallium/drivers/r600/r600_state.c              |  38 ++---
 src/gallium/drivers/r600/r600_state_common.c       |  22 +--
 src/gallium/drivers/r600/r600_streamout.c          |  10 +-
 src/gallium/drivers/r600/r600_texture.c            |   2 +-
 src/gallium/drivers/r600/r600_viewport.c           |  10 +-
 src/gallium/drivers/r600/radeon_uvd.c              |  26 +--
 src/gallium/drivers/r600/radeon_vce.c              |  19 +--
 src/gallium/drivers/r600/radeon_vce.h              |   8 +-
 src/gallium/drivers/radeon/radeon_uvd.c            |  27 ++-
 src/gallium/drivers/radeon/radeon_uvd_enc.c        |  12 +-
 src/gallium/drivers/radeon/radeon_uvd_enc.h        |   2 +-
 src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c    |  26 +--
 src/gallium/drivers/radeon/radeon_vce.c            |  19 +--
 src/gallium/drivers/radeon/radeon_vce.h            |   8 +-
 src/gallium/drivers/radeon/radeon_vce_40_2_2.c     |   6 +-
 src/gallium/drivers/radeon/radeon_vce_52.c         |   6 +-
 src/gallium/drivers/radeon/radeon_vcn_dec.c        |  35 ++--
 src/gallium/drivers/radeon/radeon_vcn_dec.h        |   2 +-
 src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c   |  12 +-
 src/gallium/drivers/radeon/radeon_vcn_enc.c        |  22 ++-
 src/gallium/drivers/radeon/radeon_vcn_enc.h        |   8 +-
 src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c    |  22 +--
 src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c    |   8 +-
 src/gallium/drivers/radeon/radeon_vcn_enc_3_0.c    |   2 +-
 src/gallium/drivers/radeon/radeon_winsys.h         |  28 +++-
 src/gallium/drivers/radeonsi/cik_sdma.c            |  12 +-
 src/gallium/drivers/radeonsi/gfx10_query.c         |   4 +-
 src/gallium/drivers/radeonsi/si_buffer.c           |  34 ++--
 src/gallium/drivers/radeonsi/si_build_pm4.h        |  12 +-
 src/gallium/drivers/radeonsi/si_compute.c          |  32 ++--
 src/gallium/drivers/radeonsi/si_compute_blit.c     |   2 +-
 .../drivers/radeonsi/si_compute_prim_discard.c     |  21 ++-
 src/gallium/drivers/radeonsi/si_cp_dma.c           |  32 ++--
 src/gallium/drivers/radeonsi/si_cp_reg_shadowing.c |   8 +-
 src/gallium/drivers/radeonsi/si_debug.c            |  12 +-
 src/gallium/drivers/radeonsi/si_descriptors.c      |  24 +--
 src/gallium/drivers/radeonsi/si_dma_cs.c           |  44 ++---
 src/gallium/drivers/radeonsi/si_fence.c            |  36 ++--
 src/gallium/drivers/radeonsi/si_gfx_cs.c           |  38 ++---
 src/gallium/drivers/radeonsi/si_perfcounter.c      |  18 +-
 src/gallium/drivers/radeonsi/si_pipe.c             |  32 ++--
 src/gallium/drivers/radeonsi/si_pipe.h             |  10 +-
 src/gallium/drivers/radeonsi/si_pm4.c              |   4 +-
 src/gallium/drivers/radeonsi/si_query.c            |  14 +-
 src/gallium/drivers/radeonsi/si_state.c            |  32 ++--
 src/gallium/drivers/radeonsi/si_state_binning.c    |   8 +-
 src/gallium/drivers/radeonsi/si_state_draw.c       |  54 +++---
 src/gallium/drivers/radeonsi/si_state_shaders.c    |  42 ++---
 src/gallium/drivers/radeonsi/si_state_streamout.c  |  22 +--
 src/gallium/drivers/radeonsi/si_state_viewport.c   |  18 +-
 src/gallium/drivers/radeonsi/si_test_dma_perf.c    |   4 +-
 src/gallium/drivers/radeonsi/si_texture.c          |   2 +-
 src/gallium/winsys/amdgpu/drm/amdgpu_bo.c          |   2 +-
 src/gallium/winsys/amdgpu/drm/amdgpu_cs.c          | 182 +++++++++++----------
 src/gallium/winsys/amdgpu/drm/amdgpu_cs.h          |  30 +---
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c      |   2 +-
 src/gallium/winsys/radeon/drm/radeon_drm_cs.c      |  61 ++++---
 src/gallium/winsys/radeon/drm/radeon_drm_cs.h      |   5 +-
 78 files changed, 746 insertions(+), 757 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=3bd9db5be3c0e28443098dd0108e01a73c2b83e2