Skip to content

Commit

Permalink
drm/amdgpu: wait for IB test on first device open
Browse files Browse the repository at this point in the history
Instead of delaying that to the first query. Otherwise we could try to use the
SDMA for VM updates before the IB tests are done.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Christian König authored and Alex Deucher committed Nov 30, 2018
1 parent f10d910 commit 3bfa889
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,6 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
if (!info->return_size || !info->return_pointer)
return -EINVAL;

/* Ensure IB tests are run on ring */
flush_delayed_work(&adev->late_init_work);

switch (info->query) {
case AMDGPU_INFO_ACCEL_WORKING:
ui32 = adev->accel_working;
Expand Down Expand Up @@ -950,6 +947,9 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
struct amdgpu_fpriv *fpriv;
int r, pasid;

/* Ensure IB tests are run on ring */
flush_delayed_work(&adev->late_init_work);

file_priv->driver_priv = NULL;

r = pm_runtime_get_sync(dev->dev);
Expand Down

0 comments on commit 3bfa889

Please sign in to comment.