From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 033/167] drm/i915: Restore sane defaults for KMS on GEM error load Date: Tue, 3 Sep 2019 12:23:05 -0400 Message-ID: <20190903162519.7136-33-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpbIFVwc3RyZWFt IGNvbW1pdCA3ZWQ0M2RmNzIwYzAwN2Q2MGJlZTZkODFkYTA3YmNkYzdlNGE1NWFlIF0KCklmIHdl IGZhaWwgZHVyaW5nIEdFTSBpbml0aWFsaXNhdGlvbiwgd2Ugc2NydWIgdGhlIEhXIHN0YXRlIGJ5 CnBlcmZvcm1pbmcgYSBkZXZpY2UgbGV2ZWwgR1BVIHJlc3VldC4gSG93ZXZlciwgd2Ugd2FudCB0 byBsZWF2ZSB0aGUKc3lzdGVtIGluIGEgdXNhYmxlIHN0YXRlICh3aXRoIGZ1bmN0aW9uaW5nIEtN UyBidXQgbm8gR0VNKSBzbyBhZnRlcgpzY3J1YmJpbmcgdGhlIEhXIHN0YXRlLCB3ZSBuZWVkIHRv IHJlc3RvcmUgc29tZSBzYW5lIGRlZmF1bHRzIGFuZApyZS1lbmFibGUgdGhlIGxvdy1sZXZlbCBj b21tb24gcGFydHMgb2YgdGhlIEdQVSAoc3VjaCBhcyB0aGUgR01DSCkuCgp2MjogUmVzdG9yZSBH VFQgZW50cmllcy4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgpMaW5rOiBodHRwczovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gv bXNnaWQvMjAxODA3MjYwODUwMzMuNDA0NC0yLWNocmlzQGNocmlzLXdpbHNvbi5jby51awpSZXZp ZXdlZC1ieTogTWljaGHFgiBXaW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50ZWwuY29tPgpT aWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDExICsrKysrKysrKystCiAxIGZpbGUgY2hhbmdl ZCwgMTAgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j CmluZGV4IDAzY2RhMTk3ZmI2YjguLjUwMTlkZmQ4YmNmMTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYwpAQCAtNTU5NSw2ICs1NTk1LDggQEAgaW50IGk5MTVfZ2VtX2luaXQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlpOTE1X2dlbV9jbGVhbnVwX3VzZXJwdHIoZGV2X3By aXYpOwogCiAJaWYgKHJldCA9PSAtRUlPKSB7CisJCW11dGV4X2xvY2soJmRldl9wcml2LT5kcm0u c3RydWN0X211dGV4KTsKKwogCQkvKgogCQkgKiBBbGxvdyBlbmdpbmUgaW5pdGlhbGlzYXRpb24g dG8gZmFpbCBieSBtYXJraW5nIHRoZSBHUFUgYXMKIAkJICogd2VkZ2VkLiBCdXQgd2Ugb25seSB3 YW50IHRvIGRvIHRoaXMgd2hlcmUgdGhlIEdQVSBpcyBhbmdyeSwKQEAgLTU2MDUsNyArNTYwNywx NCBAQCBpbnQgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJCQkJCSJGYWlsZWQgdG8gaW5pdGlhbGl6ZSBHUFUsIGRlY2xhcmluZyBpdCB3ZWRnZWQhXG4i KTsKIAkJCWk5MTVfZ2VtX3NldF93ZWRnZWQoZGV2X3ByaXYpOwogCQl9Ci0JCXJldCA9IDA7CisK KwkJLyogTWluaW1hbCBiYXNpYyByZWNvdmVyeSBmb3IgS01TICovCisJCXJldCA9IGk5MTVfZ2d0 dF9lbmFibGVfaHcoZGV2X3ByaXYpOworCQlpOTE1X2dlbV9yZXN0b3JlX2d0dF9tYXBwaW5ncyhk ZXZfcHJpdik7CisJCWk5MTVfZ2VtX3Jlc3RvcmVfZmVuY2VzKGRldl9wcml2KTsKKwkJaW50ZWxf aW5pdF9jbG9ja19nYXRpbmcoZGV2X3ByaXYpOworCisJCW11dGV4X3VubG9jaygmZGV2X3ByaXYt PmRybS5zdHJ1Y3RfbXV0ZXgpOwogCX0KIAogCWk5MTVfZ2VtX2RyYWluX2ZyZWVkX29iamVjdHMo ZGV2X3ByaXYpOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66005C3A5A2 for ; Tue, 3 Sep 2019 16:38:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 379222339D for ; Tue, 3 Sep 2019 16:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528714; bh=GThmCo6ekjQevRbJ4RJw3Jp6UbfDong1DpDA0cRpd8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YZPIa/0rkGlPLI2ayiBSn5uTF6ePhcA0CJjjIHaVzr8TH7Nbea9t6VUBg8ye/Yux7 GHdvrK97ys1QyAM+J1PVE3pkCii0pjZ9uVuiCrVS/uttaXQ84Ep1DpRKtMRBvS5Z50 I1fs+MBKSHjlrfU95r/Rl6feVeO//z+/Yza++KK4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731432AbfICQid (ORCPT ); Tue, 3 Sep 2019 12:38:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:47076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730589AbfICQ0S (ORCPT ); Tue, 3 Sep 2019 12:26:18 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12DD6238CF; Tue, 3 Sep 2019 16:26:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527977; bh=GThmCo6ekjQevRbJ4RJw3Jp6UbfDong1DpDA0cRpd8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YtAAf3YEay/D6BY+jBcM1HgxMVEKM/Zj0c3biXkXaPJAVTsiLk5zO8R6GRxDnYM9K 7A9NAsA1v7xfAzgwY9C+lfukwc9uDFZK1rCDzgOnoOsCnTulAJyu5cvyNz7kKTAUSb Zivb9i1tq3yjTY7V4dyRd4tmYst/VgW5qDlhfuuA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chris Wilson , =?UTF-8?q?Micha=C5=82=20Winiarski?= , Sasha Levin , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 033/167] drm/i915: Restore sane defaults for KMS on GEM error load Date: Tue, 3 Sep 2019 12:23:05 -0400 Message-Id: <20190903162519.7136-33-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Wilson [ Upstream commit 7ed43df720c007d60bee6d81da07bcdc7e4a55ae ] If we fail during GEM initialisation, we scrub the HW state by performing a device level GPU resuet. However, we want to leave the system in a usable state (with functioning KMS but no GEM) so after scrubbing the HW state, we need to restore some sane defaults and re-enable the low-level common parts of the GPU (such as the GMCH). v2: Restore GTT entries. Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20180726085033.4044-2-chris@chris-wilson.co.uk Reviewed-by: Michał Winiarski Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/i915_gem.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 03cda197fb6b8..5019dfd8bcf16 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -5595,6 +5595,8 @@ int i915_gem_init(struct drm_i915_private *dev_priv) i915_gem_cleanup_userptr(dev_priv); if (ret == -EIO) { + mutex_lock(&dev_priv->drm.struct_mutex); + /* * Allow engine initialisation to fail by marking the GPU as * wedged. But we only want to do this where the GPU is angry, @@ -5605,7 +5607,14 @@ int i915_gem_init(struct drm_i915_private *dev_priv) "Failed to initialize GPU, declaring it wedged!\n"); i915_gem_set_wedged(dev_priv); } - ret = 0; + + /* Minimal basic recovery for KMS */ + ret = i915_ggtt_enable_hw(dev_priv); + i915_gem_restore_gtt_mappings(dev_priv); + i915_gem_restore_fences(dev_priv); + intel_init_clock_gating(dev_priv); + + mutex_unlock(&dev_priv->drm.struct_mutex); } i915_gem_drain_freed_objects(dev_priv); -- 2.20.1