[PATCH] drm/amdgpu: move buffer funcs setting up a level
Christian König
ckoenig.leichtzumerken at gmail.com
Tue Nov 7 10:52:49 UTC 2023
Am 03.11.23 um 23:10 schrieb Alex Deucher:
> On Fri, Nov 3, 2023 at 4:17 PM Alex Deucher <alexdeucher at gmail.com> wrote:
>> On Thu, Oct 26, 2023 at 4:17 PM Luben Tuikov <ltuikov89 at gmail.com> wrote:
>>> Pushed to drm-misc-next.
>> BTW, I'm seeing the following on older GPUs with VCE and UVD even with
>> this patch:
>> [ 11.886024] amdgpu 0000:0a:00.0: [drm] *ERROR* drm_sched_job_init:
>> entity has no rq!
>> [ 11.886028] amdgpu 0000:0a:00.0: [drm:amdgpu_ib_ring_tests
>> [amdgpu]] *ERROR* IB test failed on uvd (-2).
>> [ 11.889927] amdgpu 0000:0a:00.0: [drm] *ERROR* drm_sched_job_init:
>> entity has no rq!
>> [ 11.889930] amdgpu 0000:0a:00.0: [drm:amdgpu_ib_ring_tests
>> [amdgpu]] *ERROR* IB test failed on vce0 (-2).
>> [ 11.890172] [drm:process_one_work] *ERROR* ib ring test failed (-2).
>> Seems to be specific to UVD and VCE, I don't see anything similar with
>> VCN, but the flows for both are pretty similar. Not sure why we are
>> not seeing it for VCN. Just a heads up if you have any ideas. Will
>> take a closer look next week.
> + Leo
>
> I found the problem. We set up scheduling entities for UVD and VCE
> specifically and not for any other engines. I don't remember why
> offhand. I'm guessing maybe to deal with the session limits on UVD
> and VCE? If so I'm not sure of a clean way to fix this.
I haven't looked through all my mails yet so could be that Leo has
already answered this.
The UVD/VCE entities are used for the older chips where applications
have to use create/destroy messages to the firmware.
If an application exits without cleaning up their handles the kernel
sends the appropriate destroy messages itself. For an example see
amdgpu_uvd_free_handles().
We used to initialize those entities with separate calls after the
scheduler had been brought up, see amdgpu_uvd_entity_init() for an example.
But this was somehow messed up and we now do the call to
amdgpu_uvd_entity_init() at the end of *_sw_init() instead of _late_init().
I suggest to just come up with a function which can be used for the
late_init() callback of the UVD/VCE blocks.
Christian.
>
> Alex
>
>> Alex
>>
>>> Regards,
>>> Luben
>>>
>>> On 2023-10-26 15:52, Luben Tuikov wrote:
>>>> On 2023-10-26 15:32, Alex Deucher wrote:
>>>>> On Thu, Oct 26, 2023 at 2:22 AM Christian König
>>>>> <ckoenig.leichtzumerken at gmail.com> wrote:
>>>>>> Am 25.10.23 um 19:19 schrieb Alex Deucher:
>>>>>>> Rather than doing this in the IP code for the SDMA paging
>>>>>>> engine, move it up to the core device level init level.
>>>>>>> This should fix the scheduler init ordering.
>>>>>>>
>>>>>>> v2: drop extra parens
>>>>>>> v3: drop SDMA helpers
>>>>>>>
>>>>>>> Tested-by: Luben Tuikov <luben.tuikov at amd.com>
>>>>>>> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
>>>>>> I don't know of hand if the high level function really cover everything,
>>>>>> so only Acked-by: Christian König <christian.koenig at amd.com> for now.
>>>>>>
>>>>> Luben,
>>>>>
>>>>> Was this needed for some of the scheduler stuff that is pending? If
>>>>> you would rather take it via drm-misc to align with the scheduler
>>>>> changes, that works for me, otherwise I can take it via the amdgpu
>>>>> tree.
>>>> Hi Alex,
>>>>
>>>> Yes, it does.
>>>>
>>>> I can take it via drm-misc-next as that where the scheduler changes landed.
>>>>
>>>> I'll add Christian's Acked-by.
>>>>
>>>> I'll add a Fixes tag because ideally it should've gone before the dynamic
>>>> sched_rq commit.
>>>>
>>>> Thanks for the heads-up!
>>>>
>>>> Regards,
>>>> Luben
>>>>
>>>>
>>>>
>>>>> Thanks,
>>>>>
>>>>> Alex
>>>>>
>>>>>
>>>>>> Christian.
>>>>>>
>>>>>>> ---
>>>>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +++++++++++++++
>>>>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 21 ---------------------
>>>>>>> drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 -
>>>>>>> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 5 -----
>>>>>>> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 5 -----
>>>>>>> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 5 -----
>>>>>>> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 16 +---------------
>>>>>>> drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 10 +---------
>>>>>>> drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 10 +---------
>>>>>>> drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 10 +---------
>>>>>>> drivers/gpu/drm/amd/amdgpu/si_dma.c | 5 -----
>>>>>>> 11 files changed, 19 insertions(+), 84 deletions(-)
>>>>>>>
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>>>>>> index 2031a467b721..5c90080e93ba 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>>>>>>> @@ -2662,6 +2662,9 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
>>>>>>> if (r)
>>>>>>> goto init_failed;
>>>>>>>
>>>>>>> + if (adev->mman.buffer_funcs_ring->sched.ready)
>>>>>>> + amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> +
>>>>>>> /* Don't init kfd if whole hive need to be reset during init */
>>>>>>> if (!adev->gmc.xgmi.pending_reset) {
>>>>>>> kgd2kfd_init_zone_device(adev);
>>>>>>> @@ -3260,6 +3263,8 @@ int amdgpu_device_ip_suspend(struct amdgpu_device *adev)
>>>>>>> amdgpu_virt_request_full_gpu(adev, false);
>>>>>>> }
>>>>>>>
>>>>>>> + amdgpu_ttm_set_buffer_funcs_status(adev, false);
>>>>>>> +
>>>>>>> r = amdgpu_device_ip_suspend_phase1(adev);
>>>>>>> if (r)
>>>>>>> return r;
>>>>>>> @@ -3449,6 +3454,9 @@ static int amdgpu_device_ip_resume(struct amdgpu_device *adev)
>>>>>>>
>>>>>>> r = amdgpu_device_ip_resume_phase2(adev);
>>>>>>>
>>>>>>> + if (adev->mman.buffer_funcs_ring->sched.ready)
>>>>>>> + amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> +
>>>>>>> return r;
>>>>>>> }
>>>>>>>
>>>>>>> @@ -4236,6 +4244,8 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)
>>>>>>> /* disable ras feature must before hw fini */
>>>>>>> amdgpu_ras_pre_fini(adev);
>>>>>>>
>>>>>>> + amdgpu_ttm_set_buffer_funcs_status(adev, false);
>>>>>>> +
>>>>>>> amdgpu_device_ip_fini_early(adev);
>>>>>>>
>>>>>>> amdgpu_irq_fini_hw(adev);
>>>>>>> @@ -4407,6 +4417,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)
>>>>>>>
>>>>>>> amdgpu_ras_suspend(adev);
>>>>>>>
>>>>>>> + amdgpu_ttm_set_buffer_funcs_status(adev, false);
>>>>>>> +
>>>>>>> amdgpu_device_ip_suspend_phase1(adev);
>>>>>>>
>>>>>>> if (!adev->in_s0ix)
>>>>>>> @@ -5178,6 +5190,9 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle,
>>>>>>> if (r)
>>>>>>> goto out;
>>>>>>>
>>>>>>> + if (tmp_adev->mman.buffer_funcs_ring->sched.ready)
>>>>>>> + amdgpu_ttm_set_buffer_funcs_status(tmp_adev, true);
>>>>>>> +
>>>>>>> if (vram_lost)
>>>>>>> amdgpu_device_fill_reset_magic(tmp_adev);
>>>>>>>
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
>>>>>>> index e8cbc4142d80..1d9d187de6ee 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
>>>>>>> @@ -292,27 +292,6 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev,
>>>>>>> return err;
>>>>>>> }
>>>>>>>
>>>>>>> -void amdgpu_sdma_unset_buffer_funcs_helper(struct amdgpu_device *adev)
>>>>>>> -{
>>>>>>> - struct amdgpu_ring *sdma;
>>>>>>> - int i;
>>>>>>> -
>>>>>>> - for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> - if (adev->sdma.has_page_queue) {
>>>>>>> - sdma = &adev->sdma.instance[i].page;
>>>>>>> - if (adev->mman.buffer_funcs_ring == sdma) {
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, false);
>>>>>>> - break;
>>>>>>> - }
>>>>>>> - }
>>>>>>> - sdma = &adev->sdma.instance[i].ring;
>>>>>>> - if (adev->mman.buffer_funcs_ring == sdma) {
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, false);
>>>>>>> - break;
>>>>>>> - }
>>>>>>> - }
>>>>>>> -}
>>>>>>> -
>>>>>>> int amdgpu_sdma_ras_sw_init(struct amdgpu_device *adev)
>>>>>>> {
>>>>>>> int err = 0;
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h
>>>>>>> index 513ac22120c1..173a2a308078 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h
>>>>>>> @@ -169,7 +169,6 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev, u32 instance,
>>>>>>> bool duplicate);
>>>>>>> void amdgpu_sdma_destroy_inst_ctx(struct amdgpu_device *adev,
>>>>>>> bool duplicate);
>>>>>>> -void amdgpu_sdma_unset_buffer_funcs_helper(struct amdgpu_device *adev);
>>>>>>> int amdgpu_sdma_ras_sw_init(struct amdgpu_device *adev);
>>>>>>>
>>>>>>> #endif
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>>>>>>> index ee5dce6f6043..a3fccc4c1f43 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>>>>>>> @@ -308,8 +308,6 @@ static void cik_sdma_gfx_stop(struct amdgpu_device *adev)
>>>>>>> u32 rb_cntl;
>>>>>>> int i;
>>>>>>>
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> -
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]);
>>>>>>> rb_cntl &= ~SDMA0_GFX_RB_CNTL__RB_ENABLE_MASK;
>>>>>>> @@ -498,9 +496,6 @@ static int cik_sdma_gfx_resume(struct amdgpu_device *adev)
>>>>>>> r = amdgpu_ring_test_helper(ring);
>>>>>>> if (r)
>>>>>>> return r;
>>>>>>> -
>>>>>>> - if (adev->mman.buffer_funcs_ring == ring)
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> }
>>>>>>>
>>>>>>> return 0;
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>>>>>>> index b58a13bd75db..45377a175250 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>>>>>>> @@ -339,8 +339,6 @@ static void sdma_v2_4_gfx_stop(struct amdgpu_device *adev)
>>>>>>> u32 rb_cntl, ib_cntl;
>>>>>>> int i;
>>>>>>>
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> -
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]);
>>>>>>> rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_GFX_RB_CNTL, RB_ENABLE, 0);
>>>>>>> @@ -474,9 +472,6 @@ static int sdma_v2_4_gfx_resume(struct amdgpu_device *adev)
>>>>>>> r = amdgpu_ring_test_helper(ring);
>>>>>>> if (r)
>>>>>>> return r;
>>>>>>> -
>>>>>>> - if (adev->mman.buffer_funcs_ring == ring)
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> }
>>>>>>>
>>>>>>> return 0;
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>>>>>>> index c5ea32687eb5..2ad615be4bb3 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>>>>>>> @@ -513,8 +513,6 @@ static void sdma_v3_0_gfx_stop(struct amdgpu_device *adev)
>>>>>>> u32 rb_cntl, ib_cntl;
>>>>>>> int i;
>>>>>>>
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> -
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]);
>>>>>>> rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_GFX_RB_CNTL, RB_ENABLE, 0);
>>>>>>> @@ -746,9 +744,6 @@ static int sdma_v3_0_gfx_resume(struct amdgpu_device *adev)
>>>>>>> r = amdgpu_ring_test_helper(ring);
>>>>>>> if (r)
>>>>>>> return r;
>>>>>>> -
>>>>>>> - if (adev->mman.buffer_funcs_ring == ring)
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> }
>>>>>>>
>>>>>>> return 0;
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>>>>>>> index 683d51ae4bf1..3d68dd5523c6 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>>>>>>> @@ -877,8 +877,6 @@ static void sdma_v4_0_gfx_enable(struct amdgpu_device *adev, bool enable)
>>>>>>> u32 rb_cntl, ib_cntl;
>>>>>>> int i;
>>>>>>>
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> -
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> rb_cntl = RREG32_SDMA(i, mmSDMA0_GFX_RB_CNTL);
>>>>>>> rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_GFX_RB_CNTL, RB_ENABLE, enable ? 1 : 0);
>>>>>>> @@ -913,8 +911,6 @@ static void sdma_v4_0_page_stop(struct amdgpu_device *adev)
>>>>>>> u32 rb_cntl, ib_cntl;
>>>>>>> int i;
>>>>>>>
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> -
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> rb_cntl = RREG32_SDMA(i, mmSDMA0_PAGE_RB_CNTL);
>>>>>>> rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_PAGE_RB_CNTL,
>>>>>>> @@ -1402,13 +1398,7 @@ static int sdma_v4_0_start(struct amdgpu_device *adev)
>>>>>>> r = amdgpu_ring_test_helper(page);
>>>>>>> if (r)
>>>>>>> return r;
>>>>>>> -
>>>>>>> - if (adev->mman.buffer_funcs_ring == page)
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> }
>>>>>>> -
>>>>>>> - if (adev->mman.buffer_funcs_ring == ring)
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> }
>>>>>>>
>>>>>>> return r;
>>>>>>> @@ -1921,11 +1911,8 @@ static int sdma_v4_0_hw_fini(void *handle)
>>>>>>> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>>>>>>> int i;
>>>>>>>
>>>>>>> - if (amdgpu_sriov_vf(adev)) {
>>>>>>> - /* disable the scheduler for SDMA */
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> + if (amdgpu_sriov_vf(adev))
>>>>>>> return 0;
>>>>>>> - }
>>>>>>>
>>>>>>> if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__SDMA)) {
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> @@ -1964,7 +1951,6 @@ static int sdma_v4_0_resume(void *handle)
>>>>>>> if (adev->in_s0ix) {
>>>>>>> sdma_v4_0_enable(adev, true);
>>>>>>> sdma_v4_0_gfx_enable(adev, true);
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> return 0;
>>>>>>> }
>>>>>>>
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
>>>>>>> index be5d099c9898..c78027ebdcb9 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
>>>>>>> @@ -559,8 +559,6 @@ static void sdma_v5_0_gfx_stop(struct amdgpu_device *adev)
>>>>>>> u32 rb_cntl, ib_cntl;
>>>>>>> int i;
>>>>>>>
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> -
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> rb_cntl = RREG32_SOC15_IP(GC, sdma_v5_0_get_reg_offset(adev, i, mmSDMA0_GFX_RB_CNTL));
>>>>>>> rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_GFX_RB_CNTL, RB_ENABLE, 0);
>>>>>>> @@ -825,9 +823,6 @@ static int sdma_v5_0_gfx_resume(struct amdgpu_device *adev)
>>>>>>> r = amdgpu_ring_test_helper(ring);
>>>>>>> if (r)
>>>>>>> return r;
>>>>>>> -
>>>>>>> - if (adev->mman.buffer_funcs_ring == ring)
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> }
>>>>>>>
>>>>>>> return 0;
>>>>>>> @@ -1426,11 +1421,8 @@ static int sdma_v5_0_hw_fini(void *handle)
>>>>>>> {
>>>>>>> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>>>>>>>
>>>>>>> - if (amdgpu_sriov_vf(adev)) {
>>>>>>> - /* disable the scheduler for SDMA */
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> + if (amdgpu_sriov_vf(adev))
>>>>>>> return 0;
>>>>>>> - }
>>>>>>>
>>>>>>> sdma_v5_0_ctx_switch_enable(adev, false);
>>>>>>> sdma_v5_0_enable(adev, false);
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
>>>>>>> index a3e8b10c071c..2e35f3571774 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
>>>>>>> @@ -364,8 +364,6 @@ static void sdma_v5_2_gfx_stop(struct amdgpu_device *adev)
>>>>>>> u32 rb_cntl, ib_cntl;
>>>>>>> int i;
>>>>>>>
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> -
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> rb_cntl = RREG32_SOC15_IP(GC, sdma_v5_2_get_reg_offset(adev, i, mmSDMA0_GFX_RB_CNTL));
>>>>>>> rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_GFX_RB_CNTL, RB_ENABLE, 0);
>>>>>>> @@ -625,9 +623,6 @@ static int sdma_v5_2_gfx_resume(struct amdgpu_device *adev)
>>>>>>> r = amdgpu_ring_test_helper(ring);
>>>>>>> if (r)
>>>>>>> return r;
>>>>>>> -
>>>>>>> - if (adev->mman.buffer_funcs_ring == ring)
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> }
>>>>>>>
>>>>>>> return 0;
>>>>>>> @@ -1284,11 +1279,8 @@ static int sdma_v5_2_hw_fini(void *handle)
>>>>>>> {
>>>>>>> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>>>>>>>
>>>>>>> - if (amdgpu_sriov_vf(adev)) {
>>>>>>> - /* disable the scheduler for SDMA */
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> + if (amdgpu_sriov_vf(adev))
>>>>>>> return 0;
>>>>>>> - }
>>>>>>>
>>>>>>> sdma_v5_2_ctx_switch_enable(adev, false);
>>>>>>> sdma_v5_2_enable(adev, false);
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
>>>>>>> index 445a34549d2c..1c6ff511f501 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
>>>>>>> @@ -348,8 +348,6 @@ static void sdma_v6_0_gfx_stop(struct amdgpu_device *adev)
>>>>>>> u32 rb_cntl, ib_cntl;
>>>>>>> int i;
>>>>>>>
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> -
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> rb_cntl = RREG32_SOC15_IP(GC, sdma_v6_0_get_reg_offset(adev, i, regSDMA0_QUEUE0_RB_CNTL));
>>>>>>> rb_cntl = REG_SET_FIELD(rb_cntl, SDMA0_QUEUE0_RB_CNTL, RB_ENABLE, 0);
>>>>>>> @@ -561,9 +559,6 @@ static int sdma_v6_0_gfx_resume(struct amdgpu_device *adev)
>>>>>>> r = amdgpu_ring_test_helper(ring);
>>>>>>> if (r)
>>>>>>> return r;
>>>>>>> -
>>>>>>> - if (adev->mman.buffer_funcs_ring == ring)
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> }
>>>>>>>
>>>>>>> return 0;
>>>>>>> @@ -1308,11 +1303,8 @@ static int sdma_v6_0_hw_fini(void *handle)
>>>>>>> {
>>>>>>> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>>>>>>>
>>>>>>> - if (amdgpu_sriov_vf(adev)) {
>>>>>>> - /* disable the scheduler for SDMA */
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> + if (amdgpu_sriov_vf(adev))
>>>>>>> return 0;
>>>>>>> - }
>>>>>>>
>>>>>>> sdma_v6_0_ctxempty_int_enable(adev, false);
>>>>>>> sdma_v6_0_enable(adev, false);
>>>>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
>>>>>>> index 42c4547f32ec..9aa0e11ee673 100644
>>>>>>> --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c
>>>>>>> +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c
>>>>>>> @@ -115,8 +115,6 @@ static void si_dma_stop(struct amdgpu_device *adev)
>>>>>>> u32 rb_cntl;
>>>>>>> unsigned i;
>>>>>>>
>>>>>>> - amdgpu_sdma_unset_buffer_funcs_helper(adev);
>>>>>>> -
>>>>>>> for (i = 0; i < adev->sdma.num_instances; i++) {
>>>>>>> /* dma0 */
>>>>>>> rb_cntl = RREG32(DMA_RB_CNTL + sdma_offsets[i]);
>>>>>>> @@ -177,9 +175,6 @@ static int si_dma_start(struct amdgpu_device *adev)
>>>>>>> r = amdgpu_ring_test_helper(ring);
>>>>>>> if (r)
>>>>>>> return r;
>>>>>>> -
>>>>>>> - if (adev->mman.buffer_funcs_ring == ring)
>>>>>>> - amdgpu_ttm_set_buffer_funcs_status(adev, true);
>>>>>>> }
>>>>>>>
>>>>>>> return 0;
More information about the amd-gfx
mailing list