From patchwork Tue Nov 19 18:44:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 13880454 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 C94A4D6C285 for ; Tue, 19 Nov 2024 18:44:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DAEB10E366; Tue, 19 Nov 2024 18:44:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="E1SJitP1"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 86C9F10E2CB; Tue, 19 Nov 2024 18:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732041866; x=1763577866; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=PkQre1K3ZRcwmZPZVCogHvvhXBI6flDnpgrMwrMyCPE=; b=E1SJitP1Wyjawk+AIF5q9/z6+POYh/EXBtW6w0r1TYBywUvVU6YkMfPR lK6ZMpzGAvcVYn21Dcin7XRKh77Gf9obpEy0K5eLywQJ40lVwE6EXhXtt 8KLnd8e24QT9QwS0EMlk8S1xJTJWNTulOHX7Zta97zUb7E9boLYKU0ev4 uIqgziUHLkqFjwc08MQyxarI75B2QxQt8uIv4WtPAS2S1W5xhm41YFz23 J7CJ3sc5UwlzTNtcDSsbOBozKnuuumbMUhNfX39LDbnazXTEjbzSC4gos m5ghhsJr0DphqjhM6F440Rk5l7Ehhgcs6afHqvxTAMdeRm+5UinzWLPMO A==; X-CSE-ConnectionGUID: GOIsORZLRriXIme+ZUUh7g== X-CSE-MsgGUID: XNOm58mIQjid9n6zFQv9FQ== X-IronPort-AV: E=McAfee;i="6700,10204,11261"; a="43449643" X-IronPort-AV: E=Sophos;i="6.12,166,1728975600"; d="scan'208";a="43449643" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2024 10:44:26 -0800 X-CSE-ConnectionGUID: OiPbFmTHTrqIhs+wlUB+ow== X-CSE-MsgGUID: HcIFEttQRnOInCAHRdMf6g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,166,1728975600"; d="scan'208";a="94114906" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmviesa005.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 19 Nov 2024 10:44:25 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) 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, 19 Nov 2024 10:44:24 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx601.amr.corp.intel.com (10.22.229.14) 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, 19 Nov 2024 10:44:24 -0800 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 19 Nov 2024 10:44:24 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wMpE/ZyOzgkPt+M0KshK40s9Bz7TnllyvfUZ3OKcmtjMQoO84B8Cpzm4fBiClf4Dcxz/drH9qdM1n/ohq3519YtR5XT1+noEeEyZX4pNOxgX4/hR3TUTCVmHdeNDppAASSUhRhnQGcB4GATlO+DgYpnMEX4b2Jz/j1Dg3GVx0CLC6BKluvsJIaYYL5nP0XkFgdC+qDSas9WaD9XEb0CmLduynt8916bOHwiZ0f3uJTDTQSu/1xtCegIluawddpOu0aLvqPFnTUqHE+HMPqdvNVmCTW+STKi7dKVtTUI0WhPiCUz4RuVVOaLb7eFJfY7vCmwgDrxhtVixL+myQdhNDw== 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=FRppKcgzhH9NuUdJYLxcZDmtfs4RpTKIAw1ABKE1T+w=; b=vaVv2GD1ZL1Cm9LjfuN9gQEq0BD+kCqGu25TPutxjvcxigTnad8zAbcvfmmD4rm68ZGaFBrFZ27Gv88ekM1TAk6G4tsrJ406zkytXg8xhpI7P5vP6IwBHHSaDToVM8O1cPEwtoeGi1gQYK57Pq4hQ5PdikOw+PSNKMhjyRAX0afxHHwEvm3BJiwR3h85l4r6XDod2hIGI1EIvVjlaOUccOu1IC7czO3uYsNG/O1CwWAIr14VtG+nMI31ItjP9bEub7spmBANjBWCMZHXhdSGTLH3XkJxiTBRIlpOz5PJ4m4tKPZHnIFSZqXhACKB8xZnfXa6yn/3TaMdCAw9pRTNdg== 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 SJ2PR11MB7645.namprd11.prod.outlook.com (2603:10b6:a03:4c6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.15; Tue, 19 Nov 2024 18:44:22 +0000 Received: from BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42]) by BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42%7]) with mapi id 15.20.8158.021; Tue, 19 Nov 2024 18:44:22 +0000 From: Rodrigo Vivi To: , CC: Rodrigo Vivi , Jonathan Cavitt Subject: [CI 1/3] drm/i915/display: Move shutdown sequences under display driver Date: Tue, 19 Nov 2024 13:44:12 -0500 Message-ID: <20241119184414.336105-1-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.47.0 X-ClientProxiedBy: MW4PR04CA0066.namprd04.prod.outlook.com (2603:10b6:303:6b::11) To BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB2854:EE_|SJ2PR11MB7645:EE_ X-MS-Office365-Filtering-Correlation-Id: 700a443c-0555-468f-f769-08dd08ca2edd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: +6eNiL/UaGUBVChoFCjmtiF+sY1V5tZVP9UG+CZDU+bbOkanCfpXPxozIzJQd3GNb/7VY/+yd7p7CzZ5GG7uB4Or2g9B8uj1FYVPU24195znosu0nyJK94rpmH5Jl9vkvZTkH0mp7o4C7xyseourukTaelVSJBgNHk958tcJY8kOEa9rbV1YHgyGGp4K78Kb/nGR6tlHwTxrjY6uYn8mAE0oNx0C83Pcb7K5vBTf0H+YsPZDjLbdDx4ol44KXIK/ZIi/ba5RT0GCq7qehwZS6yMqRMlmmDjDSU5loy3+loe4LtaqDfxBWLNhMFGiP3B+yhyWFubA7c3DoahqsGzxINAB2CiYxGRtLQ1mDxAGG3I3sPGafPYfrfnrVqxEH7xfB3d8QcQ/CJr8BhbWzPxjMBu6ksj7udMblqsuKVg302QqHjWQsooot5iO7S/Sbsp7Hj63cQypdL+q5pWsCi8/J1BiinCeesiVJ+x1QigtcJ6wIQ1w4GkSJ+cvTCr6SOrcVj3iG6zXJNA/cVuYA3qRoTcTpldifFA1uqG8ylf1wZC9RCxCqmF4PUehQvmSBCJ/6MKc6OiWD7L9CGgBG3WJMunik3P46NCdEz5oRmSfLt0GQy8cEMW11s7v59bZgumaSB69ebK9C9rbmL5FqJQQa+m4+z9EbiGMFDTAj4MljY8v3UpeuU4wAZ9Fe0LYDFiqWmbdokT+8Rtxy9VOkOTT2929hgFHjfG2OtSwsau8IDPdzPz94DEoGiUalpdgQmjXWZIW93kXwZ/NVWUr9/yHDfZJgB+6NgKPOuGSWME1c4QP6vyI7Kep3HySC/BUhUYkTbqrMoHWSDHMyEXYpefU5uxHVIXAo0YpsggidkDPdUaBHgjd827pWtdkuQlTnM8TFcEAN7Y2QFLYgfcdt6nPP7TB0NdV0xHcAspkHM/Up4vudF1NcJay14N6QlTWowwNiugZW7pb5gpNBdqO7YzI2a654K88ml8VsPCVY8bvrvWxqdmxPrtwA5kuI8QHq5y7qCzYqpxM8bCnwfa0LwydErhBetL7HCkxNpAi6HJhndB7LQdXQ1kdj+b/EzBfIkRuI2xa9TOU4i01W/XA1HeIzE72fIAWCmvEb23jDd3kkEdKpF6Z3ec9pSQTCgl75kAkG3egumM3sRGdXdlO3cv5rbt5BWzNzV4FM+ntsTP2Jnpjw+ylsidC7c6EOI3xSiRpIz2gVu6aBxsljbogfHhmhFIA5A1wvtVSDomg4wG1jnoOgNFsvG/7queH55X4i7vXZew6JYRbqQ5CXZZ8D2IgN97bkcwkPlJA0/t+ePWb+HTpCI27JnooVrU+yhixB1KB 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)(366016)(376014)(1800799024); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CExo5eTkNi/YOKIt1QYwrhdawI+UALFqlEuaiNxIndMclmVWRd0s+Iqd1lnlZoCNXwnndW2JXb2PSYDJZpSypvBMAxzGBspTj4mUdkZ9HsepZG37PkNg0tQXgtVqNqNKhu2sG5U9I0UfL9l/duPyCvhtogde1pCx8rHkFfeRNrSA1jLpBKGKEPYyudk3zGLf9IjtKzcNubd9KIYwN4ynAd896SvedyZYzgCRtNoddJyvkhmuzM2utGSxzI7rCIZ5uQZzak0hxGbYLw/EI0h2odyW43YLtWuzsrikf37TTPUyT42WhRKnj/91uLFTCxAyImsgE0cbBGuEW1QxPmEo6Z4SXR/kkw2QJh1VFTv/JFr0RvcVFToF1E5VGKp1pM7zkQTN9eFiYG26FwjtnVBd5b490vsE3D1XGTyra2AF0uOn9LzBg3SYFUjIXOVC/AzE/gfbEr3bFDbHpnz1Zs/vndbwGXCDPuQiWNNpjH5SFKn90NvHVuXwrKghLHTPck2UTR6kIP6jbb+AtThVVoDJaiIYBbdziGOXLKksnZbuZDJi5iWJp+Iql4wkY/Q4bzvXmRLrvu8b3MTtIEnfN4DPEZudao74Bx+7zaTQDAdvnuse8UTHyf7O1LmrHtj9pn92qy206/qMdNzKdU+JmI3nf/DpAPuCnjE9osRpK+uW0V3J5ZdHRNyW7MZUWUP7szMuf9yNWz0V1edtvHC8or1j/dFo3Xe2UBPpymzJoZd0V/YqF7uNlyNrTos/eBgJlTYIU3BNYqb+w0rqg9YmJRkRafFDRpeuPTAjnosFRP3J6l91yjOAyG1iKUwwP7VF8JR+nDNuFMVyvMasf6zWKEPPb1FvRN6lddFRW5AhPAXoB1gD2z1aZfXMF0UHukdRR4sVREMxvJgPHwBAq7+9Xo3zrs6SItQEFLDYVYnxMBF/Tn1HhkmvPOpY0cqV0wPYjsfwvctGx7DZiiTBc3YXHIh3Eemwg4VjaWph5A3OIFhk2b1mEauRLCDcvSQ9epnnIeipKptDmVk0wYXKj0uKV0wG3kzQCW/4z5iUIcLhmWhMOvx7zRPpxulMAe6LB0AeAKZChTPvo/LUtvfLia/3gFuqtjuqeaEY//cEXWoTJrDcqGT89Yh/n5Ns1wmaHfQ6fS56gQuOxDTaBFR+4vZKWCAvLU/DuTsy+qyF0M1pWwTyyqIDEtXi0frDZPOp8qoh2ATGL8d0xWAxQCI1va4XZsOCrpnAtonUn2tsz3w+uwWIjxb844Y/mP2KKrMDCtQrjLS6GDciwO2mvIhfKpC6uL4pzXCwsuSgOfSoPSGmQ9N7KM5tPOpm3somm0+a4s3OYv6JpM72LnvzyaqvT6jMdwOra9TVf1GIXgfvXDk+/dyOM1XnvnznW6ZOrNpPPbtxWflerPE9Bu43gHQMP6P2d933gFk/lxPh1w0U7rjQsMQor3k4wDlXwlInT7YVsptfBypbb/Fs4yyr00UW/CoLAKgfmoMniZZDrqVhjCe7qVpOOQU0pACsDLr7ker4BRRxh927N2mCjWDUe0y7Bs4fQDOJsvy+fQ59HEYovVIWZjAJiQxwNpMg9uXDHSg7SuG2VBTx/8U1HwXVkR14H+L9gz+6mQ== X-MS-Exchange-CrossTenant-Network-Message-Id: 700a443c-0555-468f-f769-08dd08ca2edd X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2854.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 18:44:22.3116 (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: H/NSKLA0PGFQV0JTWBJ1jp7BZXBOSUXZxWfbjrS0F6WLt9xR7VZyNDZrR/gYlGztw3Z5yw+TzkvouKBUo1PBoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7645 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" Move display related shutdown sequences from i915_driver to intel_display_driver. No functional change. Just taking the right ownership and start some reconciliation of them between i915 and Xe. v2: - Add missing _nogem caller (Imre) - Fix comment style (Jonathan) Reviewed-by: Jonathan Cavitt Signed-off-by: Rodrigo Vivi --- .../drm/i915/display/intel_display_driver.c | 40 +++++++++++++++++++ .../drm/i915/display/intel_display_driver.h | 3 ++ drivers/gpu/drm/i915/i915_driver.c | 27 ++----------- 3 files changed, 47 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index 06a60be649ee..ee2cccff6e5e 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -39,6 +39,7 @@ #include "intel_dp_tunnel.h" #include "intel_dpll.h" #include "intel_dpll_mgr.h" +#include "intel_encoder.h" #include "intel_fb.h" #include "intel_fbc.h" #include "intel_fbdev.h" @@ -762,3 +763,42 @@ void intel_display_driver_resume(struct drm_i915_private *i915) if (state) drm_atomic_state_put(state); } + +void intel_display_driver_shutdown(struct drm_i915_private *i915) +{ + intel_power_domains_disable(i915); + + intel_fbdev_set_suspend(&i915->drm, FBINFO_STATE_SUSPENDED, true); + if (HAS_DISPLAY(i915)) { + drm_kms_helper_poll_disable(&i915->drm); + intel_display_driver_disable_user_access(i915); + + drm_atomic_helper_shutdown(&i915->drm); + } + + intel_dp_mst_suspend(i915); +} + +void intel_display_driver_shutdown_noirq(struct drm_i915_private *i915) +{ + intel_hpd_cancel_work(i915); + + if (HAS_DISPLAY(i915)) + intel_display_driver_suspend_access(i915); + + intel_encoder_suspend_all(&i915->display); + intel_encoder_shutdown_all(&i915->display); + + intel_dmc_suspend(&i915->display); +} + +void intel_display_driver_shutdown_nogem(struct drm_i915_private *i915) +{ + /* + * The only requirement is to reboot with display DC states disabled, + * for now leaving all display power wells in the INIT power domain + * enabled. + */ + + intel_power_domains_driver_remove(i915); +} diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h index 42cc4af6d3fd..1ee37fb58d38 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.h +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h @@ -26,6 +26,9 @@ void intel_display_driver_remove_nogem(struct drm_i915_private *i915); void intel_display_driver_unregister(struct drm_i915_private *i915); int intel_display_driver_suspend(struct drm_i915_private *i915); void intel_display_driver_resume(struct drm_i915_private *i915); +void intel_display_driver_shutdown(struct drm_i915_private *i915); +void intel_display_driver_shutdown_noirq(struct drm_i915_private *i915); +void intel_display_driver_shutdown_nogem(struct drm_i915_private *i915); /* interface for intel_display_reset.c */ int __intel_display_driver_resume(struct drm_i915_private *i915, diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 2013962e446c..3b241054ceb5 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -945,43 +945,24 @@ void i915_driver_shutdown(struct drm_i915_private *i915) { disable_rpm_wakeref_asserts(&i915->runtime_pm); intel_runtime_pm_disable(&i915->runtime_pm); - intel_power_domains_disable(i915); - intel_fbdev_set_suspend(&i915->drm, FBINFO_STATE_SUSPENDED, true); - if (HAS_DISPLAY(i915)) { - drm_kms_helper_poll_disable(&i915->drm); - intel_display_driver_disable_user_access(i915); - - drm_atomic_helper_shutdown(&i915->drm); - } - - intel_dp_mst_suspend(i915); + intel_display_driver_shutdown(i915); intel_irq_suspend(i915); - intel_hpd_cancel_work(i915); - - if (HAS_DISPLAY(i915)) - intel_display_driver_suspend_access(i915); - intel_encoder_suspend_all(&i915->display); - intel_encoder_shutdown_all(&i915->display); - - intel_dmc_suspend(&i915->display); + intel_display_driver_shutdown_noirq(i915); i915_gem_suspend(i915); /* - * The only requirement is to reboot with display DC states disabled, - * for now leaving all display power wells in the INIT power domain - * enabled. - * * TODO: * - unify the pci_driver::shutdown sequence here with the * pci_driver.driver.pm.poweroff,poweroff_late sequence. * - unify the driver remove and system/runtime suspend sequences with * the above unified shutdown/poweroff sequence. */ - intel_power_domains_driver_remove(i915); + intel_display_driver_shutdown_nogem(i915); + enable_rpm_wakeref_asserts(&i915->runtime_pm); intel_runtime_pm_driver_last_release(&i915->runtime_pm); From patchwork Tue Nov 19 18:44:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 13880455 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 55E43D6C288 for ; Tue, 19 Nov 2024 18:44:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED8CC10E362; Tue, 19 Nov 2024 18:44:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Z3dZv3jO"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id D69A810E297; Tue, 19 Nov 2024 18:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732041873; x=1763577873; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=p0aJ4Ou2pPbPJ3eTau2Vx0Xl/HUCm7DEiIGVzAFADaY=; b=Z3dZv3jOnFiU5G9cCRIJ3m/VVKRxtJuwWEww5So3mqbFY5+ZMgXUNgw4 VZOWaknQtJmW9tnTXQKUSZWFgO5LFV2hdnb0wKglvC48i5/dcjT0HoFvj Ft/rLRjmF4sv2x21NMWn/jzlCaK7X67e818ci/UeIWbCaSu4GkyQMSrvo xTNdscLo2TmpuqhcN6UayiWvIwMI+DDM2RsfBN8T2/37rLIHGu814iKfG ifkaBan/sgmT2hOwmv8EoGruldZALkn2Mh6bAOF0AQNanOw1F90WwKRmQ 94H6fcnXSvdpXX2WaZOux8ieIxZU+EIs4p9u8MKOa85n2AyhnJpU8qclf w==; X-CSE-ConnectionGUID: ITupmdNqT/GZ0owHq4WEmQ== X-CSE-MsgGUID: JoIqogQoSyW1qkItAlptlg== X-IronPort-AV: E=McAfee;i="6700,10204,11261"; a="43449671" X-IronPort-AV: E=Sophos;i="6.12,166,1728975600"; d="scan'208";a="43449671" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2024 10:44:33 -0800 X-CSE-ConnectionGUID: LNEiINqmQW6cInBkFwhOoA== X-CSE-MsgGUID: dmvmzkonTsStB3snEkcwtQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,166,1728975600"; d="scan'208";a="94114934" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmviesa005.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 19 Nov 2024 10:44:32 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 19 Nov 2024 10:44:31 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx601.amr.corp.intel.com (10.22.229.14) 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, 19 Nov 2024 10:44:31 -0800 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.45) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 19 Nov 2024 10:44:31 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X1jnCjxK57jZs8SGEN3PlrdFmZA2URFZNCSypXFpea9Q48M14/kFUgFDPBIlQDIQHCB1C2QX+x0bii193+XuKiNG6+sXMYqyL3Doc58p66TT3E+9I3JGN0wI+UXf7WTo0rWFfIQE4Wf+XQD2o0/FCPbYkGv4ExCcqhoaFgmo9BBN2UIpVxlVX2HQSouCKH593V0iLAUWgFRWLapsTRLDxO3MEtJ8cyqafwvzJLCBe43ccUzqWehbSFL14gfE+g2e6/riap05vwoSOBZWlSOHTsZHdWrqZANWvmPHJF+cucqLzvRdo3zZHI0bLDrERgbYh8qiaD73GGx16HxE5nrEVg== 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=pdoS6DGKb0ZW6BhOAD3b+1wvVCFXnhF5NOVlEoy+KlU=; b=X/TZPBLN3lcyya8EPZTLm6vwtId2TWyxYLrgzQUQami8cpDv5OIpygvgFIbbnzgBA1uvunPdqWKKbHU2QOfmIkjqONkY1GjpEUHbtKztpTsppsj8oCZEMAD4aGOfVQyGyPVh5ivaGWiK+jOwAhTrphzhHecpGcLLrZwUwKeCxOiK0sblO68F2KPOT6RayfqYEjoE1AHxCCUG/S4/SuPcQ2IrFnywmCQSiIs084rNbDSMOD9KkC2iLx5Ed1Fvufhdw6Yc/f5KsmwrKWwHr8mWO7gUnbBTgmSuMJZ0xjmfvd9YG1D2PIplI9I4dN4zWHWd6+njUK0Zr180fE0WJjE5Dw== 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 SJ2PR11MB7645.namprd11.prod.outlook.com (2603:10b6:a03:4c6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.15; Tue, 19 Nov 2024 18:44:28 +0000 Received: from BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42]) by BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42%7]) with mapi id 15.20.8158.021; Tue, 19 Nov 2024 18:44:28 +0000 From: Rodrigo Vivi To: , CC: Rodrigo Vivi , Maarten Lankhort , Jonathan Cavitt Subject: [CI 2/3] drm/xe: At shutdown disable commit helpers instead of flushing Date: Tue, 19 Nov 2024 13:44:13 -0500 Message-ID: <20241119184414.336105-2-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241119184414.336105-1-rodrigo.vivi@intel.com> References: <20241119184414.336105-1-rodrigo.vivi@intel.com> X-ClientProxiedBy: MW3PR05CA0009.namprd05.prod.outlook.com (2603:10b6:303:2b::14) To BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB2854:EE_|SJ2PR11MB7645:EE_ X-MS-Office365-Filtering-Correlation-Id: b4d7bc9b-6d04-4a76-3b1d-08dd08ca32b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: fY8VY+Y19XaX+ZQH09WgGM9Zk54336bALj09yxSr0dijW4Ja8tdWzBPlSSmsiMJDVaiBIfs+FzS7IIa2VW8IT7CkdtBCfPjoJViw34IO8VoC59CE1eVDHcN9+TUkL6RRUZdJlOZ2iQNxkk8I3untxEmse20b+LVTVeX/I1HrsqH51xPO3q/8SvrvwAIJwrNC0Dwk7NNHXhS/cogn23F5nCn6P6b8DHY3yq9Tf1pe1HQ8wTxawrOIhzo+fe3RTF0pj7H98N/mxkD/DxEOOHR1XjIs11Lr1tQH8T3auvw5Qb8kSyDTdWZUd19FR17iXf9hCm8Nyv81iPw1qHY2yxXGutCbIxNDdTp2TpKloVthWtbGIjnb0GM/ns1Cw+CyZdXdrCz59nfNUzlBecjZngWRsjsHRtfvPQkvW2AMTNMMqCqRS9R52EDRnce0qdXQQ4OF+EDKvACaiOPpg2aV/eIyzHj9O+DI1JhtZIZ258/TVUU8pBCL7YT0alO7PaVcAxiOSMUNNmlRFBPMCZxd4QW8NiDaq4Gonk1pzMefSRudhZbOB73M6ghzlXVmTwzu6QrwjEiLuJ87TKg90Ni/3ZHSHnVTmGyXOjJ+vKSxEfoqD5VMXYgkhbWKK+uQKrHzp+TnX4PXngtP3VsDEsSLUJ9cV32h/FDKKM3CSiOCLX/XWc1ClLbelGz4PmOMGheWDgrZLpZ1nHoJdXlIYddXEhsogvrfHxnVXIUb0FGDuvvrq/Cf3QYnu/ixk8TH6bRLGsps6wejrwZ6e5lsakfy/xLJaVzpZBakj+CnM1prxD6DLFqy1imDYNBdfOjVd1Tg9u2EN5Uhdv82/H0VfG4peAinfL2tRuC47JhokPbkY532jJjRjaaOukJcuF1VFzop+7B0/scVyStaYn2s+HOdFae5H+68ZeS8L1XjCS+H2t4pXbGw0VCriiKn8py+sEn7Zc4zGn8TJfIjCBAVgrSXy+hgZ3uyzmvTM2TMkPS9TOhcJrymwJDRLDR/ppZGDdGpy1FXO/ytoIz9nJez08AlqhMM8nonR9p70g2kjvj32v3Al36kk2jbLtYEGxE/CYqcqyY8qdmR4QEIr5mXmN2TJYscxuwqopiKHDF4UVqds0XYs8I1Z15qxgkwlzKeNW1XGmwOx5NzekR1xaSxdFV8czhAUQHhuM8j4Aa45JRD2oIEU2w5CHQr6OIFtdGBLCGXYE+YrUSb23ULXAbevrmue3siFwHNeZ+LA54C+FzBKdcWZYN83qAgLigLLU9JX7cpwEewI7FH3/iOF4wTKa7lfn2dMoHRteX3hTO673FMFVN7w7+9NGJ/ilxJNMtf0su7u67h 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)(366016)(376014)(1800799024); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QW836fov1/KOB9KQr7cupG5TAuA2srp+5OWZjiJthDfDugG42yagywqWx3+7bssbP6wtOUE75DrZSXoaNIaTWmfnDe8kDbrhiCX/Wm2H765PZLsESA623ktKXHqrjmX6JXNwMruZ8V8B3imDUAhpTg6P/YjOJ4n5w8yCIRQ2ddCGFTn3aDTM6jTr/u8atDIucrMFW5yo+IsyjJW8dHto8Oo0hiiSLy0AbwtIqbrNEeFsi87kJ5/AnNro1OYl5l4Sa1wQVKKtnw1v/5GD4t+8CWNrolgU6XcAr5EAL3w9vLs5vajn2fUKKk0D3L45H4CD3wzN5GO9pBG9/Oo2N/e1TXcpAiC+y1jehwiyTFMg9vRXxBTMSmJorNmNmXOTGX4zUqAyGb/a7VqdHDe/8/H+mK3sMsZtReR51qkVkhrtZCfk+mT8iXR2Q6odo/MbqE30RblX4qTrAKp0rCLsVNo6Umw/Z7609uZ+bsbgT7k14WPYS79HsiHvRhjJIG+vMPnBWHnHRipcqKTZ9sb1/gov7DWeBUlRXY8nyzZjH8bpPFzZtOUwFvoMi0xlid0pnEdlYWL3DvQttZmH1I+8F6HynDLMengSzgJV5aqBiUl/+LkfN1yYcqnsQPstMdDrPVOM+lqikBQsfyB+vPH5yrf/Ji3BgHTWFEL1GN3PqybyajajaxdM1QVviR5XN0ZaAPryu7KYDKVFYT+tf1toUKxs3xOQEXRdLmaxiUGgqHemAiWEgFJWbb4eFAXez08r4R5f6vgMTm544DCktxGgNq57q7oz6WP95viFEV6bdiN0Q0cnPOcEWUi8H7qKQmcHb31XVIkGR7mmbATrikxOhUTrYbQ7FfEs3kmT1NHQiNg6h28RyHx/kQW+ft5KIvI2uzopVoIniXvi7N9Rv1u8xsgCu+HF9dghqvLMvk0XXhztZ8C0CCwKbUfNebyBHNHwWQFf0GozHsRmP19s9tXopIUE9qCvHIhJDcEiIuheDAQz3TwY4Q2iwlwM0yCd6CW4s52PJ9h3o7hx6ghxk2LTwGBi8ApuDgJzt009WnmvaKLXfiWwOiVtrov5+RHM0q+LFJHd55dWPy50Jh6pa0hdsZlLf2RDbxTDV9MeCzQgdjXVNSzEDT2AdWeEzPRhIL7gP97V5BKODAW7yC2z4RGRlrwCXAfdUPzn8T09As+orvLbQa/+LVVIpYiu8YPNqlwG34FgJshaVPr5+csZCbMm5AD1Yk/OqdP2URmao5DiIUTfH8IpXPh1O1ss5WYt70yZSy3wd/slm3/6G2VIOijl5tMgm0QJjwdzhvMo2xt5DNHJuPL29X39IEyhtW45pJD4c8UrdXUGYsYHj+iNGikukUjQrTXgDHIWk0USQu3oG0DOrlx8BMo8m+QX/dRib3jJB7AIXdNOEZCQT7MlZI+pYreRXi2Uk4CM7hs01j9/GFwzznz6rRDax9u76Y9hv75btVzOcrjSY113lAgUtkHRcJ0bvReN8XYfjt3osnkone0/n3TQvtqW7cRw96uAJ9Uv6NOKbwgDyXeQ86svn2R/z6j2Nzol04kFwV8SSCqbYLsxQ4GiZLEKm9dwNezi88SoOkSGrwT6EIPBaFYtIa1jOPXg6w== X-MS-Exchange-CrossTenant-Network-Message-Id: b4d7bc9b-6d04-4a76-3b1d-08dd08ca32b2 X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2854.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 18:44:28.7541 (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: DRl+Yg1bt1/yZWssg1UnRcDQ8TxcYL+9+NafCmE/Wg1RVIMqn1H8XoXVJAYoprjPfvYmHBV/iLafbP/gBjwqYg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7645 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" This aligns with the current i915 display sequence. Cc: Maarten Lankhort Reviewed-by: Jonathan Cavitt Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/display/xe_display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 69c828f38cb6..4759c3cf5915 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -366,10 +367,10 @@ void xe_display_pm_shutdown(struct xe_device *xe) if (has_display(xe)) { drm_kms_helper_poll_disable(&xe->drm); intel_display_driver_disable_user_access(xe); - intel_display_driver_suspend(xe); + + drm_atomic_helper_shutdown(&xe->drm); } - xe_display_flush_cleanup_work(xe); intel_dp_mst_suspend(xe); intel_hpd_cancel_work(xe); From patchwork Tue Nov 19 18:44:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 13880456 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 79CCAD6C288 for ; Tue, 19 Nov 2024 18:44:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EFEE710E698; Tue, 19 Nov 2024 18:44:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="nmxsmXRp"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id D1FCC10E367; Tue, 19 Nov 2024 18:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732041877; x=1763577877; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=M8n/TPOuSs5IUl07eFb8IAIuCf3xME9EDoQ6kyOgJ4o=; b=nmxsmXRpJqKA+uORkWtx/aYntr89RUbOWecsQXmvRiQvO9Ep3QsUMjUZ APud8mBrJ1XlCvdmuWJ8lPtE7q9M0Gih3n0PJfJclqo9pRigz/cfnSEUb smob1QBRNCEt2WGiOwi4vfYPIf1MVM3io3zsl8PNz2XsSFh2C7ZC40Uod Dr4FBcjVo4xYwhtBDJgqmc6Dyvzvmx//wRk3XZKqBZ9+9WR/l42hw+kJ1 fLlkmPlqCV1/ioAooZrkV/S7k1AA3fH6qKluOVIqvoF/U/bHraQ79jnEp V7wK89gZebkTlQeqRzWB7EMF6eVnmF//AU33OGSjUAxgAV9tm5qzSU7P2 w==; X-CSE-ConnectionGUID: jNc6vZeWTUixWbweysHlig== X-CSE-MsgGUID: AFnEEQGzTkq6v90XigW/OA== X-IronPort-AV: E=McAfee;i="6700,10204,11261"; a="54562738" X-IronPort-AV: E=Sophos;i="6.12,166,1728975600"; d="scan'208";a="54562738" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2024 10:44:37 -0800 X-CSE-ConnectionGUID: JqQEV2X3SVWM+3oDe8Iosw== X-CSE-MsgGUID: h3avuo9rR3S24Z4Vy+zS9g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,166,1728975600"; d="scan'208";a="94583484" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orviesa005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 19 Nov 2024 10:44:36 -0800 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 19 Nov 2024 10:44:36 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx603.amr.corp.intel.com (10.18.126.83) 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, 19 Nov 2024 10:44:36 -0800 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (104.47.74.46) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 19 Nov 2024 10:44:35 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZgOXSupyAWWpahfWg+UBSesqelBw+SYJOFVQZol+QEWFKwEQGDdJPAcmMj8IZWyYeuopUywn0YihUSlvhP9i46wgZeilR4Tgpepdb9hfChHDlhsCyLgQyRlouI29mafUv+zHk3EaWqLhmyEWzzPgEQYNwYQyhFh3oGHsdC7Ij7yHj+AtCHXaEIifZgfMp8g+y9bhTzLz6i2vhXCyFppq/Sr4JC0YEEC+MEaw0sB7SVkSwDEkADCEZdjpVHumkxzxUZHbSqpkICZehhgEOkTDw3IK5+oNUhxrysHJaSZtCnsP74n1pR6oEGnseMwETJQLlw2FIFa+hhBc3+cq26FKJw== 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=Xz15gIfvPtpjwMUfwulnMZv95u9qr00quq8Xd7aKE70=; b=jOXg32zIkvzb07ioAv5YuMPD79jLBh86Z9gVpR0IuZLMYyzAwAoDtMe/Tbjqz+1h2HaGQ2KIFmE0+l/La1RckNBMMGB863RvRKo8FsIf2lU0mW3SnhmMsqTqQpbOqsJzoR/XJpDY19PRbFnPuo1cL4Cm45oIuutSIRC4cQTHranVXHI4ldK5UDKdvswzacSHcNo2HOURVSAlYw0Nsa32d3j0eUtOyX5lCqfia9RfISdOwFG8Q1XhMMBroGbFTYMdCyfSfFR+eXA6fgppl6OFawGcnhjoW3oVcs4s79/8h9u8/Mq50fKMctY55ugct5E0zZGOHqB9uyIKMXRk0VeoUA== 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 SJ2PR11MB7645.namprd11.prod.outlook.com (2603:10b6:a03:4c6::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.15; Tue, 19 Nov 2024 18:44:33 +0000 Received: from BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42]) by BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42%7]) with mapi id 15.20.8158.021; Tue, 19 Nov 2024 18:44:33 +0000 From: Rodrigo Vivi To: , CC: Rodrigo Vivi , Jonathan Cavitt Subject: [CI 3/3] drm/xe: Use i915-display shutdown sequence directly Date: Tue, 19 Nov 2024 13:44:14 -0500 Message-ID: <20241119184414.336105-3-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241119184414.336105-1-rodrigo.vivi@intel.com> References: <20241119184414.336105-1-rodrigo.vivi@intel.com> X-ClientProxiedBy: MW4P222CA0005.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::10) To BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB2854:EE_|SJ2PR11MB7645:EE_ X-MS-Office365-Filtering-Correlation-Id: a4944e71-87b0-4fd9-04a7-08dd08ca35b0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: eVR44g8jmyhEpewYdigYQ74q+jQyQUS0rglZD4A14L5yuCu4fhlxA43tlndbSVPy/N2r1lPQrVe3KMGFHHguYpTe3eVnANMLMhxbeRt9Ke1OkTHnESDxUyscsOFF9KOIlAtn5gRg2XGNle/dIhQ+CSQVl05Hpaawbn8ue6nLe01cYw5NhXhtSLU7bZ/blUeQZNq3OKKP9ddN9MBFFsUmm8PFxgRCssHyDnWbW+TlgRWBjeB/2GNI4TN9ouYZfzgvq4dcmNa+qdPkpBGqiThGJq4PGR7wh/17cp3S/Rz8iRBV6z7ft0+Aih7DOLRgX7/cjpJYc6QlLo/1b+4Fs//PW41Etu7A7DKGKKuwsdW9QqmXMI0+lthgW8jY4XEBqlTTYwd7w3Zh4i/yKYmqDauHEE30fOtHR2BDG0bagIxBeX9XAGJAAyF68CQW5//KD7VZwa25VKvLYe6r3dr5yPtLSNJUD82ou4OgyYqWyoMn6ZLyCbvE7Sj2WpturfDT/Y8jTC/SanpgaJEbmyVgBM7trZRgNQdwhGEzhFo0X0Wo5o7ne9RopCcHdAWVYXicatBiDglALL5J48GHnfTDHsUKhsp/d4NVreYKO1q1pv7bNVY/Ob/wMwFW/Qp9Su0awkh4jiCmnHWqjIXu0JsBpBkq05I/Xmu/f6S4LKgpCf03YfXoqCxNwnM/2kJEhWVvS5aMKfCuz5vTGmCogJ5BnIfmeuLwBA1ZzCYGzUFwTLF5thRsQ2x5eWDyw16DLYJhlpoOtpAGupKQNiV8sbr48oPA3Ip72UX35mZQL8AQKWatwsFbVDodmHXANp9jASrDXltlqrF1V+GKJhtcMeftmmOe6btFv9KBXoVsBEXoJdS3oEMdWgW4+yADTpyIDmftVo8KWqkVzg2wkNhbO5uhYXKyp8zxSM0SmyMSdjkufMfq8uYM3seTSQ+K25QLdc+Wx9HKF6sR+o5i4r133Ss9oYJVGJzGq1szhUzJA0iJPL9TPqk9ZCwN5Se9tgBEXnCQ8D12CzRZ3/h7KwF9X7p2x/MTQNP46L1qA4xbrPGcZ/LJ86p/cgRZK2x+5xIzTXaRQFoqBGP2KX/1eOZ0knkllsjJHP9vAMt/qRhEZ21uM4mqkdgXFKnzqB52MU9JENJKpcb5It/dvEeg6Dc5UpQWmOUu4VfJAKV9prx1wljn4+nlesutGcC2gRZp/bRPssS987gIt1QrgdqfoySN4vxDRpa9PwEE4BEUhq7GrDhdpw0hT8CXEIqPMAnHHtbJ2qIEuDbqeQfb3RL/i++57iRtgVeP3/XVdFKPToxOmtE27zDnKMrKCP1pyDaznAkiCL1R11E2 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)(366016)(376014)(1800799024); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ipK+OIFpIurzmirS65OIoH0BY30GKePwmqyl94Ku+As2DAWYZODPCHbWlEuT1fFfOzOlNnAd8e3g4mISEx5KDCufi6c/fKsR0pe6gRXLa+QH7xb5HbsUD7VIQdAUHdyMIG+6JxV/iFLi0JcD+yy76CMTTR8fQ1bU3696zu39nsMsU4U+nCZu/MhFAGXMfz3v0vb9Gu6Tm4ub1UZ5ClwNyLf9wLUI9WrfHoY9g78/9GBjcZUXVP44a8BiIeWUUIOOz13UC0QrQCl6EAz2Jop3QdD9P29sogeF1somTdfA1R+YUJl6VzDpR6eWYqow7D8rYoGH+E2/3Nw2g0GJKTY4TWh2MUMESuKJqvh+tg/DcSlitrd9bxtuG9V8gaPNN0SSlOBkmQ8yLMirGjwemoNDOHYbQa3NQAEBtlUzEefKHgjThDl7euXvHke3iA/khM/ogRGrna/Y9DomR7yKxO4Zf/34MbraPuvsVlDrGCFKt0PV/SNFH/RfFD7857c+rgu5T0nG6Ye28EtManZb/AwTRoDiwYJkHT9OLMXi+1RW9jZwJfn9aht+JtZE1F3B/RkOncOp5xBzyWNVo1UTmdQfvbFYz825QUrQZZpmhmFdsT438FD2DjqUcqEh5VYEnk6mdGDwmGH018Rz4Tu46Xc7XIqIETwLtwIYeFGhssrDxwezaiw7fGoYgXuJucL8jIny5e5BCGiwjtIEJoNUJimIZgfDnKu/QjpJF04+ZlVNajWEfbYqwDUsFuvkJHi5mSsRQu+VuurelylgPt7YHEofLsVYHV/Xo6HoBejpDCqu2IdWKbfI+iQd4URSJDvbV1QNsfM1BTPsKSTbaXI1Nxvgsr9EiA+3AFr/vyOCav5+MSAr6Bq6eLnXFagyC7J54W2RBoTR0AtFmvpC/Xo5PUGf8p0nxKlI8aHy0B2K5rOZDAqamj2n4u3yPyi0mX79pNT/QMI70al/0iHScgB/IkGL4aXOqOSc+ziUQzdsfdFHJpe+bkJ7Zfl76mAhG0hVEX23Av3JFX89Uu+esu7H6fR7dXQ7odZZqi6RtvkDehhI7Crb3KUNmKcNzHcNyR65iyBAB9cQpMPWvcc+7nQxAIVb8ytqKVRaDEJW67PFHcXN70mQP9bxpQ9RYC8MUElVLNmzMz39bSWoWCXBB1tpJT8WqRrR0GR4BwsyynP6lWVwAvUULoHDOSHDYUmrPwTkpNCh6uT7iRr7HIaQ1JK8/IXnLXt2wNt/fCrWlNXd+GMEY04deo41j/NVoHEuKDAwpNStdKmGLxydVUMLFsvySe9OqLpvMYIioXraGQZw60gg9QI7pbdbfWsl1dF320shKS1e2mB05l7dobuRu122krnHl/86n3TIiO+oL95mTTE5XWVnmcwjOMISwXIqekk7HnbEJ0Wxe0EAqrb8XBXMCLdVk0MMSeG707IkiRXgUDtqxJ6IrHaizgzMp5gv3cpFcUipA9ZMbyx6qUHS4pK2ysdzyIZCrhXeIgzQAjqTgL8msfjGkAHw3lkbvRqFRwCcJrr5RWeYatgdlNrm97PEuWdDCtlaR8Ue5d6sqaY2w36pW1ii2jI1wpoQqla9p11AN5SDYB4e99+Opyg48sViRtwBzg== X-MS-Exchange-CrossTenant-Network-Message-Id: a4944e71-87b0-4fd9-04a7-08dd08ca35b0 X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2854.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 18:44:33.6972 (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: k91JdqBA9p1+127Ry5VY8fmfhzA7jkkkKC2wb1Az9rRV9e7zMpU+P8JHA3sTLVEcxj3rJnhINNEcr37Y16rO4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7645 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" Start the xe-i915-display reconciliation by using the same shutdown sequences. v2: include the stubs for !CONFIG_DRM_XE_DISPLAY (Kunit) Reviewed-by: Jonathan Cavitt Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/display/xe_display.c | 46 +++++++------------------ drivers/gpu/drm/xe/display/xe_display.h | 10 +++--- drivers/gpu/drm/xe/xe_device.c | 4 ++- 3 files changed, 22 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 4759c3cf5915..29676652bc54 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -10,7 +10,6 @@ #include #include -#include #include #include @@ -357,32 +356,26 @@ void xe_display_pm_suspend(struct xe_device *xe) void xe_display_pm_shutdown(struct xe_device *xe) { - struct intel_display *display = &xe->display; - if (!xe->info.probe_display) return; - intel_power_domains_disable(xe); - intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true); - if (has_display(xe)) { - drm_kms_helper_poll_disable(&xe->drm); - intel_display_driver_disable_user_access(xe); - - drm_atomic_helper_shutdown(&xe->drm); - } - - intel_dp_mst_suspend(xe); - intel_hpd_cancel_work(xe); + intel_display_driver_shutdown(xe); +} - if (has_display(xe)) - intel_display_driver_suspend_access(xe); +void xe_display_pm_shutdown_noirq(struct xe_device *xe) +{ + if (!xe->info.probe_display) + return; - intel_encoder_suspend_all(display); - intel_encoder_shutdown_all(display); + intel_display_driver_shutdown_noirq(xe); +} - intel_opregion_suspend(display, PCI_D3cold); +void xe_display_pm_shutdown_noaccel(struct xe_device *xe) +{ + if (!xe->info.probe_display) + return; - intel_dmc_suspend(display); + intel_display_driver_shutdown_nogem(xe); } void xe_display_pm_runtime_suspend(struct xe_device *xe) @@ -408,19 +401,6 @@ void xe_display_pm_suspend_late(struct xe_device *xe) intel_display_power_suspend_late(xe, s2idle); } -void xe_display_pm_shutdown_late(struct xe_device *xe) -{ - if (!xe->info.probe_display) - return; - - /* - * The only requirement is to reboot with display DC states disabled, - * for now leaving all display power wells in the INIT power domain - * enabled. - */ - intel_power_domains_driver_remove(xe); -} - void xe_display_pm_resume_early(struct xe_device *xe) { if (!xe->info.probe_display) diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h index 17afa537aee5..f139a88da3a5 100644 --- a/drivers/gpu/drm/xe/display/xe_display.h +++ b/drivers/gpu/drm/xe/display/xe_display.h @@ -35,9 +35,10 @@ void xe_display_irq_reset(struct xe_device *xe); void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt); void xe_display_pm_suspend(struct xe_device *xe); -void xe_display_pm_shutdown(struct xe_device *xe); void xe_display_pm_suspend_late(struct xe_device *xe); -void xe_display_pm_shutdown_late(struct xe_device *xe); +void xe_display_pm_shutdown(struct xe_device *xe); +void xe_display_pm_shutdown_noirq(struct xe_device *xe); +void xe_display_pm_shutdown_noaccel(struct xe_device *xe); void xe_display_pm_resume_early(struct xe_device *xe); void xe_display_pm_resume(struct xe_device *xe); void xe_display_pm_runtime_suspend(struct xe_device *xe); @@ -68,9 +69,10 @@ static inline void xe_display_irq_reset(struct xe_device *xe) {} static inline void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) {} static inline void xe_display_pm_suspend(struct xe_device *xe) {} -static inline void xe_display_pm_shutdown(struct xe_device *xe) {} static inline void xe_display_pm_suspend_late(struct xe_device *xe) {} -static inline void xe_display_pm_shutdown_late(struct xe_device *xe) {} +static inline void xe_display_pm_shutdown(struct xe_device *xe) {} +static inline void xe_display_pm_shutdown_noirq(struct xe_device *xe) {} +static inline void xe_display_pm_shutdown_noaccel(struct xe_device *xe) {} static inline void xe_display_pm_resume_early(struct xe_device *xe) {} static inline void xe_display_pm_resume(struct xe_device *xe) {} static inline void xe_display_pm_runtime_suspend(struct xe_device *xe) {} diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 930bb2750e2e..674cfc34a992 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -821,10 +821,12 @@ void xe_device_shutdown(struct xe_device *xe) xe_irq_suspend(xe); + xe_display_pm_shutdown_noirq(xe); + for_each_gt(gt, xe, id) xe_gt_shutdown(gt); - xe_display_pm_shutdown_late(xe); + xe_display_pm_shutdown_noaccel(xe); } else { /* BOOM! */ __xe_driver_flr(xe);