aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-10-26 09:59:05 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-11-30 12:01:35 -0500
commit2c486cc4c2774df684d8a43ca7a20670c67ccd76 (patch)
tree4bd23a0b31db33ea620b624e4c9b3c5509eb1709 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
parentf52c96430f6bbdb088ed813af66588335052ec4d (diff)
drm/amdgpu: wait for IB test on first device open
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 9b3164c0f861..bc62bf41b7e9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -467,9 +467,6 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
467 if (!info->return_size || !info->return_pointer) 467 if (!info->return_size || !info->return_pointer)
468 return -EINVAL; 468 return -EINVAL;
469 469
470 /* Ensure IB tests are run on ring */
471 flush_delayed_work(&adev->late_init_work);
472
473 switch (info->query) { 470 switch (info->query) {
474 case AMDGPU_INFO_ACCEL_WORKING: 471 case AMDGPU_INFO_ACCEL_WORKING:
475 ui32 = adev->accel_working; 472 ui32 = adev->accel_working;
@@ -950,6 +947,9 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
950 struct amdgpu_fpriv *fpriv; 947 struct amdgpu_fpriv *fpriv;
951 int r, pasid; 948 int r, pasid;
952 949
950 /* Ensure IB tests are run on ring */
951 flush_delayed_work(&adev->late_init_work);
952
953 file_priv->driver_priv = NULL; 953 file_priv->driver_priv = NULL;
954 954
955 r = pm_runtime_get_sync(dev->dev); 955 r = pm_runtime_get_sync(dev->dev);