projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
52b679f
)
drm/amdgpu/si: fix crash on headless asics
author
Alex Deucher
<
[email protected]
>
Fri, 27 Jan 2017 15:31:52 +0000
(10:31 -0500)
committer
Alex Deucher
<
[email protected]
>
Thu, 2 Feb 2017 16:13:50 +0000
(11:13 -0500)
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: Christian König <
[email protected]
>
Signed-off-by: Alex Deucher <
[email protected]
>
Cc:
[email protected]
Signed-off-by: Alex Deucher <
[email protected]
>
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index e2b0b1646f995fd94d12e17a8cb1258bec34061f..0635829b18cf3aed41239079e4208336b00cda0f 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@
-254,6
+254,9
@@
static void gmc_v6_0_mc_program(struct amdgpu_device *adev)
}
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);
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");
}
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)