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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 5CBF4CA9EAF for ; Sun, 27 Oct 2019 21:37:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D045205C9 for ; Sun, 27 Oct 2019 21:37:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572212267; bh=hnSeWz2y9ujbvz5ZUve2LuVtHb1iD/dO/B3j/VOPyys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C6Juomoa7yfsAip4bVdXvZJi5rI4haFoTcmy3yw7H64ZgUPvAVJjW7u1TojtJYw+y RsEN5dVkvOFWBRQbjwT6FwlKCrQtvjveZEDkKuf/8UXLltUUvhGJrT+1R/TUYe6HIN Zn3GI+eja1YhpOmbA63jq6D+1YbY3ptXDuZisWn8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731145AbfJ0Vho (ORCPT ); Sun, 27 Oct 2019 17:37:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:50438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728687AbfJ0VEn (ORCPT ); Sun, 27 Oct 2019 17:04:43 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 91D4D208C0; Sun, 27 Oct 2019 21:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210283; bh=hnSeWz2y9ujbvz5ZUve2LuVtHb1iD/dO/B3j/VOPyys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v4maqkoW2SNdxomJcfMTQ3nF3hP1a8JDJ+h7utd6023vEEcTNTwjjLxZnkYrk8BnC 0x39I2UPCVYTxSK4JbbZ4qryQfYkFb84ScnfHIH0WlM2Bn0BbMO2oEHIL1twar95yv 0nP7jTOx1Yy9sXDNfXQ8pn/hyEW/NDCJATz7UFIs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Deucher , Sasha Levin Subject: [PATCH 4.9 12/49] Revert "drm/radeon: Fix EEH during kexec" Date: Sun, 27 Oct 2019 22:00:50 +0100 Message-Id: <20191027203126.453946813@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Deucher [ Upstream commit 8d13c187c42e110625d60094668a8f778c092879 ] This reverts commit 6f7fe9a93e6c09bf988c5059403f5f88e17e21e6. This breaks some boards. Maybe just enable this on PPC for now? Bug: https://bugzilla.kernel.org/show_bug.cgi?id=205147 Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/radeon_drv.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 3ccf5b28b326e..30bd4a6a9d466 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -366,19 +366,11 @@ radeon_pci_remove(struct pci_dev *pdev) static void radeon_pci_shutdown(struct pci_dev *pdev) { - struct drm_device *ddev = pci_get_drvdata(pdev); - /* if we are running in a VM, make sure the device * torn down properly on reboot/shutdown */ if (radeon_device_is_virtual()) radeon_pci_remove(pdev); - - /* Some adapters need to be suspended before a - * shutdown occurs in order to prevent an error - * during kexec. - */ - radeon_suspend_kms(ddev, true, true, false); } static int radeon_pmops_suspend(struct device *dev) -- 2.20.1