diff options
| author |   Emily Deng <Emily.Deng@amd.com> | 2018-08-13 14:46:06 +0800 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2018-08-13 17:21:29 -0500 |
| commit | 20acbed47d30efbf14e5aecc5ec5e5f152db7810 (patch) | |
| tree | c3b93697a4a2b34c2c32af0caf517e37f0081b48 /drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | |
| parent | drm/amdgpu/uvd: UVD entity initialization relys on ring initialization (diff) | |
| download | wireguard-linux-20acbed47d30efbf14e5aecc5ec5e5f152db7810.tar.xz wireguard-linux-20acbed47d30efbf14e5aecc5ec5e5f152db7810.zip | |
drm/amdgpu/vce: VCE entity initialization relies on ring initializtion
Entity init should after ring init, as the entity's sched_rq's initialization
is in ring init.
SWDEV-161495
Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vce_v4_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c index 65f8860169e9..6faeb17fc71c 100644 --- a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c @@ -419,6 +419,7 @@ static int vce_v4_0_sw_init(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_ring *ring; + unsigned size; int r, i; @@ -474,6 +475,11 @@ static int vce_v4_0_sw_init(void *handle) return r; } + + r = amdgpu_vce_entity_init(adev); + if (r) + return r; + r = amdgpu_virt_alloc_mm_table(adev); if (r) return r; |