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

Commit 57bcd0a6 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/si: fix crash on headless asics 

Missing check for crtcs present.

Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=193341
https://bugs.freedesktop.org/show_bug.cgi?id=99387



Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 52b679f6

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -254,6 +254,9 @@ static void gmc_v6_0_mc_program(struct amdgpu_device *adev) 
	}

	}

	WREG32(mmHDP_REG_COHERENCY_FLUSH_CNTL, 0);

	WREG32(mmHDP_REG_COHERENCY_FLUSH_CNTL, 0);





	if (adev->mode_info.num_crtc)

		amdgpu_display_set_vga_render_state(adev, false);



	gmc_v6_0_mc_stop(adev, &save);

	gmc_v6_0_mc_stop(adev, &save);





	if (gmc_v6_0_wait_for_idle((void *)adev)) {

	if (gmc_v6_0_wait_for_idle((void *)adev)) {
@@ -283,7 +286,6 @@ static void gmc_v6_0_mc_program(struct amdgpu_device *adev) 
		dev_warn(adev->dev, "Wait for MC idle timedout !\n");

		dev_warn(adev->dev, "Wait for MC idle timedout !\n");

	}

	}

	gmc_v6_0_mc_resume(adev, &save);

	gmc_v6_0_mc_resume(adev, &save);

	amdgpu_display_set_vga_render_state(adev, false);

}

}





static int gmc_v6_0_mc_init(struct amdgpu_device *adev)

static int gmc_v6_0_mc_init(struct amdgpu_device *adev)