[PATCH v2 2/2] drm/amdgpu: Retire amdgpu_ring.ready flag.
Koenig, Christian
Christian.Koenig at amd.com
Mon Oct 22 09:40:10 UTC 2018
Am 19.10.18 um 22:52 schrieb Andrey Grodzovsky:
> Start using drm_gpu_scheduler.ready isntead.
Please drop all occurrences of setting sched.ready manually around the
ring tests.
Instead add a helper function into amdgpu_ring.c which does the ring
tests and sets ready depending on the result.
Regards,
Christian.
>
> Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 +++---
> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 18 ++++++++---------
> drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 -
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 14 ++++++-------
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 12 ++++++------
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 24 ++++++++++++-----------
> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 18 ++++++++---------
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 ++++----
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 14 ++++++-------
> drivers/gpu/drm/amd/amdgpu/si_dma.c | 6 +++---
> drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +++---
> drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +++---
> drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 10 +++++-----
> drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 10 +++++-----
> drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 6 +++---
> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 14 ++++++-------
> 26 files changed, 105 insertions(+), 104 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index c31a884..eaa58bb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -144,7 +144,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)
> KGD_MAX_QUEUES);
>
> /* remove the KIQ bit as well */
> - if (adev->gfx.kiq.ring.ready)
> + if (adev->gfx.kiq.ring.sched.ready)
> clear_bit(amdgpu_gfx_queue_to_bit(adev,
> adev->gfx.kiq.ring.me - 1,
> adev->gfx.kiq.ring.pipe,
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index 42cb4c4..f7819a5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -876,7 +876,7 @@ static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid)
> if (adev->in_gpu_reset)
> return -EIO;
>
> - if (ring->ready)
> + if (ring->sched.ready)
> return invalidate_tlbs_with_kiq(adev, pasid);
>
> for (vmid = 0; vmid < 16; vmid++) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> index b8963b7..fc74f40a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
> @@ -146,7 +146,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
> fence_ctx = 0;
> }
>
> - if (!ring->ready) {
> + if (!ring->sched.ready) {
> dev_err(adev->dev, "couldn't schedule ib on ring <%s>\n", ring->name);
> return -EINVAL;
> }
> @@ -351,7 +351,7 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
> struct amdgpu_ring *ring = adev->rings[i];
> long tmo;
>
> - if (!ring || !ring->ready)
> + if (!ring || !ring->sched.ready)
> continue;
>
> /* skip IB tests for KIQ in general for the below reasons:
> @@ -375,7 +375,7 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
>
> r = amdgpu_ring_test_ib(ring, tmo);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
>
> if (ring == &adev->gfx.gfx_ring[0]) {
> /* oh, oh, that's really bad */
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index 50ece76..25307a4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -336,7 +336,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
> case AMDGPU_HW_IP_GFX:
> type = AMD_IP_BLOCK_TYPE_GFX;
> for (i = 0; i < adev->gfx.num_gfx_rings; i++)
> - if (adev->gfx.gfx_ring[i].ready)
> + if (adev->gfx.gfx_ring[i].sched.ready)
> ++num_rings;
> ib_start_alignment = 32;
> ib_size_alignment = 32;
> @@ -344,7 +344,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
> case AMDGPU_HW_IP_COMPUTE:
> type = AMD_IP_BLOCK_TYPE_GFX;
> for (i = 0; i < adev->gfx.num_compute_rings; i++)
> - if (adev->gfx.compute_ring[i].ready)
> + if (adev->gfx.compute_ring[i].sched.ready)
> ++num_rings;
> ib_start_alignment = 32;
> ib_size_alignment = 32;
> @@ -352,7 +352,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
> case AMDGPU_HW_IP_DMA:
> type = AMD_IP_BLOCK_TYPE_SDMA;
> for (i = 0; i < adev->sdma.num_instances; i++)
> - if (adev->sdma.instance[i].ring.ready)
> + if (adev->sdma.instance[i].ring.sched.ready)
> ++num_rings;
> ib_start_alignment = 256;
> ib_size_alignment = 4;
> @@ -363,7 +363,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
> if (adev->uvd.harvest_config & (1 << i))
> continue;
>
> - if (adev->uvd.inst[i].ring.ready)
> + if (adev->uvd.inst[i].ring.sched.ready)
> ++num_rings;
> }
> ib_start_alignment = 64;
> @@ -372,7 +372,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
> case AMDGPU_HW_IP_VCE:
> type = AMD_IP_BLOCK_TYPE_VCE;
> for (i = 0; i < adev->vce.num_rings; i++)
> - if (adev->vce.ring[i].ready)
> + if (adev->vce.ring[i].sched.ready)
> ++num_rings;
> ib_start_alignment = 4;
> ib_size_alignment = 1;
> @@ -384,7 +384,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
> continue;
>
> for (j = 0; j < adev->uvd.num_enc_rings; j++)
> - if (adev->uvd.inst[i].ring_enc[j].ready)
> + if (adev->uvd.inst[i].ring_enc[j].sched.ready)
> ++num_rings;
> }
> ib_start_alignment = 64;
> @@ -392,7 +392,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
> break;
> case AMDGPU_HW_IP_VCN_DEC:
> type = AMD_IP_BLOCK_TYPE_VCN;
> - if (adev->vcn.ring_dec.ready)
> + if (adev->vcn.ring_dec.sched.ready)
> ++num_rings;
> ib_start_alignment = 16;
> ib_size_alignment = 16;
> @@ -400,14 +400,14 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev,
> case AMDGPU_HW_IP_VCN_ENC:
> type = AMD_IP_BLOCK_TYPE_VCN;
> for (i = 0; i < adev->vcn.num_enc_rings; i++)
> - if (adev->vcn.ring_enc[i].ready)
> + if (adev->vcn.ring_enc[i].sched.ready)
> ++num_rings;
> ib_start_alignment = 64;
> ib_size_alignment = 1;
> break;
> case AMDGPU_HW_IP_VCN_JPEG:
> type = AMD_IP_BLOCK_TYPE_VCN;
> - if (adev->vcn.ring_jpeg.ready)
> + if (adev->vcn.ring_jpeg.sched.ready)
> ++num_rings;
> ib_start_alignment = 16;
> ib_size_alignment = 16;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
> index 59cc678..7235cd0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
> @@ -2129,7 +2129,7 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
>
> for (i = 0; i < AMDGPU_MAX_RINGS; i++) {
> struct amdgpu_ring *ring = adev->rings[i];
> - if (ring && ring->ready)
> + if (ring && ring->sched.ready)
> amdgpu_fence_wait_empty(ring);
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index b70e85e..d38d445 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -338,7 +338,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
> */
> void amdgpu_ring_fini(struct amdgpu_ring *ring)
> {
> - ring->ready = false;
> + ring->sched.ready = false;
>
> /* Not to finish a ring which is not initialized */
> if (!(ring->adev) || !(ring->adev->rings[ring->idx]))
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> index 4caa301..569dfea 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
> @@ -189,7 +189,6 @@ struct amdgpu_ring {
> uint64_t gpu_addr;
> uint64_t ptr_mask;
> uint32_t buf_mask;
> - bool ready;
> u32 idx;
> u32 me;
> u32 pipe;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 3a68028..d76895c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -2069,7 +2069,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset,
> unsigned i;
> int r;
>
> - if (direct_submit && !ring->ready) {
> + if (direct_submit && !ring->sched.ready) {
> DRM_ERROR("Trying to move memory with ring turned off.\n");
> return -EINVAL;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> index 32eb43d..9562935 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> @@ -316,8 +316,8 @@ static void cik_sdma_gfx_stop(struct amdgpu_device *adev)
> WREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i], rb_cntl);
> WREG32(mmSDMA0_GFX_IB_CNTL + sdma_offsets[i], 0);
> }
> - sdma0->ready = false;
> - sdma1->ready = false;
> + sdma0->sched.ready = false;
> + sdma1->sched.ready = false;
> }
>
> /**
> @@ -494,7 +494,7 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev)
> /* enable DMA IBs */
> WREG32(mmSDMA0_GFX_IB_CNTL + sdma_offsets[i], ib_cntl);
>
> - ring->ready = true;
> + ring->sched.ready = true;
> }
>
> cik_sdma_enable(adev, true);
> @@ -503,7 +503,7 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev)
> ring = &adev->sdma.instance[i].ring;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> index 622dd70..98ffdb9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
> @@ -1950,9 +1950,9 @@ static void gfx_v6_0_cp_gfx_enable(struct amdgpu_device *adev, bool enable)
> CP_ME_CNTL__CE_HALT_MASK));
> WREG32(mmSCRATCH_UMSK, 0);
> for (i = 0; i < adev->gfx.num_gfx_rings; i++)
> - adev->gfx.gfx_ring[i].ready = false;
> + adev->gfx.gfx_ring[i].sched.ready = false;
> for (i = 0; i < adev->gfx.num_compute_rings; i++)
> - adev->gfx.compute_ring[i].ready = false;
> + adev->gfx.compute_ring[i].sched.ready = false;
> }
> udelay(50);
> }
> @@ -2124,10 +2124,10 @@ static int gfx_v6_0_cp_gfx_resume(struct amdgpu_device *adev)
>
> /* start the rings */
> gfx_v6_0_cp_gfx_start(adev);
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> return r;
> }
>
> @@ -2227,14 +2227,14 @@ static int gfx_v6_0_cp_compute_resume(struct amdgpu_device *adev)
> WREG32(mmCP_RB2_CNTL, tmp);
> WREG32(mmCP_RB2_BASE, ring->gpu_addr >> 8);
>
> - adev->gfx.compute_ring[0].ready = false;
> - adev->gfx.compute_ring[1].ready = false;
> + adev->gfx.compute_ring[0].sched.ready = false;
> + adev->gfx.compute_ring[1].sched.ready = false;
>
> for (i = 0; i < 2; i++) {
> r = amdgpu_ring_test_ring(&adev->gfx.compute_ring[i]);
> if (r)
> return r;
> - adev->gfx.compute_ring[i].ready = true;
> + adev->gfx.compute_ring[i].sched.ready = true;
> }
>
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> index 9fadb32..5558075 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> @@ -2403,7 +2403,7 @@ static void gfx_v7_0_cp_gfx_enable(struct amdgpu_device *adev, bool enable)
> } else {
> WREG32(mmCP_ME_CNTL, (CP_ME_CNTL__ME_HALT_MASK | CP_ME_CNTL__PFP_HALT_MASK | CP_ME_CNTL__CE_HALT_MASK));
> for (i = 0; i < adev->gfx.num_gfx_rings; i++)
> - adev->gfx.gfx_ring[i].ready = false;
> + adev->gfx.gfx_ring[i].sched.ready = false;
> }
> udelay(50);
> }
> @@ -2613,10 +2613,10 @@ static int gfx_v7_0_cp_gfx_resume(struct amdgpu_device *adev)
>
> /* start the ring */
> gfx_v7_0_cp_gfx_start(adev);
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> return r;
> }
>
> @@ -2675,7 +2675,7 @@ static void gfx_v7_0_cp_compute_enable(struct amdgpu_device *adev, bool enable)
> } else {
> WREG32(mmCP_MEC_CNTL, (CP_MEC_CNTL__MEC_ME1_HALT_MASK | CP_MEC_CNTL__MEC_ME2_HALT_MASK));
> for (i = 0; i < adev->gfx.num_compute_rings; i++)
> - adev->gfx.compute_ring[i].ready = false;
> + adev->gfx.compute_ring[i].sched.ready = false;
> }
> udelay(50);
> }
> @@ -3106,10 +3106,10 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev)
>
> for (i = 0; i < adev->gfx.num_compute_rings; i++) {
> ring = &adev->gfx.compute_ring[i];
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r)
> - ring->ready = false;
> + ring->sched.ready = false;
> }
>
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 4e6d31f..6869d9b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -1629,7 +1629,7 @@ static int gfx_v8_0_do_edc_gpr_workarounds(struct amdgpu_device *adev)
> return 0;
>
> /* bail if the compute ring is not ready */
> - if (!ring->ready)
> + if (!ring->sched.ready)
> return 0;
>
> tmp = RREG32(mmGB_EDC_MODE);
> @@ -4197,7 +4197,7 @@ static void gfx_v8_0_cp_gfx_enable(struct amdgpu_device *adev, bool enable)
> tmp = REG_SET_FIELD(tmp, CP_ME_CNTL, PFP_HALT, 1);
> tmp = REG_SET_FIELD(tmp, CP_ME_CNTL, CE_HALT, 1);
> for (i = 0; i < adev->gfx.num_gfx_rings; i++)
> - adev->gfx.gfx_ring[i].ready = false;
> + adev->gfx.gfx_ring[i].sched.ready = false;
> }
> WREG32(mmCP_ME_CNTL, tmp);
> udelay(50);
> @@ -4379,10 +4379,10 @@ static int gfx_v8_0_cp_gfx_resume(struct amdgpu_device *adev)
> /* start the ring */
> amdgpu_ring_clear_ring(ring);
> gfx_v8_0_cp_gfx_start(adev);
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r)
> - ring->ready = false;
> + ring->sched.ready = false;
>
> return r;
> }
> @@ -4396,8 +4396,8 @@ static void gfx_v8_0_cp_compute_enable(struct amdgpu_device *adev, bool enable)
> } else {
> WREG32(mmCP_MEC_CNTL, (CP_MEC_CNTL__MEC_ME1_HALT_MASK | CP_MEC_CNTL__MEC_ME2_HALT_MASK));
> for (i = 0; i < adev->gfx.num_compute_rings; i++)
> - adev->gfx.compute_ring[i].ready = false;
> - adev->gfx.kiq.ring.ready = false;
> + adev->gfx.compute_ring[i].sched.ready = false;
> + adev->gfx.kiq.ring.sched.ready = false;
> }
> udelay(50);
> }
> @@ -4476,7 +4476,7 @@ static int gfx_v8_0_kiq_kcq_enable(struct amdgpu_device *adev)
> r = amdgpu_ring_test_ring(kiq_ring);
> if (r) {
> DRM_ERROR("KCQ enable failed\n");
> - kiq_ring->ready = false;
> + kiq_ring->sched.ready = false;
> }
> return r;
> }
> @@ -4781,7 +4781,7 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev)
> amdgpu_bo_kunmap(ring->mqd_obj);
> ring->mqd_ptr = NULL;
> amdgpu_bo_unreserve(ring->mqd_obj);
> - ring->ready = true;
> + ring->sched.ready = true;
> return 0;
> }
>
> @@ -4818,10 +4818,12 @@ static int gfx_v8_0_kcq_resume(struct amdgpu_device *adev)
> /* Test KCQs */
> for (i = 0; i < adev->gfx.num_compute_rings; i++) {
> ring = &adev->gfx.compute_ring[i];
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> - if (r)
> - ring->ready = false;
> + if (r) {
> + ring->sched.ready = false;
> + DRM_ERROR("%d", ring->idx);
> + }
> }
>
> done:
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 0ce1e14..76839d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -2537,7 +2537,7 @@ static void gfx_v9_0_cp_gfx_enable(struct amdgpu_device *adev, bool enable)
> tmp = REG_SET_FIELD(tmp, CP_ME_CNTL, CE_HALT, enable ? 0 : 1);
> if (!enable) {
> for (i = 0; i < adev->gfx.num_gfx_rings; i++)
> - adev->gfx.gfx_ring[i].ready = false;
> + adev->gfx.gfx_ring[i].sched.ready = false;
> }
> WREG32_SOC15(GC, 0, mmCP_ME_CNTL, tmp);
> udelay(50);
> @@ -2727,7 +2727,7 @@ static int gfx_v9_0_cp_gfx_resume(struct amdgpu_device *adev)
>
> /* start the ring */
> gfx_v9_0_cp_gfx_start(adev);
> - ring->ready = true;
> + ring->sched.ready = true;
>
> return 0;
> }
> @@ -2742,8 +2742,8 @@ static void gfx_v9_0_cp_compute_enable(struct amdgpu_device *adev, bool enable)
> WREG32_SOC15(GC, 0, mmCP_MEC_CNTL,
> (CP_MEC_CNTL__MEC_ME1_HALT_MASK | CP_MEC_CNTL__MEC_ME2_HALT_MASK));
> for (i = 0; i < adev->gfx.num_compute_rings; i++)
> - adev->gfx.compute_ring[i].ready = false;
> - adev->gfx.kiq.ring.ready = false;
> + adev->gfx.compute_ring[i].sched.ready = false;
> + adev->gfx.kiq.ring.sched.ready = false;
> }
> udelay(50);
> }
> @@ -2869,7 +2869,7 @@ static int gfx_v9_0_kiq_kcq_enable(struct amdgpu_device *adev)
> r = amdgpu_ring_test_ring(kiq_ring);
> if (r) {
> DRM_ERROR("KCQ enable failed\n");
> - kiq_ring->ready = false;
> + kiq_ring->sched.ready = false;
> }
>
> return r;
> @@ -3249,7 +3249,7 @@ static int gfx_v9_0_kiq_resume(struct amdgpu_device *adev)
> amdgpu_bo_kunmap(ring->mqd_obj);
> ring->mqd_ptr = NULL;
> amdgpu_bo_unreserve(ring->mqd_obj);
> - ring->ready = true;
> + ring->sched.ready = true;
> return 0;
> }
>
> @@ -3316,17 +3316,17 @@ static int gfx_v9_0_cp_resume(struct amdgpu_device *adev)
> ring = &adev->gfx.gfx_ring[0];
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> return r;
> }
>
> for (i = 0; i < adev->gfx.num_compute_rings; i++) {
> ring = &adev->gfx.compute_ring[i];
>
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r)
> - ring->ready = false;
> + ring->sched.ready = false;
> }
>
> gfx_v9_0_enable_gui_idle_interrupt(adev, true);
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index f35d7a5..56fd3d4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -381,7 +381,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev,
> struct amdgpu_vmhub *hub = &adev->vmhub[i];
> u32 tmp = gmc_v9_0_get_invalidate_req(vmid);
>
> - if (adev->gfx.kiq.ring.ready &&
> + if (adev->gfx.kiq.ring.sched.ready &&
> (amdgpu_sriov_runtime(adev) || !amdgpu_sriov_vf(adev)) &&
> !adev->in_gpu_reset) {
> r = amdgpu_kiq_reg_write_reg_wait(adev, hub->vm_inv_eng0_req + eng,
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index bedbd5f..b00631c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -349,8 +349,8 @@ static void sdma_v2_4_gfx_stop(struct amdgpu_device *adev)
> ib_cntl = REG_SET_FIELD(ib_cntl, SDMA0_GFX_IB_CNTL, IB_ENABLE, 0);
> WREG32(mmSDMA0_GFX_IB_CNTL + sdma_offsets[i], ib_cntl);
> }
> - sdma0->ready = false;
> - sdma1->ready = false;
> + sdma0->sched.ready = false;
> + sdma1->sched.ready = false;
> }
>
> /**
> @@ -471,7 +471,7 @@ static int sdma_v2_4_gfx_resume(struct amdgpu_device *adev)
> /* enable DMA IBs */
> WREG32(mmSDMA0_GFX_IB_CNTL + sdma_offsets[i], ib_cntl);
>
> - ring->ready = true;
> + ring->sched.ready = true;
> }
>
> sdma_v2_4_enable(adev, true);
> @@ -479,7 +479,7 @@ static int sdma_v2_4_gfx_resume(struct amdgpu_device *adev)
> ring = &adev->sdma.instance[i].ring;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index 415968d..533e130 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -523,8 +523,8 @@ static void sdma_v3_0_gfx_stop(struct amdgpu_device *adev)
> ib_cntl = REG_SET_FIELD(ib_cntl, SDMA0_GFX_IB_CNTL, IB_ENABLE, 0);
> WREG32(mmSDMA0_GFX_IB_CNTL + sdma_offsets[i], ib_cntl);
> }
> - sdma0->ready = false;
> - sdma1->ready = false;
> + sdma0->sched.ready = false;
> + sdma1->sched.ready = false;
> }
>
> /**
> @@ -739,7 +739,7 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)
> /* enable DMA IBs */
> WREG32(mmSDMA0_GFX_IB_CNTL + sdma_offsets[i], ib_cntl);
>
> - ring->ready = true;
> + ring->sched.ready = true;
> }
>
> /* unhalt the MEs */
> @@ -751,7 +751,7 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)
> ring = &adev->sdma.instance[i].ring;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index 6ad4fda..031ed72 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -634,8 +634,8 @@ static void sdma_v4_0_gfx_stop(struct amdgpu_device *adev)
> WREG32_SDMA(i, mmSDMA0_GFX_IB_CNTL, ib_cntl);
> }
>
> - sdma0->ready = false;
> - sdma1->ready = false;
> + sdma0->sched.ready = false;
> + sdma1->sched.ready = false;
> }
>
> /**
> @@ -675,8 +675,8 @@ static void sdma_v4_0_page_stop(struct amdgpu_device *adev)
> WREG32_SDMA(i, mmSDMA0_PAGE_IB_CNTL, ib_cntl);
> }
>
> - sdma0->ready = false;
> - sdma1->ready = false;
> + sdma0->sched.ready = false;
> + sdma1->sched.ready = false;
> }
>
> /**
> @@ -863,7 +863,7 @@ static void sdma_v4_0_gfx_resume(struct amdgpu_device *adev, unsigned int i)
> /* enable DMA IBs */
> WREG32_SDMA(i, mmSDMA0_GFX_IB_CNTL, ib_cntl);
>
> - ring->ready = true;
> + ring->sched.ready = true;
> }
>
> /**
> @@ -956,7 +956,7 @@ static void sdma_v4_0_page_resume(struct amdgpu_device *adev, unsigned int i)
> /* enable DMA IBs */
> WREG32_SDMA(i, mmSDMA0_PAGE_IB_CNTL, ib_cntl);
>
> - ring->ready = true;
> + ring->sched.ready = true;
> }
>
> static void
> @@ -1146,7 +1146,7 @@ static int sdma_v4_0_start(struct amdgpu_device *adev)
>
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
> index d9b27d7..ad28567 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c
> @@ -122,7 +122,7 @@ static void si_dma_stop(struct amdgpu_device *adev)
>
> if (adev->mman.buffer_funcs_ring == ring)
> amdgpu_ttm_set_buffer_funcs_status(adev, false);
> - ring->ready = false;
> + ring->sched.ready = false;
> }
> }
>
> @@ -175,11 +175,11 @@ static int si_dma_start(struct amdgpu_device *adev)
> WREG32(DMA_RB_WPTR + sdma_offsets[i], lower_32_bits(ring->wptr) << 2);
> WREG32(DMA_RB_CNTL + sdma_offsets[i], rb_cntl | DMA_RB_ENABLE);
>
> - ring->ready = true;
> + ring->sched.ready = true;
>
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
> index 1fc17bf..12bf064 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
> @@ -162,10 +162,10 @@ static int uvd_v4_2_hw_init(void *handle)
> uvd_v4_2_enable_mgcg(adev, true);
> amdgpu_asic_set_uvd_clocks(adev, 10000, 10000);
>
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> goto done;
> }
>
> @@ -218,7 +218,7 @@ static int uvd_v4_2_hw_fini(void *handle)
> if (RREG32(mmUVD_STATUS) != 0)
> uvd_v4_2_stop(adev);
>
> - ring->ready = false;
> + ring->sched.ready = false;
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
> index fde6ad5..ca1b332 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
> @@ -158,10 +158,10 @@ static int uvd_v5_0_hw_init(void *handle)
> uvd_v5_0_set_clockgating_state(adev, AMD_CG_STATE_UNGATE);
> uvd_v5_0_enable_mgcg(adev, true);
>
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> goto done;
> }
>
> @@ -215,7 +215,7 @@ static int uvd_v5_0_hw_fini(void *handle)
> if (RREG32(mmUVD_STATUS) != 0)
> uvd_v5_0_stop(adev);
>
> - ring->ready = false;
> + ring->sched.ready = false;
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> index 7a5b402..5725101 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> @@ -476,10 +476,10 @@ static int uvd_v6_0_hw_init(void *handle)
> uvd_v6_0_set_clockgating_state(adev, AMD_CG_STATE_UNGATE);
> uvd_v6_0_enable_mgcg(adev, true);
>
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> goto done;
> }
>
> @@ -513,10 +513,10 @@ static int uvd_v6_0_hw_init(void *handle)
> if (uvd_v6_0_enc_support(adev)) {
> for (i = 0; i < adev->uvd.num_enc_rings; ++i) {
> ring = &adev->uvd.inst->ring_enc[i];
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> goto done;
> }
> }
> @@ -548,7 +548,7 @@ static int uvd_v6_0_hw_fini(void *handle)
> if (RREG32(mmUVD_STATUS) != 0)
> uvd_v6_0_stop(adev);
>
> - ring->ready = false;
> + ring->sched.ready = false;
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> index 58b39af..5edc317 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
> @@ -540,10 +540,10 @@ static int uvd_v7_0_hw_init(void *handle)
> ring = &adev->uvd.inst[j].ring;
>
> if (!amdgpu_sriov_vf(adev)) {
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> goto done;
> }
>
> @@ -582,10 +582,10 @@ static int uvd_v7_0_hw_init(void *handle)
>
> for (i = 0; i < adev->uvd.num_enc_rings; ++i) {
> ring = &adev->uvd.inst[j].ring_enc[i];
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> goto done;
> }
> }
> @@ -619,7 +619,7 @@ static int uvd_v7_0_hw_fini(void *handle)
> for (i = 0; i < adev->uvd.num_uvd_inst; ++i) {
> if (adev->uvd.harvest_config & (1 << i))
> continue;
> - adev->uvd.inst[i].ring.ready = false;
> + adev->uvd.inst[i].ring.sched.ready = false;
> }
>
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
> index ea28828..dcbba0b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
> @@ -464,14 +464,14 @@ static int vce_v2_0_hw_init(void *handle)
> amdgpu_asic_set_vce_clocks(adev, 10000, 10000);
> vce_v2_0_enable_mgcg(adev, true, false);
> for (i = 0; i < adev->vce.num_rings; i++)
> - adev->vce.ring[i].ready = false;
> + adev->vce.ring[i].sched.ready = false;
>
> for (i = 0; i < adev->vce.num_rings; i++) {
> r = amdgpu_ring_test_ring(&adev->vce.ring[i]);
> if (r)
> return r;
> else
> - adev->vce.ring[i].ready = true;
> + adev->vce.ring[i].sched.ready = true;
> }
>
> DRM_INFO("VCE initialized successfully.\n");
> diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
> index 6dbd397..ef17f9e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
> @@ -475,14 +475,14 @@ static int vce_v3_0_hw_init(void *handle)
> amdgpu_asic_set_vce_clocks(adev, 10000, 10000);
>
> for (i = 0; i < adev->vce.num_rings; i++)
> - adev->vce.ring[i].ready = false;
> + adev->vce.ring[i].sched.ready = false;
>
> for (i = 0; i < adev->vce.num_rings; i++) {
> r = amdgpu_ring_test_ring(&adev->vce.ring[i]);
> if (r)
> return r;
> else
> - adev->vce.ring[i].ready = true;
> + adev->vce.ring[i].sched.ready = true;
> }
>
> DRM_INFO("VCE initialized successfully.\n");
> diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> index 1c94718..742950a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> @@ -520,14 +520,14 @@ static int vce_v4_0_hw_init(void *handle)
> return r;
>
> for (i = 0; i < adev->vce.num_rings; i++)
> - adev->vce.ring[i].ready = false;
> + adev->vce.ring[i].sched.ready = false;
>
> for (i = 0; i < adev->vce.num_rings; i++) {
> r = amdgpu_ring_test_ring(&adev->vce.ring[i]);
> if (r)
> return r;
> else
> - adev->vce.ring[i].ready = true;
> + adev->vce.ring[i].sched.ready = true;
> }
>
> DRM_INFO("VCE initialized successfully.\n");
> @@ -549,7 +549,7 @@ static int vce_v4_0_hw_fini(void *handle)
> }
>
> for (i = 0; i < adev->vce.num_rings; i++)
> - adev->vce.ring[i].ready = false;
> + adev->vce.ring[i].sched.ready = false;
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> index eae9092..f1650da 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> @@ -176,28 +176,28 @@ static int vcn_v1_0_hw_init(void *handle)
> struct amdgpu_ring *ring = &adev->vcn.ring_dec;
> int i, r;
>
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> goto done;
> }
>
> for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
> ring = &adev->vcn.ring_enc[i];
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> goto done;
> }
> }
>
> ring = &adev->vcn.ring_jpeg;
> - ring->ready = true;
> + ring->sched.ready = true;
> r = amdgpu_ring_test_ring(ring);
> if (r) {
> - ring->ready = false;
> + ring->sched.ready = false;
> goto done;
> }
>
> @@ -224,7 +224,7 @@ static int vcn_v1_0_hw_fini(void *handle)
> if (RREG32_SOC15(VCN, 0, mmUVD_STATUS))
> vcn_v1_0_stop(adev);
>
> - ring->ready = false;
> + ring->sched.ready = false;
>
> return 0;
> }
More information about the amd-gfx
mailing list