UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jack Xiao 2019-04-30 11:44:04 +08:00 committed by Alex Deucher
parent 1c0d96b0d7
commit e25c0dcd0d
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
View File

@ -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;
}