Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbb0f9e7 authored by Christian König's avatar Christian König Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: wait for IB test on first device open 



[ Upstream commit 3bfa8897e4d08f822d1d58cf6cbbffbccef82e08 ]

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: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 546486c5

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+3 −3
Original line number Diff line number Diff line
@@ -292,9 +292,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;
@@ -861,6 +858,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);