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 1D925CA9EBC for ; Sun, 27 Oct 2019 21:07:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1C0A214E0 for ; Sun, 27 Oct 2019 21:07:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210449; bh=WbnXvxpwEoGnorjSiLoymXvZ3F79jV+5PNgIiuu3PTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c+czSVWgbeCG6rUObKPKrL9tsxTZVTMn4L2ahRrNyiQ3jOftQPMqHWCCEx+S7cX// LTSymnNIgaCWzReBR0vC4L/AYqWXl4NBEDYIxOtv+Kt59KGSxcroRy1Fohm4HNk0en AuJfFFmDVNQ7TYiWz+j9vZeQAralTqUSll2YdaSA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729175AbfJ0VH2 (ORCPT ); Sun, 27 Oct 2019 17:07:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:53386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728238AbfJ0VHX (ORCPT ); Sun, 27 Oct 2019 17:07:23 -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 783932064A; Sun, 27 Oct 2019 21:07:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210443; bh=WbnXvxpwEoGnorjSiLoymXvZ3F79jV+5PNgIiuu3PTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RXWyOkrdUWCarX94e8XY9osv6UXv4A21KFq7VOSlDs03aOPjxvyloid7TAF5oVjhe FDP0mqbCLfGeU8UMVDlvD37r5GkDW46kVLieYZ7uwWGG3vBFHypNDQQ/88d83jhfg7 8S5POXdG+HYDd+qD8ajczoYAYOdSx5DwRFFvnT+0= 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.14 017/119] Revert "drm/radeon: Fix EEH during kexec" Date: Sun, 27 Oct 2019 21:59:54 +0100 Message-Id: <20191027203304.817080909@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203259.948006506@linuxfoundation.org> References: <20191027203259.948006506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 54d97dd5780a1..f4becad0a78c0 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -368,19 +368,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