[PATCH] drm/amdgpu/si: fix crash on headless asics

Christian König deathsimple at vodafone.de
Fri Jan 27 17:17:28 UTC 2017


Am 27.01.2017 um 16:33 schrieb Alex Deucher:
> Missing check for crtcs present.
>
> Fixes:
> https://bugzilla.kernel.org/show_bug.cgi?id=193341
> https://bugs.freedesktop.org/show_bug.cgi?id=99387
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Cc: stable at vger.kernel.org

Reviewed-by: Christian König <christian.koenig at amd.com>.

> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> index 2341cf0..ea3779d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -227,6 +227,9 @@ static void gmc_v6_0_mc_program(struct amdgpu_device *adev)
>   	}
>   	WREG32(HDP_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);
>   
>   	if (gmc_v6_0_wait_for_idle((void *)adev)) {
> @@ -256,7 +259,6 @@ static void gmc_v6_0_mc_program(struct amdgpu_device *adev)
>   		dev_warn(adev->dev, "Wait for MC idle timedout !\n");
>   	}
>   	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)




More information about the amd-gfx mailing list