From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-f196.google.com ([209.85.216.196]:35248 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933210AbdA0Pmk (ORCPT ); Fri, 27 Jan 2017 10:42:40 -0500 Received: by mail-qt0-f196.google.com with SMTP id s58so5846480qtc.2 for ; Fri, 27 Jan 2017 07:41:07 -0800 (PST) From: Alex Deucher To: amd-gfx@lists.freedesktop.org Cc: Alex Deucher , stable@vger.kernel.org Subject: [PATCH] drm/amdgpu/si: fix crash on headless asics Date: Fri, 27 Jan 2017 10:33:25 -0500 Message-Id: <1485531205-32138-1-git-send-email-alexander.deucher@amd.com> Sender: stable-owner@vger.kernel.org List-ID: 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 Cc: stable@vger.kernel.org --- 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) -- 2.5.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH] drm/amdgpu/si: fix crash on headless asics Date: Fri, 27 Jan 2017 10:33:25 -0500 Message-ID: <1485531205-32138-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Alex Deucher , stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org TWlzc2luZyBjaGVjayBmb3IgY3J0Y3MgcHJlc2VudC4KCkZpeGVzOgpodHRwczovL2J1Z3ppbGxh Lmtlcm5lbC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzM0MQpodHRwczovL2J1Z3MuZnJlZWRlc2t0 b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05OTM4NwoKU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVy IDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgpDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwot LS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMgfCA0ICsrKy0KIDEgZmls ZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ21jX3Y2XzAuYwppbmRleCAyMzQxY2YwLi5lYTM3NzlkIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMKQEAgLTIyNyw2ICsyMjcsOSBAQCBzdGF0aWMgdm9pZCBn bWNfdjZfMF9tY19wcm9ncmFtKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIAlXUkVH MzIoSERQX1JFR19DT0hFUkVOQ1lfRkxVU0hfQ05UTCwgMCk7CiAKKwlpZiAoYWRldi0+bW9kZV9p bmZvLm51bV9jcnRjKQorCQlhbWRncHVfZGlzcGxheV9zZXRfdmdhX3JlbmRlcl9zdGF0ZShhZGV2 LCBmYWxzZSk7CisKIAlnbWNfdjZfMF9tY19zdG9wKGFkZXYsICZzYXZlKTsKIAogCWlmIChnbWNf djZfMF93YWl0X2Zvcl9pZGxlKCh2b2lkICopYWRldikpIHsKQEAgLTI1Niw3ICsyNTksNiBAQCBz dGF0aWMgdm9pZCBnbWNfdjZfMF9tY19wcm9ncmFtKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 KQogCQlkZXZfd2FybihhZGV2LT5kZXYsICJXYWl0IGZvciBNQyBpZGxlIHRpbWVkb3V0ICFcbiIp OwogCX0KIAlnbWNfdjZfMF9tY19yZXN1bWUoYWRldiwgJnNhdmUpOwotCWFtZGdwdV9kaXNwbGF5 X3NldF92Z2FfcmVuZGVyX3N0YXRlKGFkZXYsIGZhbHNlKTsKIH0KIAogc3RhdGljIGludCBnbWNf djZfMF9tY19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQotLSAKMi41LjUKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGlu ZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=