diff options
| author | Jack Xiao <Jack.Xiao@amd.com> | 2019-04-30 11:44:04 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-07-01 01:59:08 -0400 |
| commit | e25c0dcd0d581c9dbd2c90a17d7f2f8688e83d3c (patch) | |
| tree | f8558e69fe54ceb41e9a1e94ab2cbea440b34ddd /drivers/gpu | |
| parent | 1c0d96b0d71cccd370e5809b60c607fdc0ee0b62 (diff) | |
drm/amdgpu/mes10.1: enable the mes ring during initialization
Enable the mes ring during mes block initialization.
Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c index 31e8e7120640..36a92bf2c4ca 100644 --- a/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c +++ b/drivers/gpu/drm/amd/amdgpu/mes_v10_1.c @@ -32,6 +32,8 @@ MODULE_FIRMWARE("amdgpu/navi10_mes.bin"); +static int mes_v10_1_hw_fini(void *handle); + #define MES_EOP_SIZE 2048 static void mes_v10_1_ring_set_wptr(struct amdgpu_ring *ring) @@ -569,6 +571,25 @@ static int mes_v10_1_kiq_enable_queue(struct amdgpu_device *adev) } #endif +static int mes_v10_1_queue_init(struct amdgpu_device *adev) +{ + int r; + + r = mes_v10_1_mqd_init(&adev->mes.ring); + if (r) + return r; + +#if 0 + r = mes_v10_1_kiq_enable_queue(adev); + if (r) + return r; +#else + mes_v10_1_queue_init_register(&adev->mes.ring); +#endif + + return 0; +} + static int mes_v10_1_ring_init(struct amdgpu_device *adev) { struct amdgpu_ring *ring; @@ -640,6 +661,10 @@ static int mes_v10_1_sw_init(void *handle) if (r) return r; + r = mes_v10_1_ring_init(adev); + if (r) + return r; + return 0; } @@ -680,6 +705,12 @@ static int mes_v10_1_hw_init(void *handle) mes_v10_1_enable(adev, true); + r = mes_v10_1_queue_init(adev); + if (r) { + mes_v10_1_hw_fini(adev); + return r; + } + return 0; } |