Commit 6a299d7a authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: register gpu instance before fan boost feature enablment 



Otherwise, the feature enablement will be skipped due to wrong count.

Fixes: beff74bc ("drm/amdgpu: fix a race in GPU reset with IB test (v2)")
Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 38264de0

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

+7 −0
Original line number Diff line number Diff line
@@ -2885,6 +2885,13 @@ fence_driver_init: 
			DRM_INFO("amdgpu: acceleration disabled, skipping benchmarks\n");

	}



	/*

	 * Register gpu instance before amdgpu_device_enable_mgpu_fan_boost.

	 * Otherwise the mgpu fan boost feature will be skipped due to the

	 * gpu instance is counted less.

	 */

	amdgpu_register_gpu_instance(adev);



	/* enable clockgating, etc. after ib tests, etc. since some blocks require

	 * explicit gating rather than handling it automatically.

	 */

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

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) 
		pm_runtime_put_autosuspend(dev->dev);

	}



	amdgpu_register_gpu_instance(adev);

out:

	if (r) {

		/* balance pm_runtime_get_sync in amdgpu_driver_unload_kms */

CRA Git | Maintained and supported by SUSTech CRA and CCSE