Commit ca7aa3bf authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Use default reset method handler 



When reset method is not passed in reset context, look for the handler
for default reset method. On Aldebaran, default reset method for SOCs
connected to CPU over XGMI is MODE2.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Tested-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f705a6f0

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

+7 −9
Original line number Diff line number Diff line
@@ -50,6 +50,13 @@ aldebaran_get_reset_handler(struct amdgpu_reset_control *reset_ctl, 
	struct amdgpu_device *adev = (struct amdgpu_device *)reset_ctl->handle;

	int i;



	if (reset_context->method == AMD_RESET_METHOD_NONE) {

		if (aldebaran_is_mode2_default(reset_ctl))

			reset_context->method = AMD_RESET_METHOD_MODE2;

		else

			reset_context->method = amdgpu_asic_reset_method(adev);

	}



	if (reset_context->method != AMD_RESET_METHOD_NONE) {

		dev_dbg(adev->dev, "Getting reset handler for method %d\n",

			reset_context->method);
@@ -59,15 +66,6 @@ aldebaran_get_reset_handler(struct amdgpu_reset_control *reset_ctl, 
		}

	}



	if (aldebaran_is_mode2_default(reset_ctl)) {

		for_each_handler(i, handler, reset_ctl)	{

			if (handler->reset_method == AMD_RESET_METHOD_MODE2) {

				reset_context->method = AMD_RESET_METHOD_MODE2;

				return handler;

			}

		}

	}



	dev_dbg(adev->dev, "Reset handler not found!\n");



	return NULL;