From patchwork Tue Sep 3 22:38:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivi, Rodrigo" X-Patchwork-Id: 13789480 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 5ABF4CD37B1 for ; Tue, 3 Sep 2024 22:38:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1B7310E60D; Tue, 3 Sep 2024 22:38:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ru3cpRH5"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 115E010E608; Tue, 3 Sep 2024 22:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725403100; x=1756939100; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=7/75tolSFEhv3ksfFNspZOXjMjSeWPzG3myUmZzNTF0=; b=Ru3cpRH53w5/Dk5sszJnTCjocl4yFPSPrP5t9k0YYQ7Hlq3+05N+e5Q4 F2sWrO8I60HnydsCilZnKhTeWpySdxRbz29WUlfunLgEanmPVR/Su0Igz YeAah0jO3Eezam1v1VVDwxdASYSeyo8ohB27HA9bZ33Rf/O9oNhuCBfOH yfiPoXFM2CeiqARJoYoMLkZauO5HhqlwzpkBp9Jtlxjdd6YOjRedkNxBG TlgsNQEvxSXeFC+COnhwyucBO/DgriKreMIcXZl11zCOrvntteh41Ma1y mQG2onggqKD5hOPeo4sp4WVmfgwPHQMMmNVZuxcBq2/WadkmuFdbgdgv1 g==; X-CSE-ConnectionGUID: IUeWBDJQREGRg4QmS96PYg== X-CSE-MsgGUID: zqHpB/+QRZ+TY/FQp+R89Q== X-IronPort-AV: E=McAfee;i="6700,10204,11184"; a="41506806" X-IronPort-AV: E=Sophos;i="6.10,200,1719903600"; d="scan'208";a="41506806" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 15:38:19 -0700 X-CSE-ConnectionGUID: V1IiMfknTE+jUnLyofYqCw== X-CSE-MsgGUID: Qxe7OVqFSkWCdnQstRkbGA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,200,1719903600"; d="scan'208";a="69881643" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 03 Sep 2024 15:38:20 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 3 Sep 2024 15:38:19 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) 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, 3 Sep 2024 15:38:19 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) 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, 3 Sep 2024 15:38:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CfoJ6qqlC5lC65gQL+ns7ZJjG9y6xD/0orKmIL4n9wJNdiIHt81PvrkWOUm1aa4IqgZJnEM9guB041NkFaMA1IzTP/0ZelELQ5WpnlX1dgOaJXQ1OAiIST6MgHX5sL0AJON7H8NAsT++G16pdpQ8YIpv6szrEnB35+ZYWUx1Hof2pJAOMmLW2AZz+cYlm4sPT88GwNywqngRXX6wQ8OpjJ2cmNWTeC4Yv+R7pNao6V+mwZmKXCluR6uhuyiILrbmR/Uu7KUosxgX8IUfh/EfhNqInrnAHOA4qe+7G1q+aDpbs7J/q9tEoH+ngWXeWpfpehIxJY/ram8XC+yfXh7kRQ== 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=B/oqFKKWsZnjhCssKKBn77X7C2C+sFiabzNuA3iCm4o=; b=C0Mm2S+DCSAJfcAXz3j+vuwZB5JA9C28Q8lUzLb+L9pqLJ/UqsddgGu9ggzQo2RbISzLKMTUqfQDrM1RN+F8QnR8VkvKkgmb68SUpulyCdaSVtbvNtr5H2SHmZDmThEagqZ7Y/g0hvZmjgXKCbYFks3+hmWLiuXF/E9Kgs8fIClkFws7pwMTb18fT+69BisWYdtma1fM3Fd2Uzr2pGe3Wid2C7zM+ixSWPZh9Ec8d7KfDAhNeeYwIAHneccbuLqGR+UNfWdTxJQk05XsNFVgwBfpauZill2qQ/xEzSTxK3a5wQpgss3M91G1bOWbEfTvmjV+fhR0fwpqCSDVHzIDlw== 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 PH8PR11MB8259.namprd11.prod.outlook.com (2603:10b6:510:1c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.25; Tue, 3 Sep 2024 22:38:12 +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.7918.024; Tue, 3 Sep 2024 22:38:12 +0000 From: Rodrigo Vivi To: , CC: Rodrigo Vivi , Imre Deak , Vinod Govindapillai Subject: [PATCH 1/4] drm/xe/display: Spin-off xe_display runtime/d3cold sequences Date: Tue, 3 Sep 2024 18:38:00 -0400 Message-ID: <20240903223803.380711-2-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240903223803.380711-1-rodrigo.vivi@intel.com> References: <20240903223803.380711-1-rodrigo.vivi@intel.com> X-ClientProxiedBy: MW4PR03CA0224.namprd03.prod.outlook.com (2603:10b6:303:b9::19) To BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB2854:EE_|PH8PR11MB8259:EE_ X-MS-Office365-Filtering-Correlation-Id: ad5b1f6f-b5a8-4226-07d8-08dccc69177b 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|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: jsvKYpydGWkUrslp+cL5ppVePp8a+tEkrgTijznr/02adl5f2X9s1pzmmYreqZpx9taymHjIiWb3hglYy17vPq+hklnKHpJEBdW97jrwXNCLLJC0lLU/6pGALIUXJB/uC/+6SjofwwZ8XC3LsJ4AF4O8JR3WdD6cfBRBiXom5qlqzcGzCxLDSf4bosQbRmEtJTL2BOKYaXPDsNR5sSeyD1OQSTPnR4rOFiLgWymSNX75FoGTk9xG6t6jS0w5wjwPPQHmnRI6m3dRL7LzDFxn24T8EvNGnnZicn6tgIRBXYqgGaq/osYiChH5rBuksKHCPgepxIfyrzKrAmYxUvd5rpeWPBGSLLHlOVusxPoGE7hAWrTMUw5aPuVnDByXQXYyA/VsIjpgw4AFfAahqb4AGa23pV0i2cKX7m8LJI/3vWXTN8AiVJVNuiVe8oqmqmEj/4emdAheHA9Of4VipRAqhczpKmxmQpQSKnLvu/7XUgBPXoXzEr2dwiJlsOUk7/8cUgbn2ypJ+RkACXwPr8q6DfYRr5vUNRyUKIX6FHxD4je8TTatWCAJOAFxU4IV2+2ZzzabozRdmtHR+kSP3ndblkDAO2VoOss3+98+YeXUje92g9vm578a3+DETCvUr9wDE4W/t+czxs+StCEk+EQohYMC4/09VRSArO5H0cy5rUnZifNlXH29/OZSyCHoExYG4uOMRhYkkFOaXWrATeWY8U54MFsXBL00lhOItQVTr2NurL7NS/ad4JK8EHh8VUh87eiKrgkMvJ4Y8hsAXttCW12A4dDAGt5zh7BBoK8FGb3u5VGGgO3z8JXEOK1RhbQLerfBFfRYeTvS78INBaR+HeuUUtPZGz7EwaMUQnSQLF344fIZd6/4LwsfcNC431nwFNfUnqp5r5avljPVcUkv2flKRRbKZU1hcmhvtojlmmPoUhLFHz1aRszSXnPRwaoxMPngnNDthZWDWc19Jv5wrxY3BRK8hwir0LXRuow3k9/cBpnQHpK6klX81SiSdiDHAEgyEZ85nVCBXg9FR4p/7mW8sxrOuXZl9GvucKhcdV959Vw3adhEsgDfzmGfclNDjrjYpVQa1kIMvpGyuzfFtCBLPeleDJRwLBz7B2XEf3bcjdyB9tVfysWNaJyskvPy9U7BBtYMJt1BO/BRFAtUmMG/+cUXbEm6B30fcbpo2fHWSysud2nY6wbaQiDxkddZ0mR0smk4aaMJggMMkwzhPDlaexS0yLC9euBJAahItd97RPPdSXHqUSUCdfitihX/mQOimKsMN27xTfAbfJlh6IY8cPD0l1ZP3gd2W3agbMQXeNNOdOFc3xEOD0OWJtBS7twCxoEFdx67zicr3XWI2A== 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)(1800799024)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5J5GqgYzB094Y/jckilkruyBlL2AhWdyNRVWT3dLVetNER4AXlIuBPZoVAc6ahynkfYopRTLhJZuw61ZraVXQ43ITawn4n8NOZepk6twqXiRAFptT7ugNWZoOoUAkTeC8jG0yvGVmIFgLFv9doIxIbil0z/s0OgCa9mw5uEhGeu62vhLlkBQxqcathHTJTMvRzdtlL5l90Gn4KH3/UKtkcNiE9GSz4WsO2803CbyU2pR7Bh97EdF9WHMZfkJE0r3DUCQitf85IVoL3tMXKNGAqC/zUT60Z/CdvzoQs+xO5vxcg2x/bEdlJ/++jH0trCLESUw78cO1MV9fC6AFJLcD/nyOXyFDN43XRs9MXPJHYiT6hew15B02uBVCAjPABduSsoNeRNuxqiAZP3zTr8deCglSuKgczmes2Zex+qvJH3RsDtfXlwwi2Wp3E5L+exfeNbinIPBrMabHH5LxeennfpKTCPPdWsTxcB6xcpMi8t6KAHFYz3clVWuLDtKsoESIdxLSY4PCxlsdewY1dgHaf3Mcggu6rUdlBjWr/SoFnJetB42QMwfwKyxw8mo5QiHVxlSknmKH89BUMxrwa4e5+hpS129RqNcCeBfjmTMb1WUYhMYoqiXg3EnC1mqTpfTdWXS2/n6ty2J0A7ecFW+Tk8BEvAfMB79ukIMQ7CSGIGrXXUmlTFb1LwCP4j1N49QEXYYbwxQJCKH1PfeCusSfA2TqLhTf1Lh7Z+C7dtMDOxmSmAPQQZJgSIxdF0OlGghaqueFW08RJaFJHyN6k9RFalRoi5oC0ISyt8gmORF0hMkn2RtlW389TTJVB3Tql80pXuOygYEPp8siWfqYqyunM0NVO5pgOfR3poO4yeHuW87M2Y4EwjuBhdSjk7a7/AczJ9MzkrHrihWXdyvJLAgD+MP96/4fbtlsWaDw/YA+351rJvfqDMiYhxYOvgTCQFfaGmJW7RJV26CNLbmcgfjoKKm2psUXTHtyGTQMGK2ekmlghm/x6cIHMowZyoz/PbeuXl15thQ5rmMtfQULw/tbwWpsZe3Rp4exRV8k21CU49Lm6CzqnZtj6r1UUJaR4glh8u2nANNzCfsyt5kCrSt82khg1Mkkf8V/2NIchpiccUfdk89qLNuMG7fIsLR3IJ08yU8qjTGRJbDFUZQDB7IHy7O3VocHUTXpgZy+nwMwhuLOHmpffwfwHRMEqJCqMhRAy9xcv+ca6GNqZnorht0IdblHUjbf9xom+6vah+41Q0VJ2QWbRfrfs9hgkoftMiAakd4/AWBQ682t4FjtP2izB2OsiCicCTDs3RXxnqwTCOPYK5xWFpZz75HRleaLTAyXsGNJMqcuTmY0/9Ug+jJeEc79p+G7h6A7I/Wjhi87p9LTfabJKMesIDyUeL+/TgYnYvwQW7Ua+ii5OujO4DvD2EIjPa6/RB0b8K/4yiSANTZep2+6+V9GCRTTeBRk89mNsWYW/Wm5AGB6mxMWBbNdJyg6haaqp3iO5rCL55ulAEFprJeuH/sVOuSFLzHaGMAHXmzfq7LbJs1ZCcrmX9uwMYGsDdXAyJaJeZFH7W2l537bLDcU6jvEvnbGfALH8qZwT/hFp3qq4DkvsUBhISKzg== X-MS-Exchange-CrossTenant-Network-Message-Id: ad5b1f6f-b5a8-4226-07d8-08dccc69177b X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2854.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2024 22:38:12.1854 (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: Sc1KUzAy91ypWcHaTgDtpCc/dSRWIimkiPzr1S0f7+Y7vOmdnn/GwSNUg89Ey+cswJMgzu6UdzDWusiXxe6Pzw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8259 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" No functional change. This patch only splits the xe_display_pm suspend/resume functions in the regular suspend/resume from the runtime/d3cold ones. The goal is to continue with a clean-up on the sequences that might not be needed on runtime, even for D3cold. But, for now, bring them to a separate place where it can be easily seen and scrutinized. Cc: Imre Deak Cc: Vinod Govindapillai Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/display/xe_display.c | 83 +++++++++++++++++++------ drivers/gpu/drm/xe/display/xe_display.h | 8 +-- drivers/gpu/drm/xe/xe_pm.c | 8 +-- 3 files changed, 72 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 75736faf2a80..c93b753fc88e 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -308,22 +308,78 @@ static void xe_display_flush_cleanup_work(struct xe_device *xe) } } -/* TODO: System and runtime suspend/resume sequences will be sanitized as a follow-up. */ +/* TODO: Sanitize D3Cold bringing it to a minimal possible sequence */ +static void xe_display_to_d3cold(struct xe_device *xe) +{ + struct intel_display *display = &xe->display; + + /* + * We do a lot of poking in a lot of registers, make sure they work + * properly. + */ + intel_power_domains_disable(xe); + intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true); + + xe_display_flush_cleanup_work(xe); + + intel_dp_mst_suspend(xe); + + intel_hpd_cancel_work(xe); + + intel_opregion_suspend(display, PCI_D3cold); + + intel_dmc_suspend(xe); +} + +static void xe_display_from_d3cold(struct xe_device *xe) +{ + struct intel_display *display = &xe->display; + + intel_dmc_resume(xe); + + if (has_display(xe)) + drm_mode_config_reset(&xe->drm); + + intel_display_driver_init_hw(xe); + intel_hpd_init(xe); + + /* MST sideband requires HPD interrupts enabled */ + intel_dp_mst_resume(xe); + + intel_opregion_resume(display); + + intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_RUNNING, false); + + intel_power_domains_enable(xe); +} + void xe_display_pm_runtime_suspend(struct xe_device *xe) { if (!xe->info.probe_display) return; if (xe->d3cold.allowed) - xe_display_pm_suspend(xe, true); + xe_display_to_d3cold(xe); intel_hpd_poll_enable(xe); } -void xe_display_pm_suspend(struct xe_device *xe, bool runtime) +void xe_display_pm_runtime_resume(struct xe_device *xe) +{ + if (!xe->info.probe_display) + return; + + intel_hpd_poll_disable(xe); + + if (xe->d3cold.allowed) + xe_display_from_d3cold(xe); +} + +void xe_display_pm_suspend(struct xe_device *xe) { struct intel_display *display = &xe->display; bool s2idle = suspend_to_idle(); + if (!xe->info.probe_display) return; @@ -333,7 +389,7 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime) */ intel_power_domains_disable(xe); intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true); - if (!runtime && has_display(xe)) { + if (has_display(xe)) { drm_kms_helper_poll_disable(&xe->drm); intel_display_driver_disable_user_access(xe); intel_display_driver_suspend(xe); @@ -345,7 +401,7 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime) intel_hpd_cancel_work(xe); - if (!runtime && has_display(xe)) { + if (has_display(xe)) { intel_display_driver_suspend_access(xe); intel_encoder_suspend_all(&xe->display); } @@ -366,17 +422,6 @@ void xe_display_pm_suspend_late(struct xe_device *xe) intel_display_power_suspend_late(xe); } -void xe_display_pm_runtime_resume(struct xe_device *xe) -{ - if (!xe->info.probe_display) - return; - - intel_hpd_poll_disable(xe); - - if (xe->d3cold.allowed) - xe_display_pm_resume(xe, true); -} - void xe_display_pm_resume_early(struct xe_device *xe) { if (!xe->info.probe_display) @@ -387,7 +432,7 @@ void xe_display_pm_resume_early(struct xe_device *xe) intel_power_domains_resume(xe); } -void xe_display_pm_resume(struct xe_device *xe, bool runtime) +void xe_display_pm_resume(struct xe_device *xe) { struct intel_display *display = &xe->display; @@ -402,12 +447,12 @@ void xe_display_pm_resume(struct xe_device *xe, bool runtime) intel_display_driver_init_hw(xe); intel_hpd_init(xe); - if (!runtime && has_display(xe)) + if (has_display(xe)) intel_display_driver_resume_access(xe); /* MST sideband requires HPD interrupts enabled */ intel_dp_mst_resume(xe); - if (!runtime && has_display(xe)) { + if (has_display(xe)) { intel_display_driver_resume(xe); drm_kms_helper_poll_enable(&xe->drm); intel_display_driver_enable_user_access(xe); diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h index 53d727fd792b..bed55fd26f30 100644 --- a/drivers/gpu/drm/xe/display/xe_display.h +++ b/drivers/gpu/drm/xe/display/xe_display.h @@ -34,10 +34,10 @@ void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir); 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, bool runtime); +void xe_display_pm_suspend(struct xe_device *xe); void xe_display_pm_suspend_late(struct xe_device *xe); void xe_display_pm_resume_early(struct xe_device *xe); -void xe_display_pm_resume(struct xe_device *xe, bool runtime); +void xe_display_pm_resume(struct xe_device *xe); void xe_display_pm_runtime_suspend(struct xe_device *xe); void xe_display_pm_runtime_resume(struct xe_device *xe); @@ -65,10 +65,10 @@ static inline void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir) 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, bool runtime) {} +static inline void xe_display_pm_suspend(struct xe_device *xe) {} static inline void xe_display_pm_suspend_late(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, bool runtime) {} +static inline void xe_display_pm_resume(struct xe_device *xe) {} static inline void xe_display_pm_runtime_suspend(struct xe_device *xe) {} static inline void xe_display_pm_runtime_resume(struct xe_device *xe) {} diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c index 2600c936527e..da68cd689a96 100644 --- a/drivers/gpu/drm/xe/xe_pm.c +++ b/drivers/gpu/drm/xe/xe_pm.c @@ -116,7 +116,7 @@ int xe_pm_suspend(struct xe_device *xe) for_each_gt(gt, xe, id) xe_gt_suspend_prepare(gt); - xe_display_pm_suspend(xe, false); + xe_display_pm_suspend(xe); /* FIXME: Super racey... */ err = xe_bo_evict_all(xe); @@ -126,7 +126,7 @@ int xe_pm_suspend(struct xe_device *xe) for_each_gt(gt, xe, id) { err = xe_gt_suspend(gt); if (err) { - xe_display_pm_resume(xe, false); + xe_display_pm_resume(xe); goto err; } } @@ -180,7 +180,7 @@ int xe_pm_resume(struct xe_device *xe) for_each_gt(gt, xe, id) xe_gt_resume(gt); - xe_display_pm_resume(xe, false); + xe_display_pm_resume(xe); err = xe_bo_restore_user(xe); if (err) @@ -409,7 +409,7 @@ int xe_pm_runtime_suspend(struct xe_device *xe) xe_display_pm_suspend_late(xe); out: if (err) - xe_display_pm_resume(xe, true); + xe_display_pm_runtime_resume(xe); xe_rpm_lockmap_release(xe); xe_pm_write_callback_task(xe, NULL); return err; From patchwork Tue Sep 3 22:38:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivi, Rodrigo" X-Patchwork-Id: 13789481 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 27BA3CD37B6 for ; Tue, 3 Sep 2024 22:38:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8EF1C10E60A; Tue, 3 Sep 2024 22:38:22 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Q7pjlhrG"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id A27F210E60A; Tue, 3 Sep 2024 22:38:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725403102; x=1756939102; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=WbQJSW1tnsfoXm3OUtNMp4D7sagX4y9dkKOLnrFnRYU=; b=Q7pjlhrGu/vMyRUPiJjOgmG67E5Dm/ckQohkND0hZ4bw0asLkQ6UO//P XqQVE/0sAQrkELICNP5HgK8eKUmVt+vy2cxQUJR46zChmusnJiUvwCgOt W5Ygmnes8NKsS6yp/AFPCHr30ey409pW9aHDAyJn7BBpLyBIuBQi89NsG N2wXQiEgRekru/M5bEQJIJGQNd4DMmM1X4jYkD0qqd8sb/WWzpAJY/L8Y CwYzzgt4aytl5KYni/tw36hh37UvpqD/C7PNG7JP3eHYzAr5+kZ+sCacF 64KZKbyox81PxJ5zS5PJPwS55kLJ3+kaT/vPS5dEA+lpFCXshm9lPI8gR A==; X-CSE-ConnectionGUID: moUNiD4aRxeI3lIA7GyU7g== X-CSE-MsgGUID: PfroZ1skRFWuOdkE+oarPA== X-IronPort-AV: E=McAfee;i="6700,10204,11184"; a="35422419" X-IronPort-AV: E=Sophos;i="6.10,200,1719903600"; d="scan'208";a="35422419" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 15:38:21 -0700 X-CSE-ConnectionGUID: 2eb0T2CoQb6hoj9L7ebQ7A== X-CSE-MsgGUID: 9WH7cHeIQFa0v200lcHHfA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,200,1719903600"; d="scan'208";a="65421980" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orviesa006.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 03 Sep 2024 15:38:21 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) 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, 3 Sep 2024 15:38:20 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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, 3 Sep 2024 15:38:20 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) 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, 3 Sep 2024 15:38:20 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) 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, 3 Sep 2024 15:38:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WZ3XEcX22Faw9yOTrh+55iqmvD2kEqkuQ81BSd62VYNQyProL9G8nNLdXnLE4Ur1g0tDVgIOyfV10qjIKAivJ5VJO0xVjSzP6IQpoQ6HeC7CS4NIGEPsn+lPuUwqGPezeo25RB2x38/NKeQP2k3GlpxofgwpK2/8LwLkZKRJBey0/KI3zfug/tKcONNXk3u19C1OosPfNon5PUTRiUf2MDHy2ScDW5seZPu0wi0jKMePU2N6uCt+lbfGwLwFRHKTZ311IfFR0A68xX+lje3PcJd8K1QKOzmjlv4CmIFBDZSmmr3MzsNosjkEKJJlpk7ich9Rm3S/3L3H0Ch6Obxjgg== 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=4adDlV+g3RrJJ8v4+5lXRU+NWekL6upgc3rJzBKLoVk=; b=He9cKPtNxIJpaxmRq+WdcSNa/wFth+FO0D9/7CzEL/PoQpA56wg6kc6w6Vk080WekLiEykf6u+PFDlpp2aEfCd9M9/z2Zxoma0rKXI+0uKMzWXSlaRkcOI7Bf8PUcxiWq/vC3IBFL5ZHWCwp4SxRlGs30B0AS1LK2kKNJzT8RbWEcFZQKgUWyJf8bUlt9Pseq5DbrDJeMVzWGUieL2ijXdDap+VIFUXCPgs21rYN4mPDtxk90T94+N3isw8IVCmlzIjH0PRibumI8XKls/tJByw5NAgFAmdvnxQBL8nKB/V63Jr/toXCxaCNK2uvUhNXYaq5kAIg4sxLhaT+c0zxJg== 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 PH8PR11MB8259.namprd11.prod.outlook.com (2603:10b6:510:1c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.25; Tue, 3 Sep 2024 22:38:15 +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.7918.024; Tue, 3 Sep 2024 22:38:15 +0000 From: Rodrigo Vivi To: , CC: Rodrigo Vivi , Jani Nikula Subject: [PATCH 2/4] drm/xe/display: Remove i915_drv.h include Date: Tue, 3 Sep 2024 18:38:01 -0400 Message-ID: <20240903223803.380711-3-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240903223803.380711-1-rodrigo.vivi@intel.com> References: <20240903223803.380711-1-rodrigo.vivi@intel.com> X-ClientProxiedBy: MW4PR03CA0214.namprd03.prod.outlook.com (2603:10b6:303:b9::9) To BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB2854:EE_|PH8PR11MB8259:EE_ X-MS-Office365-Filtering-Correlation-Id: e9afe5b4-4d15-4a7f-8c9c-08dccc69196c 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|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: alBSQtUIzkupXCMzN690RwUEfF/7AVZ2k3/BdvoozDP4JLuNMyaevc9mbox61K+uFyFpumZF6I+DqqRsIoqwQlAb47XQdhA0Q7lH4MuvhrL3IyVSKi2Tb0wbGOBmhy4hUTX3UZ67cqbTpoMcbAD7KTJdsiIR1Q3liOQ8tpO1fbhmkL2J3PnoWOc/gO/4MAd+qSF4F2A+stIDno56TwjDQYLNej/KLnAc1p5N+/nTCNEDu7FbfupjKAFWk9/evMho2N0dxNYaDHl7Fcmd++ba+221vlBfQL9rvTSCtm7H2yHKrp8eKhVNUnFKJdn21ThPeavRRS1uTm47Ghr5BnaXVs+VxpEqYtoEaeuVNSSiADN5z7GJo8F8LF48RU3qcgZ7qIWQWqmm9XlmnH2hgYuG1Ij2Szd1Lhoq9xhZFWWh2vJKOaUUV8bbrsufWXSPVhU5p3HlmzGh2VHFBwUQKw5txXIhB76Po81QoteOa4czioawzEAlEC8z5d+pVSlCoj/EN8Huk8UXJVTIvVZ3iZLNPA+/SAadLd9ANvQy9P7GLFbpW87zSZa8n4rYglIgbU8PIW55OagqLlZ9MUZvsqDyN0VrwPj+JOUeu6EWmPvz+CimOSSU4hYnHOO5tyaNykQ+23kVctwU9HjQoP76NXNrCM+udFxgGZ9JEvicvthrnvsD/nXVm0V68wuJkHQKvXRP2bWCiJeMx+jveqREF8YwV7fTRwTqWEipoN47R1vDVOjGjIM6Wt2ALQySr3gGH//Ic5j1fbfGbWIWehsZkLjsBgIyr2EWM5aEEaTWX2EyLleOLT81BJfQPrQ3xT6jivq5ouBLJBaGRvSXxFMCrUgipl4ru9aDWidBz08OV/rpgh41T/LwNuNx20oyPyUtKpRqpBo6Li6ciT3y/YPg05mQLJhX0zfLnLW5L9MFMab2BpSawpqZid8OQQlLObJUJdfcZMet7/vxMerwcBI1YhIHF/dlqyTlyYze3rB38LkxADt+UiZRxgWWFfTNbseHSk9i0JfvGCY8QXD1k+z+yJdmiJt+zEcctmF/eGAZtrljzw8Hax8BGKsf89k+lrdHz+cBKkoyQ+DACBDR1vsh8oYO+CgLXC9fhTnlFG6R+lVVYZEClRyvts5kNK/81wqLpLWCIDzGXlOwlCvLJjCZfyiwJftZj+HkuSHTHtm+8onOecjZGCkDn7FAKEkFHm02RqBWjmyGpmLc3yqiuuFj244i3gk/TuGz7GBMO3nhO/Eg6vJdL8oaift0yN0TXPmyT31EQ+bFEgnvm41/4FNV1bxNrvEe39q/MA9L0qBUwbnktFRxSizCjQ6fX+LxZ4u+6mX5ZGakt29UPM2ous8tj0GIGg== 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)(1800799024)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7lC9pSobYIOAEoR9B0yQEz9n2DGcxO09dYw+/keF7kAysPndl7rSga6bZaS0E3mBpyrN4bwmCR4S20ZQ4aPiimGd0jO3pLStp8U4kqTiECLSNihSdRq6weTsNUnkb+xOIDlKepkzhnlrJ79Z6Vp9gt44Ydn0Z4hgeLfi4KCx4toOdcZ98GrgdvvLlHs3enQHhiLeg+Zj4D0Oy/DmoZK0aywr8OmyWOlrjw5ZnZMzwVxODbk6qexEXpvcsx76cMD2QWd2P4Jmp/x1OCaJkcdSqKroT5JgHg146d8tRIMSbrISxWN7hQzPeytnNl7gDi5Os4vuNvOYLeHU8ob2PzMY6kbaPXKBq6cABvTQKWvkkbBc3n+4gLIRpwqp5sr4AY+YLYf3GA6qfFcq7gKTMDEs/RELkNAwhSC1sQLl8XLGPtjsPAs8F8pEm5V8MHWYOhykpcmo+1qLsMH2CVUVpw8gri5ch40seKuZq1i0skA8+xWmJtiGH/QdLKL40Kv+Jt2JFYwKnVMFfuKB3oXC2vedSbGPSRNS+GVQ186cM0dfCdY1OakiGpXosuTj2/SE7wpcclQ6/T2Hkjw8rnqs2TCvBd8H4jiFvVrwf2S1kLJYYVeXWkR+NfdZ2ughlndSKxSBRxMMAJYt9j4JcmIRKE/uV8bZg0fWCTffjw8XNtiiLGNAwehhMa61dgEN31acpjWJSgRVAbKEkRgGbfm/JvZXzcVGXIC3fAdKSIktFQ+NT/tmK0LuM9wnlru1FmJqh53JZOwRLK1oEFkVoxJPGvYCuQaQDnwHYK/IkW07hrGn1D8uy3ma6uquYKSW0t0Zdz1EoJicPDgbMckJC0gwHsDP5leinGhUDxYcrSsw7H7Qdmks7WJjV3wDibFfSpYDYKrSV7qZ0v1LE3CK4btdoEIpDkOLpBMqENuu9bywZc+ah/ZycjHoj1H6ezWdUDn9Fvjro0Yv9a1kpJ+sC47CiN2m6l7anX0DGT+NooH6E+EDW2KEdekuxRP5OjuJsMGZlSA5TzrwUevbpikk+YxbFc5KF73VWlJ2zACxFgmwvi8NvNPIJb2TRNVK/OVxbpJ0QoNb+JiIFOwSy5tbj2mFKVtjt3s9oGXiVz0a+ue7YcZwOpIpZPDBv6lAp+G33u3zNEldQCMo3IGzk35oDDVWh3hXv5ZX1vuhicSBc1FLEu7C0qZRa0N2EUOiLjiW2s18v899DTfSZJZp/q8OaBy8lTErzjxpVOXSB/OMPE8A2O2rYwaRSvKNYSvKx/Vb0qHJXD1DuoTtwNKTadHlAA7OSvGeKVWbvnM66/CSaufteQr/FJhMjjpZX/Xs9M9N4WbMycmo58aj6gtT9UehspTOFbqtzxJ2Ch+ijA0LKWM4IIfR+ZKDv9llL66hgINaOSIUJy6DrdEJnJvlub6mcHRfgS0HD/r3Mrx/SH18ezXqlQnZGMPPNaH8zXceIedseHdwmPRFmJ7w5fdWLVbsZ/Jm7OtT0NPdSFab6T93yS4G6cRBFVHfuD0oVbheUSxJDWPHgQ+TRZkfjWBCSARJ5HcPYy09RLXlYUBB9vALSa2nZTxQq/7HYaIDAvcuh4ao8rFbnqCSd0pfAH5SfEmBPFfDN23R6w== X-MS-Exchange-CrossTenant-Network-Message-Id: e9afe5b4-4d15-4a7f-8c9c-08dccc69196c X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2854.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2024 22:38:15.1675 (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: a+1gpAHdBqF09rBC6bfMl4B4esOIqsNxa7BaRUb6nA+yBBO5Tc1WRB4MbrBTBxPk8OgIWpMdngFZFJoXTqGdiw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8259 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" Change HAS_DISPLAY towards intel_display and remove one of the last includes of i915_drv.h in Xe. Cc: Jani Nikula Signed-off-by: Rodrigo Vivi Reviewed-by: Jani Nikula --- drivers/gpu/drm/xe/display/xe_display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index c93b753fc88e..65331bbbc068 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -13,7 +13,6 @@ #include #include "soc/intel_dram.h" -#include "i915_drv.h" /* FIXME: HAS_DISPLAY() depends on this */ #include "intel_acpi.h" #include "intel_audio.h" #include "intel_bw.h" @@ -34,7 +33,7 @@ static bool has_display(struct xe_device *xe) { - return HAS_DISPLAY(xe); + return HAS_DISPLAY(&xe->display); } /** From patchwork Tue Sep 3 22:38:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivi, Rodrigo" X-Patchwork-Id: 13789482 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 8988FCD37B8 for ; Tue, 3 Sep 2024 22:38:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE2B310E610; Tue, 3 Sep 2024 22:38:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="aNj5W9bf"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id A58F010E60E; Tue, 3 Sep 2024 22:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725403103; x=1756939103; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=MLnIEou5N1bzifst4SMUrCp/Q/XKR+HKc5DWgUSip6Q=; b=aNj5W9bfpbI65+8pIdEq6bTeBoB4sazgqBlg70lXDRz9FaFWLOuRUpKS F8HPLUygYp0DEHJucHZkPt76ncoB9Z1RnaRJykdWZrdROjrON6y48imrX HbgpTKQ9QWsGfBbAhkGLqeRf8jz6lHzu0Ah9WbJdJvWDlQKcoXIFJ0iXq rVlYcxmgYhDawjpCF/CZpoq0MrXGZN0jL4pPM1//BDSNBtJ57cF5MbBO7 EYSnfZ9aurzFNaz6i5Zdf9jht4UuPOc1YGXi9OybG1925mw41t2UpMIId gIXTA9jpw4GkiDso00lPUOr9iG7/E+tLxnK2BnpAzhe2kg750dTRM3+sc Q==; X-CSE-ConnectionGUID: C6AZxcMaSVeDKkYP9cRXVA== X-CSE-MsgGUID: tczR1z1kRZORQXyyITOYTw== X-IronPort-AV: E=McAfee;i="6700,10204,11184"; a="23910665" X-IronPort-AV: E=Sophos;i="6.10,200,1719903600"; d="scan'208";a="23910665" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 15:38:22 -0700 X-CSE-ConnectionGUID: 3s2lcnOtSwyG9Cla4QDXBA== X-CSE-MsgGUID: jf54vRCAS2m+TjwBoxmY1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,200,1719903600"; d="scan'208";a="65778451" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orviesa008.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 03 Sep 2024 15:38:22 -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, 3 Sep 2024 15:38:21 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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, 3 Sep 2024 15:38:21 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) 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, 3 Sep 2024 15:38:21 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) 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, 3 Sep 2024 15:38:20 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RVs3zA/21uta0keU9gxrhBRlqXYU7ZgPcKAFO21x8fIcQ7EvbhKlkJFdD/JXeqyRvQExU8hien8R3hm0ySpl7oXlNGSbeAl4frezWNdUYPq5BzOcZ9HcfeO4JG8OBA3xqWgtfbWWi3IyCwCzhPV1JnmECt33R0jnOGJItxJ4uVHZ2eElbrZYoDtZlGLaJV9o6iwPgdUGZJzIoD7Nf+lfJ7QmQWQY2lj5CoV9fc7xglWJeUThAPJP0Q0OWoSAhNUIcFU9ORfxHyxtzpsLx9UdPLK8rRz7/7oqRqaKhTNTluJweW+Q8Nqx2CniIPNXxV+FsjYGOHzEPxW1cMogsb/RcA== 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=ItpNrfo/HoKCuimaCwXYYcaH9A1frjPr4SStbhh97lU=; b=n/kJZv8NY4CsqyoNuvs1LfxrZ0pDsnp0fOLcagPlaZF3UrRae42SiZcQff40qMTc4T6Q87b0Tsv+60OBshhaS8NnDvnp6WNlzN3QgxyNGSi9clE4+7lqAbJtLgqXq8oqR3CIPIU2voTYceXlJm1zarInoI3FKciKAIs/w7I34r9kBeSd00twk3UpAXJk05cqJG5Y0nrDiRrirt/GRPVR5/LdBbZzapaZJeYZd2TtrUdd34ReQ7o6VOn2CpZijs+BDMqb2mVN4+PjFAr5z3yDUM6Q5jjr9GeWlYmSt4sGTpctVR+O2g/WQCIASZnFl6tDjUD0gZ4RZrjOh/RPYiKAzg== 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 PH8PR11MB8259.namprd11.prod.outlook.com (2603:10b6:510:1c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.25; Tue, 3 Sep 2024 22:38:18 +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.7918.024; Tue, 3 Sep 2024 22:38:18 +0000 From: Rodrigo Vivi To: , CC: Rodrigo Vivi , Jani Nikula , Maarten Lankhorst , Lucas De Marchi Subject: [PATCH 3/4] drm/xe/display: Kill useless has_display Date: Tue, 3 Sep 2024 18:38:02 -0400 Message-ID: <20240903223803.380711-4-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240903223803.380711-1-rodrigo.vivi@intel.com> References: <20240903223803.380711-1-rodrigo.vivi@intel.com> X-ClientProxiedBy: MW4PR03CA0229.namprd03.prod.outlook.com (2603:10b6:303:b9::24) To BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB2854:EE_|PH8PR11MB8259:EE_ X-MS-Office365-Filtering-Correlation-Id: ec03aaef-32a6-450f-878c-08dccc691b3d 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|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: fAGwzVNj2xIcSFFq4cmB68iY3eF+W02LD+lCjAJuFr3kbK3fuNWX/offmXuRxWwUxRrkxMUlWEt/hjNmOVIUeAdGM/6Jx2HRMdEDs3M1jnkrAO9yvie1iapjz2MHBnNWTPQMQRWYipYmQ3D/DHRit1Ml1kZiRt9OKDIPoafYVAPAvDznNP6h9WE1jZP7apQn9kqkYZZHR0+aXzfMXP75+jaO5JKULthRGZ9pjgWruZjyux3f+ItFtWzaosJEgG6OWEwk4bHr9tZwPQeQrdArwjgyFC144cDlprpfOVgYwn7HLupZiClTh7V2SvxWU1IKzTy/r9RRswurF1mBqt4Vz++zqJynmSHmF4r+3ftyXuoIDiYFv9TWCqHkQaPE6vuEVR2e3OiqXLzYysm4ms38eLFX+WwZtVuB2uT3XCsAsDV1F2YbGevztGMp56FI1c/AOSvhms/9DEOtBwCuW5+BGOAPtFWe1ksVLC2FqvweNSaiVDInwqwkBIfwiu5UgtsfG1kao165RccWk39hbjC1Pg6neFhFPcsnCesYXl9nuW/P0YTCf+CnNvtFsYD877w+4+kGIbOxZnpL4Pa1YezyfF5SnT+CZiDNymbSrZHsLL70SUmYrVuRnR2MkjBhIOYuSyU7VY+3cyKDr5UwgrPgsX8+NlCAyBow6DAkJcHYFv7MZf7v3H7FxWaXVUaPXbNkCpqMyNJ4/yXFz3scfMtVrX9ZrWGUfoV5vDozCpilqI/CYbfav4VFhpxYqlytg8T8z/I+1fQCZLvVe89gKH1bv/IkDXQQMWNI9qpgb7t5xyyJH5TEI7oEhXRilumGYs42wxy3I2VeSimPO6k2XP1vivrhvI6SQlXWb9YuHU9pACs7jDGl2OG+H0Iso+o2R/1J654KExJWluDjQ+0S6GgECw9kF5tdpkq1FMSQuLJ7BlGdkHS4cPPyVfsfsx62LtaIxmt8w92BG8MLZG8Ok0Kkte35Z/tSFB/y+0T9VDe27NKpo+8HjKrR23rFIANGNg+dg+p/rb9R9fjVNXNlvYFdlGKRFidQQtVm0P7rUugnIg1f3l/7n7R2aa7mTVNjsgb2Sj7rupA+gRn0Ib00S07d1odkdn9KGWFaVjbJAb4PhNO9D7Hn2ewmi09FJ/4i09kqTe+axUvWED0iF6c7fOaKds92fx+9Duy9rPGkDgceqKXj2T0TECx0n2dmdbqr3UNy71P/pvCwy1AaY7llKrerVh5Ct8i0j7v3+Vve9LGxFpqGIys7c6K6ZRoK9CyVjnhwKihlI5c+3YGLLGvaadWe27Gn+4q7705muAAC/vRcePtd64XvbjxtTcSw8fKJ18eo4ctehuNO+/gRoTWhCeUnPA== 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)(1800799024)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PCXQl4X4qApf5DMeN0wyQjbARCUZLHG+3E5gSPG76KoVcY+mp9KKAG9K5DfSnQwLZkNuDDqVq7P7jMvbJFfykx6jjvm0YCNbCIPGzlI7WdTS4FDXl9Lr4HM6kKG3MW1ljQZwZCEE2Vv33a1zpXdQPJBhk0MTTVRgX5yKaqRIGBoZER3sY4uupG4kzpV/0Hl1chV1zWHRGue/1GFQEOeoeJsgsXrF73Uv6ckArOxmJ+MphQoZLlC78UKRkJwwWUy+AIrQ4OBEZOdSW3KWun+tOAv6wKhatbwHEwVCoQYxntfYUg53eFiFQRjW01H3Zb/NpznTmJr2qqOcG+8vdCjfFmDb9RdzSkGdObC7IqNZvppKds62OoKK52MadRlM1FiKixra4utN5sWab7mBcS9s5RhARSuKdIzjcE8slXVJ8o5zoVHkQXZqgqUoCmfYDEFp0YNus1NpOwBUF50G2aKoMP2Q9uN0fejQ9zbF0drjG7e15F8dc68INxkQPNKMKOArPkJPPiOHfT150EIe+vSE6/gCqWrG6GAXn9POsIbtoSU0MPzL76h5hacn5WPt/dzq2oczqbzjK76FX8H+4/9wXfY3e9BMdvOygyo24i4ifDNEzrHa5W07DRtGbaj30kaw8jxpsuCzKKsY0ts36DI2j+CyseYz5HJ7TrG+BPknxnNNsvxxmVWi9BylASzDSgE0BF09or9rbbJHzTgxHkaTDnigMja2aFQyzNMvJRCwvHuK4VoWY1nHCLfvGwNAUNPuJOJIj0fLHN8X64lQuNG6+ohwbuQVp7RKdOYaCLyGRyIv879NWplgg+x7HfglcoVKtVTAU8VDIVqcjWXH8gEAk+vFNfGDQzf6E3M3wCGjW2fF+nkVnBGMqmehTMxer0UXLTXLlmPTTAzLOWuq40lADg07a9KjQxRzjhlSjWOdWY9aKURugBF/zPJ/x9UqHMzQffyVQs4LLikxv+n6GnXVATi20ECt/gJsBD0tqSMsshchGR3FulRok86JPX16LlV2raUuced0HS5ElWsjmnV3TaEHxttPp/+kzHbHprpAsIcnknEPvZa1FaPl+D5/US2Z6Lyr6+zfZuYQFZKO6V1q9K+Qa3Lip8XmHnb7vQ4PcvX6ZggwHPnhhXVIxwzVlJgp1iRnG5bSD2Dk1bkb7K4O/HSlrlNjVUyyX6nTNWJ4/arwSFWJnSTESYle8dh7ZbOb+iDnuBIA9fApu3D0aFSf0TCEeoBHhzWgtWQtKlPEupke0rfttyL6Qj3+sUHD40dYXyEYh+roRrB9ieGFXgrhv17iPVH//MXSYHmqWoD9otkMC1GbacbRRRFlSPVoOLhB13YB1mu2ZicSXAtEGR8q5QPzQUghsK+JNG/o5N/IQR+NqQTyLhC5a2Fk5avsg2oGUXzjyoOlOS5Q3X7qAI7dUqqE0gunKGTH+tt+CQ7HgGVLzcpJk5WSfserMecT6mhS1Uz0LRd8FVqcURJlMOvOTgmfueiWFBfUuigyVA+M85HCPM1xaUCiBkwXZQewFSYhKI85gIn1UA8wPoOhGJxbUgpu1audLopSvhAFXy4CSnNUbD88Quv1jo/wlDE1pp36KukbFgs9KRqvF8Gsp34CLA== X-MS-Exchange-CrossTenant-Network-Message-Id: ec03aaef-32a6-450f-878c-08dccc691b3d X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2854.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2024 22:38:18.1935 (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: +fn2EhFSYaIHwZYX5njuB/kTd1KmOkM6RM5PU7X8FhLOft3k+ULvJ6m4PqLyTrfXUIJPNmVONBl3Nh5wZH/T+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8259 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" When HAS_DISPLAY is false, info.probe_display is set to false. Hence, all these calls to has_display() are bogus. With only one place left, use the main macro now and entirely kill has_display() local helper. Cc: Jani Nikula Cc: Maarten Lankhorst Cc: Lucas De Marchi Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/display/xe_display.c | 43 ++++++++----------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 65331bbbc068..daf9b9baa88a 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -29,13 +29,6 @@ #include "intel_opregion.h" #include "xe_module.h" -/* Xe device functions */ - -static bool has_display(struct xe_device *xe) -{ - return HAS_DISPLAY(&xe->display); -} - /** * xe_display_driver_probe_defer - Detect if we need to wait for other drivers * early on @@ -336,8 +329,7 @@ static void xe_display_from_d3cold(struct xe_device *xe) intel_dmc_resume(xe); - if (has_display(xe)) - drm_mode_config_reset(&xe->drm); + drm_mode_config_reset(&xe->drm); intel_display_driver_init_hw(xe); intel_hpd_init(xe); @@ -388,11 +380,10 @@ void xe_display_pm_suspend(struct xe_device *xe) */ 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); - intel_display_driver_suspend(xe); - } + + drm_kms_helper_poll_disable(&xe->drm); + intel_display_driver_disable_user_access(xe); + intel_display_driver_suspend(xe); xe_display_flush_cleanup_work(xe); @@ -400,10 +391,8 @@ void xe_display_pm_suspend(struct xe_device *xe) intel_hpd_cancel_work(xe); - if (has_display(xe)) { - intel_display_driver_suspend_access(xe); - intel_encoder_suspend_all(&xe->display); - } + intel_display_driver_suspend_access(xe); + intel_encoder_suspend_all(&xe->display); intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold); @@ -440,23 +429,19 @@ void xe_display_pm_resume(struct xe_device *xe) intel_dmc_resume(xe); - if (has_display(xe)) - drm_mode_config_reset(&xe->drm); + drm_mode_config_reset(&xe->drm); intel_display_driver_init_hw(xe); intel_hpd_init(xe); - if (has_display(xe)) - intel_display_driver_resume_access(xe); + intel_display_driver_resume_access(xe); /* MST sideband requires HPD interrupts enabled */ intel_dp_mst_resume(xe); - if (has_display(xe)) { - intel_display_driver_resume(xe); - drm_kms_helper_poll_enable(&xe->drm); - intel_display_driver_enable_user_access(xe); - intel_hpd_poll_disable(xe); - } + intel_display_driver_resume(xe); + drm_kms_helper_poll_enable(&xe->drm); + intel_display_driver_enable_user_access(xe); + intel_hpd_poll_disable(xe); intel_opregion_resume(display); @@ -485,7 +470,7 @@ int xe_display_probe(struct xe_device *xe) if (err) return err; - if (has_display(xe)) + if (HAS_DISPLAY(&xe->display)) return 0; no_display: From patchwork Tue Sep 3 22:38:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vivi, Rodrigo" X-Patchwork-Id: 13789483 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 7A7E2CD37B1 for ; Tue, 3 Sep 2024 22:38:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D35D10E613; Tue, 3 Sep 2024 22:38:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="cF+Rv/xi"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 068A710E613; Tue, 3 Sep 2024 22:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725403109; x=1756939109; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=U3PISgGOHb4+S7EnfCVZGM1Ro92ABtH5hW3Ux3Vw07g=; b=cF+Rv/xiABPnGa4oJbf3QW9EaPwxtyOFiXo0Yudgi4XOOXkKugBdXy20 vYBWwVjlpw+MC1GiEYc359CGCK1BjU9LxzaNN/d04LVfBSxfRuhLakP1R rckfZpTHkZjAJg38kcNNp+rgSd1KCumvS0cj10hkKTzN61RNhVRzb/wiS N6RvbTQSLY8Yv329k4vG7OdNCam3km47slbrU1ywAi4MVj9De5UVeqQOH SvYXsJqTW6Oq+b0JeNPKptdOgugA336EHo37KFA/3hMSIt93zIoA5q9Ku 1jDd5vOhWEbUQCkZwNCdBLj5nVlhT0utgsfX3q8pnxcWbMdgCXSzyFRqm w==; X-CSE-ConnectionGUID: HBdDvUfmTdGOwAzd/u0srA== X-CSE-MsgGUID: P7OxhzVNSD++adKCs1ON8w== X-IronPort-AV: E=McAfee;i="6700,10204,11184"; a="41506813" X-IronPort-AV: E=Sophos;i="6.10,200,1719903600"; d="scan'208";a="41506813" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 15:38:28 -0700 X-CSE-ConnectionGUID: h10A+yUOQbm1Skuo8xRIag== X-CSE-MsgGUID: pP/IpkBoRYSiMZJzFpD1pw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,200,1719903600"; d="scan'208";a="69881681" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 03 Sep 2024 15:38:29 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 3 Sep 2024 15:38:28 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx603.amr.corp.intel.com (10.22.229.16) 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, 3 Sep 2024 15:38:28 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.101) 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, 3 Sep 2024 15:38:28 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zWlMinnFSqI053vOCNx9PNzNsJY35cFHtUZgEDfpmELVmKI/rziKRqs+hvhF57VdYwPwVCnyahHcv0gEEd+twkGk8VA/5+v8FznzNHkuVqtZtTrOswxVr2mw6oSl4NnzFUJEXcOBO2rN8CF4NsXdn4VmItkKA3f927rFcl+Qt4unekgq/CtSYPPYlb98/Kqqs5/w5XJoX5E/US/+st/k18Wt4xJ7arkH+FxmtTRa149YutCefzkkNhSRoFKyRte0kXVaz1rTA4kpvv5qwES+KLkrsPd4Hw9kIUaPDKdAOGqN+pTaeScBTUDXuV6RlNa52RVP2UF6UbPvYqxCiiRuFw== 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=sU/qvfFL8t1/EKIqDvSihFi6oiTSARe6Y9aMvKvrE2o=; b=WNh00qNjO2y402lThrZ+Q5Tc8XDwv+hv8Wd6Wp4BY6NaOlhYq/o8RsrmImHrzPbJLq7UK2zUvqCJ+hWzTv6eXn8SJuz05QTlor3NSehSNXOVXXnVkFI+rgpe3FDFE0QrtguP+zJX3qubCVS8QXnd3poY7DBLhjRzp25f2kD67g4Qa0O1mRFMRrUp0OMWQ/5Nb/TXEa40Cxx1lUmMnqHseS+Y30URAvk88VGCwgrh1jJDHtLStMUPZhF6f6wzdv9Dh+YGRD2nBmNurVwWwMZDZXVrAu7dJL17zYGicDtj5bSPzZDVcw+/zPbxKc6VhO0+6FfNLfvWMLiyi+3pTkhVGQ== 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 PH8PR11MB8259.namprd11.prod.outlook.com (2603:10b6:510:1c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.25; Tue, 3 Sep 2024 22:38:21 +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.7918.024; Tue, 3 Sep 2024 22:38:21 +0000 From: Rodrigo Vivi To: , CC: Rodrigo Vivi , Imre Deak Subject: [PATCH 4/4] drm/xe/display: Reduce and streamline d3cold display sequence Date: Tue, 3 Sep 2024 18:38:03 -0400 Message-ID: <20240903223803.380711-5-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240903223803.380711-1-rodrigo.vivi@intel.com> References: <20240903223803.380711-1-rodrigo.vivi@intel.com> X-ClientProxiedBy: MW4PR03CA0258.namprd03.prod.outlook.com (2603:10b6:303:b4::23) To BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB2854:EE_|PH8PR11MB8259:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b119696-e821-4d2d-5dbd-08dccc691cca 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|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: eKqsjejzuS02FYTJ9mK7QBbaeW/aMy9bT6QKIwGX7VnaGWzhmLUQdpFMn86ErUelwtdUFgpJKISUqIwoTSWXZPrw0bsLfoLerY/LX4rDOXyCepIXV3AxIBg5L7AhaTIuFrv8B2ZwjLaC8/qvPM1S99eyO5r/FdOLIR4PgadK6CLzg0XiLLNyTTJsez2Cm/NGuaeiM60uepTCN+thkSHtizF2Tg8G+88iXNkkhz6U6hZROQ/ulnabUi+nReQCJEnh6XYZ7cpNvVioNxWkpdVzFBw2thiuvoJToxusCO4cMdzqTmtSdmkBT6ncF1TdwD3nrOtMkPcgrmgRS/QALiKOtUZYzWWPohIzXcz9SEGIlo8s/mgYcvNi5wsmVOqLyveE7b7G5FSSgrs1cNFPy2CYkaVvuKiVa5x/Awl5kigQ1dWp7X9N6yFvVRbwZ9T7frXLuuD2hvch/rpW39AUXfTmY74b81dwP9MTHG2jm8CfcvWAj3olA8MIxE608RDuKyI5UG2wqjPqZTZRotstcccVJCDbsczh1o4Y+tJmxRMz84WSBrJ4Cg5cznvCCqmtfNKAt/pnSTU9PpbLhpOq3dKH7Qvg75DFLS8/KbLaAN8Sk61smD1lLBGxVAJUWOWPRmqKe2n3L0OlDHNCM956O5Abp9swSx5W7qWYxTsWoi9q2ILX2/e7pjowdXmxInNq/OwBX04i/ydeZIUDvrxN3USGHtfmASnYlwbq6FkUDtunS7e4ou0wU4c1oX9ylVzj5tuTSmIdxlaYRsTPwUho50UOy9I5GvgR+SRMk/LasUUT0eNkHv4qOwHmihfNOFtJYZD9w0DSdmTH/PBsJZVrYuTVaieX5SMLwa3uS45/RTj0p67bWDoCzlMl2bCfsR4nuhspzIO9k0sD819RSb31anoTlRgWDRfVdIKlDjUe6AxQN/UrWsDscGhJu3XpIqqZL4CbEmpDTvW56pWJApVZ8tYUw/gDQnOEkuMDBojJbQ+swpVNrAwXCcFBiK+yqjs7wObrlRlZcNu1r2nJRJgB5PlSQspqSiLyHcaWtlo/k+D/NuhNkChHW1tGwe46zKrTolCyoXQjaaCGGZiczIOVySpKp5NawppShONIWqQAonHAxn0j60GIWeW5pVH+vg32xoyD8lCwMQOUuL3c50BNJ2GgnO3F04A63TrZagOYxh2nECZEPEwcxgxJGrDVh85HvB5tBowt+pzHSIvzSDridLpz3HF7zs+FNb4PDfjbtAc7BpKK1qGiqAxduf2ZNoIjdHDvoKSrDDAc4iuplG8EmfLgsN/BkjUMb/MO89JCtIUoaPmq1JHYE4u1MfxrVkL3e0gpWIUHLgqrhDh1FWtYscnZ3Q== 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)(1800799024)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kJ7RFapKrAwUqiff2PjWkgDIuTMgysPlChL0byLRKaGaBvDCJ6ldkjaIDyqdApa3x24ZlWK7eyotVUT6l8zCJfJpAWwE9lUuZrZPcvOUO44TV6rPB/95Ae60toRr7e8eG5W4Bjqzg3mXHDrzRH/CrgsXeMDlAzqMGHk8iZYqXMA4yKneebyf/b5mgoNpOYbJTvoAPqs02swPU5xCfqadbATlFbFwjY+Ui+2Ts1ECoOqtF2CrI8CK8DAFqG3mXaP6AGlR+0mIpaDmcFRSy3JbYIH1qKO+4katiU9ug/+hMraxrAvccsjHIfaa6e3VB0RuwqaP44T4/tt0SXxfL7K1Av6AzzcAxTP6lbwIClN5ZNZ8ITP8LTgdeF4BD9RD63g/GZ7aMtJlyufc4hdezcSRD3rYk8MpiUvSpQTXwuoH51jwOWgQg1hm0vCFJogJb4/opaOeAElqH/HDEvm8WWg9dkFX4P6ajfAeu9fzvUXDLsqMZ2vo/rLIJLDINn5JT5md2GjvIn29HXk90X0KXzHtESAK4wbOfOefjXqhyeJ0VzYh64foAsSx4ryfz3w361ur/McEHIK5nxBhZCJ+Zrhd8Jl2a2ASCtpXDXPupk7mBWHXLbrGzHLo0MzE1NDc0oFHgadCKiQoIg0Mm0imCfQ2b4sFJVUHQ5WfUOu6cXMEteib7OE/M0BihbrpAxoX4CRVpQkdhj3lxhpVuw8X03suxwvg094AbB5BuWe6j3yw+derkzTdHFbjEa0dJLNG2+9OPufQtah4qPRir+k/aoAex//p01M+Y1rqfm6kZtcnCFRvF/Y6aUXnOLihfgRv5WATTZZQ2EERpIlpSFCtvjNqsygFBGEvmWqWt1jEpYeyxypoiGaiPitTMlCSL8qo+yZzmaIjnWjUPokk18YjV/jpxt5WMChscqj2inHIP1+rKF/c29d4gSeRncfGZYiHF5R+f2czsVlw9YwLeKXLgmzxT/rP2LzdKiqDvungdnGrsUQORR+9xiOO0tHFelnpCpc7w1uxQiHnAiENGIXQe+Vl05lshK72wlbVRcHv1mDpLKTmeBQHyzorz2mpzCJ/yhHHlQrPwaRZ68AasZfEyqqHP0/dm+fZWCIdVjmNTpkhtk/N6NtMaeBLl341a6H7N6WJGHy//Meaq2QAL31vWkVEMsi5iu7tfZ7i+5nTdzvSvzXNKgj1fZrVLTtFqdOHbftphsjKgQwBwpN1z7AGvwaQN3O+vgP+cGQN/MUicDJvo9LHZN6Olnaac0BGAf+e4JJnAa6y4T24NdG7EF/BW5f/4VJfbx69+8f+/YlJg80uBuhqFCYo3wIamGilg3wBubdUyTv2XWpoauMp1iYmI6qM22+vmcX7oKwr2Eqs2oAgm7MGuO38AcoaL2rW7BKeWyyTsHMBVJmIrCu0vWliUGAoGt/u1ckcYgKij056UyTVTpHCjeq5MGyTfF2xzXIpaaqEVEwr1Vbq7nPEJ23/+7S+VFVMxuN5OUpWGMzROdZ3v5bBVc5Ki6+T/7YV/f5Jpo1RZ3pB+Sp3QFNEwasqdPtOKDQs2xyGo+4XN/t8sAkbHWeuT+V4SM2gwnIwz8LgzHTh2IivvAfYlyslN8s+WFSbpQ== X-MS-Exchange-CrossTenant-Network-Message-Id: 3b119696-e821-4d2d-5dbd-08dccc691cca X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2854.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2024 22:38:20.9654 (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: 5knu+GwBFeqqUfNpu5MzFnkUeJUSp1udSCO6EkXlKj/fy/XNbET2lFsjZ6A+Yt9iof9/pprZPadnpC3q2dRPrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8259 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" When going to d3cold we surely don't need to flush commits, nor handle fbdev. So, clean this up a bit. Also move the opregion call to make the function more symmetric. Cc: Imre Deak Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/display/xe_display.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index daf9b9baa88a..3fd3e74f1310 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -310,9 +310,6 @@ static void xe_display_to_d3cold(struct xe_device *xe) * properly. */ intel_power_domains_disable(xe); - intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true); - - xe_display_flush_cleanup_work(xe); intel_dp_mst_suspend(xe); @@ -329,18 +326,15 @@ static void xe_display_from_d3cold(struct xe_device *xe) intel_dmc_resume(xe); - drm_mode_config_reset(&xe->drm); - intel_display_driver_init_hw(xe); + + intel_opregion_resume(display); + intel_hpd_init(xe); /* MST sideband requires HPD interrupts enabled */ intel_dp_mst_resume(xe); - intel_opregion_resume(display); - - intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_RUNNING, false); - intel_power_domains_enable(xe); }