From patchwork Tue Sep 24 20:35:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 13811168 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6070BCF9C7B for ; Tue, 24 Sep 2024 20:43:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0381710E759; Tue, 24 Sep 2024 20:43:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="KoBaage3"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3119E10E751; Tue, 24 Sep 2024 20:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727210594; x=1758746594; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=phniMjitfejZZDaldjXsGhAE4sUC2dvPGAZsZYzZQx4=; b=KoBaage3aXjQML+GTvdRBnbTknS32URjFbSG86f7YaSNwWwqSYq5kN44 xwgX79iX/XGht6xLwydzUWqs5t2JWBUiwfhlcV3HZctyyyhXEPM27d7Jb c849Je5jcbOjcf8MYkiXh8CK38DoNgUIcSDf+egMzgnTZ3DL3R6csvXmv AwLg0taJgORzRYA0aoP7uEpyKhehHDszI2UeOhJHUY13K6V7S35LXGs7v Gdch5ft+iu/Esf56DWna8tjlJ7qj8cpq2IRsaIqmKf/gdT7fX+gxAZqzG Pge4k2wVFdVK08+E7B4VgC4JRc+r3p66dJLQxRrj0uQCweDYWojo01e3X w==; X-CSE-ConnectionGUID: 2+Q/sX9GQGW1icPPYYA5cw== X-CSE-MsgGUID: V0c28AHHRwWNeNC83TPBAw== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="43751529" X-IronPort-AV: E=Sophos;i="6.10,255,1719903600"; d="scan'208";a="43751529" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 13:43:14 -0700 X-CSE-ConnectionGUID: rodVoO/wTiySJDwpZf4F2A== X-CSE-MsgGUID: GoaVZQ2wTZOEL2JlGqbbnw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,255,1719903600"; d="scan'208";a="76298750" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orviesa005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 24 Sep 2024 13:43:14 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 24 Sep 2024 13:43:13 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 24 Sep 2024 13:43:13 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39 via Frontend Transport; Tue, 24 Sep 2024 13:43:13 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.41) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 24 Sep 2024 13:43:12 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PR901fgq3B98tcqqpVlsL7GZScnCCR7qps1HWlTnImVq3opMl+ZkFVYiBZ+/vpJGecRjsB7g+Xfc8qbO7rR4z6CKcyrikpg9v+QUI5WwcnUiIIFK+zmvYFtdVPr6cpKbnBDUyl+2MgOiK1hBspS/JbGjn18SCSHezB2+TPZOcLuo7bmvkgDU7YzBDYuVrIUK0fG0r9IKVnIbE+E1ZqYnyzU0S/PVVodSlXkW6Kem/dgfMd1uhqBafH8Touw7B4LXpQG3w9CBqi0RDh/nCXy11ayNo/Ru8hihNAuinKESjpgUMKlf/nsB3n9NrDyar9i0SXZWUrO3xTn9asqWzTOiEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n3/Na56EwyBxFmLYxMxfy9HHVADhaAmSptVoBJMLgSg=; b=OebFKTZYOMbUXfxbBYJOy6V58aC4WMIuOk89ZhCn5aV1oS9J3ISyIxjLn0VxWELp7jof9y/5F9PeC+InJwOsDv0QDWeVMyheydOz1/MybXeCtUVNzNKdaGhVpthUinrAkKJ+nbCFOSylPSPlhG7Ou/dIuohmpQytWoawlbq4klvRNuwFwX1jnmoOVsVfX2cKi3G/Ji2/FZfrPc39CLPqhpADVyHRiK+aWnUzl4p6WfM9Px/HsTQwXKwn796zoyO3JJttaI8ROoexoPy4lDu3xMlRzcgL8+tDkK7yKVmfHWY6X7XnRy0T+lcDxJNaSMckJy7Ld0t9Ds0roeDDsjOvfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) by PH0PR11MB4965.namprd11.prod.outlook.com (2603:10b6:510:34::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.27; Tue, 24 Sep 2024 20:43:10 +0000 Received: from BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42]) by BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42%5]) with mapi id 15.20.7962.022; Tue, 24 Sep 2024 20:43:10 +0000 From: Rodrigo Vivi To: , CC: , Rodrigo Vivi , "Anshuman Gupta" , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= Subject: [PATCH 12/31] drm/i915: Remove lingering pci_save_state Date: Tue, 24 Sep 2024 16:35:33 -0400 Message-ID: <20240924204222.246862-13-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240924204222.246862-1-rodrigo.vivi@intel.com> References: <20240924204222.246862-1-rodrigo.vivi@intel.com> X-ClientProxiedBy: MW4PR03CA0327.namprd03.prod.outlook.com (2603:10b6:303:dd::32) To BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB2854:EE_|PH0PR11MB4965:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ed28cfd-781b-4ec6-866a-08dcdcd98099 X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?25fq4rTENv/2SNKb+U9fdva5rCq2OuA?= =?utf-8?q?3qxg5lkg1mnCwDXvqF98chvdcTa6IINlumSRV+q3o3hGBd7ubgjqZJ84zNWa4LwSd?= =?utf-8?q?siOO5UgRAUp2sx7cG+/+3kirjQ+OwLCMuA+yiICk3kFsHj8rAC14QmpjbCqfnGbUC?= =?utf-8?q?eaBfa3qY2r7pOpS0TyjpXg6kFvxsfPTQgMNnIL0FZsxL0bJvBdmMoZlGj2Bwsk19l?= =?utf-8?q?ldfgV3cYJujUBodH9T3t1p6X0ZfG7EHgALJuH7smPdyddJ2WiVqPqCWl3oeKliHsZ?= =?utf-8?q?QUCDlzdIvqxAQ3jZ3bQlUFc7YfRGzHkzNEMZ88DrhdGQkSWviS2QlqkD1jC7caVEb?= =?utf-8?q?4eCpR71DPb8GFaQvpSsGdvchhGY/b7EsuFtAqRU9+N9SBIseVv+YFRsIOk29v5BRs?= =?utf-8?q?p6y1QVeTePkmlSMGL5LHM3LZPxj4lTyFFHGw/TEpsJmeATAx64mcGGuIpF+ndPRLC?= =?utf-8?q?2wSpisNwYGmolY129QPbViiWgqC7k2ROn3PdocNJNLHDQiRrvM5ohaf+8izazgO0U?= =?utf-8?q?PHl/KOJny/uOkLLq9dTbBr6fXa2x4B3QHUFcNG2WDCapNIGvDXziaRdyMSRmTxjUf?= =?utf-8?q?RfDabyVAeDToZN6J4tJk9+COiylWe3tOjUSvi/v25iYW2vsgch6hHRqyngodxWxg3?= =?utf-8?q?UQ28BT2+aPQGCyxevlu6M2lw3SpzZUQCaMkRG0HIYLK6NuEsV1BvJphugOZX0u3yd?= =?utf-8?q?gPa2VBnW49yUakoj4v9ld3g5hlTN9PScWfUKhYD/df+rnSFo1RDATnM048plXiQII?= =?utf-8?q?3rcL6d7VitC5h/px1s83eNzDy9NpNxdh5J+CPzRZgAJSkpUIf7AbF4cchg0f8lNr3?= =?utf-8?q?LvhS0Jwlm9+zhUm+agdGkSGF2KQDFHP9DN395bYYVjzj1lS8cAMq9XdSdwEamGw14?= =?utf-8?q?YOw5+pkllxgkULGj95P44q4Glr13/qcpfm24a4vPJwOhkECE/MNDQmvkcLYVewdPN?= =?utf-8?q?xfqytblHjCfAu7J9UOL/aFeul7lDaJMwY0yfDAelsWmkLTsN3Us8h7ZRWQyHL7xLJ?= =?utf-8?q?pQLG6l8wh24SGUzSkks30ePPjEjfwz6JegMVUOBaYhW+3wYeWhav+HeTRtL3zdpcm?= =?utf-8?q?Yf5QlXQkNx0ttasAOlsGARtvLG0V8gyON9q2c7EHFNEndyWLFaYZyDsaDNTxR43cF?= =?utf-8?q?ogp/Mu2Q/fohxohvkyyEWmkszJN9T/9e4EVBaLHpxAHnVZT8aCtlleVkpdj+lFJZb?= =?utf-8?q?q48XmboNn7/GO7gY0D90I7VCdx6hj9uRIt4A=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB2854.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(366016); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?JZGqO0rX5uqYEpIpMihcCpMInRbw?= =?utf-8?q?6a2nEgUzKYn70Pb+wmPg7qs34/ZU1U7s+ICbQU9RfozoMtfLtuh6fSriRj+Jfji1Q?= =?utf-8?q?Wb+FxGCzEUHeAafE34EzOLWZDZME12OZ1cRFy/ehAhG6yfuLmCjajrJ3lzmIAcIBv?= =?utf-8?q?viJb1/jU5u379iErcNG9D6rHeR/RfFp6BZM0tdrI0B/3WIbqYxyjlbv+dL14UvMJA?= =?utf-8?q?iodrAXByK2Puo88u57tS5QwWlhkTCi/xOq0GWiSnmalk91qv9qduol//UAvYMYLnq?= =?utf-8?q?QRHibGt+6o1J7wlRW3R8VIMrl+pK9fVNMrkirwYcbipxD6YTfs53Q4i8UkGeOH7A/?= =?utf-8?q?bHOwM135wTfsK3CpSUGAlS1XIeW+QkeyaRFkJ7liP+/TWvWHa9rM3DfzexbCJYfgJ?= =?utf-8?q?Iwq7ntHGW5VwMfZnJoygILLVx5hT2KvaLvH1FyC58gRmOgEPuawpseo9sa081yZGh?= =?utf-8?q?fT+yZygES5hWBh1lEF5Wz6GM2CDNB9Ptjr48brrs69rfGkVfJ00OS6EkYBIruw4Cs?= =?utf-8?q?o0FR/jorWVAySKf3gMXJWaAJf54jE83L6j40OhI7WBrBn3MXWrhp9RMF1Js83BGz3?= =?utf-8?q?3p26GJpFivEXOpxoGqg0cKpBTM/DZoUwHW/h+aYM6XtvA4b4aY5LtVwimyaLYEZN/?= =?utf-8?q?4qdgXMw/yhhLYwNCg1D64t/QOdF9B6/1Uy9hB+QPGOA9USy9okJSJc4jn4yTfGoE/?= =?utf-8?q?YlWqpVcfMASGASYx94P1Y0zjkdFvMSL3x0JPuhQepFuf0xp0IFeKI1mH44FVH4QLA?= =?utf-8?q?oUhjHJ2u/YHg83d7kMHQF7zQK9MWVqmxHMU3cg/AOOItRfW08E46UNzq3I4wPiIc5?= =?utf-8?q?fullLtfIwkxwMZDItfkS+juCx5A7HGZJq2MDbd3JmJ7DrORP+qLGF0Zjju1yyyZ+i?= =?utf-8?q?vFEL51MQmhEQ0XN0AfMC6FESK9qlRQ1LvWcrTqyCgHqiI/6gvJtR1n1OanSZFUL3S?= =?utf-8?q?65yH/S45MTVV71MUrQKPm6AycJmpUHUo57NDf1JELiiLcofKXnTccDw2kq+HpSd4G?= =?utf-8?q?JqzWLSBOSHkG37y1vZ0dJx63R/AMjqSREbt//pL80hDOLgWt8EqQsnetbHPAZ3C54?= =?utf-8?q?wQAWf4UIfbIQz2ElYpIx2C7fBQT5jHHKfzVjfuWlh9fqbEl1I3Adzj4Y/UKraF+PG?= =?utf-8?q?Npxm8r5VJ7UUfiiQmYZH1lD759VOP/jOLP5IQN5r7CUw4tFJJdT6x6wfpeJ3rSHI3?= =?utf-8?q?szth7PLqCea0g47kox3gEDGi7aR+NLO4UDRPWSHXQW9HqoYKhaRena3SocXlzkj1g?= =?utf-8?q?O+e5rgAMiocbt8ON1ux08xplmOMQzBRa7ie/ftOI6VmJVmdeJq4f6mJ+7tu3TTZfi?= =?utf-8?q?rGj8VKsr+ncqZ27E4Tg/Xx14tpM4P2fMqsfkEJB2dnaeH4s7oVT8XCDNxxQhr140V?= =?utf-8?q?cn8GbCED/ncuKVC/Ik7SqT21ip8T0yEH+vg/PGkmvlTfvxCjMTl+wFeLm7QnMe5VW?= =?utf-8?q?VTqsQk3EHjAxaOcsXHKnFtcxPgaufyqUhd56+S+kVwmMYjNtI35RalfzjMsqbkz11?= =?utf-8?q?2AIob/xm/iMc4sRjjSY0TdJAwoULpZZKIg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 2ed28cfd-781b-4ec6-866a-08dcdcd98099 X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2854.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2024 20:43:10.5558 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /n06o7i9wRRNV1h4g0ZDVoHVmLCMH7XNR5uIyIZ3b62+sTywkLfpU0mVk8dIepjqjcDRjzXfgNXwqT8ktLbcNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4965 X-OriginatorOrg: intel.com X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The pairing pci_restore_state was removed by commit 'b7e53aba2f0e ("drm/i915: remove restore in resume")' to fix a hardware hang in resume. Furthermore, it looks like PCI subsystem should be taking care of the save and restore here. Remove the lingering/stand-alone pci_save_state call. Cc: Anshuman Gupta Cc: Ville Syrjälä Signed-off-by: Rodrigo Vivi Reviewed-by: Anshuman Gupta Reviewed-by: Jonathan Cavitt Reviewed-by: Jonathan Cavitt --- drivers/gpu/drm/i915/i915_driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index ce2dd03136d3..4fc9d8bce1fd 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -1008,8 +1008,6 @@ static int i915_drm_suspend(struct drm_device *dev) intel_display_driver_disable_user_access(dev_priv); } - pci_save_state(pdev); - intel_display_driver_suspend(dev_priv); intel_irq_suspend(dev_priv);