From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 468D9C0219E for ; Thu, 6 Feb 2025 23:23:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 176DE10E9A0; Thu, 6 Feb 2025 23:23:56 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="hzhRCKfg"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3019010E9A0 for ; Thu, 6 Feb 2025 23:23:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738884236; x=1770420236; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lgH6xcUk0unhE2TBUmbPX8kb9lNck++n4gYm3dl4EdI=; b=hzhRCKfgbrnFnPKxSwe3/xUUl3j0ILnHRJ6wPS4k8gCmwIoqaSpzSTa0 4ts44Ac/2X/ValyJV9s/XC8Gw6gtOsMrjmG9OyFEcfSmu9ufbjaxArbOQ i7gh1H0alwyVN4zfppHX+hr9hg+YRoZCPwEdtl8ZKG63TqH3NxjFUdY/m VZOu3gUYMLEv2HPz3bgR17M1eSGcs7se9Kww1DyRARTuK7XbTy9WpgzwF G+4QkDmR0OqPH0EbVYjre4KmzzfkvkaR6KnX6ZsvUqHD5Z56IMUHOZWLM toKbjEfkfx6kBBARHETz4qETkgcljxp4dghZJ1Egzk7yc8cQQxdeL2lwU Q==; X-CSE-ConnectionGUID: C/NnkH91TK64in42CB3bOQ== X-CSE-MsgGUID: h5802v1/SeG/zgSps0Um2g== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="61993715" X-IronPort-AV: E=Sophos;i="6.13,265,1732608000"; d="scan'208";a="61993715" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2025 15:23:55 -0800 X-CSE-ConnectionGUID: U6SSrQy5QLuobYMxLr2ZPQ== X-CSE-MsgGUID: +0gqBcjWTMyv91ZN15pl5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="134594782" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.196]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2025 15:23:54 -0800 From: Lucas De Marchi To: Cc: Rodrigo Vivi , Francois Dugast , Lucas De Marchi , Maarten Lankhorst Subject: [PATCH v2 01/14] drm/xe: Fix xe_display_fini() calls Date: Thu, 6 Feb 2025 15:23:19 -0800 Message-ID: <20250206232333.2660325-2-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250206232333.2660325-1-lucas.demarchi@intel.com> References: <20250206232333.2660325-1-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" xe_display_fini() undoes things from xe_display_init() (technically from intel_display_driver_probe()). Those `goto err` in xe_device_probe() were wrong and being accumulated over time. Commit 65e366ace5ee ("drm/xe/display: Use a single early init call for display") made it easier to fix now that we don't have xe_display_* init calls spread on xe_device_probe(). Change xe_display_init() to use devm_add_action_or_reset() that will finalize display in the right order. While at it, also add a newline and comment about calling xe_driver_flr_fini. Cc: Maarten Lankhorst Cc: Rodrigo Vivi Reviewed-by: Rodrigo Vivi Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/xe/display/xe_display.c | 22 ++++++++++++---------- drivers/gpu/drm/xe/display/xe_display.h | 2 -- drivers/gpu/drm/xe/xe_device.c | 21 +++++++++++---------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 651799c946ace..302f533af037d 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -161,27 +161,29 @@ int xe_display_init_early(struct xe_device *xe) return err; } -int xe_display_init(struct xe_device *xe) +static void xe_display_fini(void *arg) { + struct xe_device *xe = arg; struct intel_display *display = &xe->display; - if (!xe->info.probe_display) - return 0; - - return intel_display_driver_probe(display); + intel_hpd_poll_fini(xe); + intel_hdcp_component_fini(display); + intel_audio_deinit(display); } -void xe_display_fini(struct xe_device *xe) +int xe_display_init(struct xe_device *xe) { struct intel_display *display = &xe->display; + int err; if (!xe->info.probe_display) - return; + return 0; - intel_hpd_poll_fini(xe); + err = intel_display_driver_probe(display); + if (err) + return err; - intel_hdcp_component_fini(display); - intel_audio_deinit(display); + return devm_add_action_or_reset(xe->drm.dev, xe_display_fini, xe); } void xe_display_register(struct xe_device *xe) diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h index e2a99624f7064..685dc74402fb8 100644 --- a/drivers/gpu/drm/xe/display/xe_display.h +++ b/drivers/gpu/drm/xe/display/xe_display.h @@ -22,7 +22,6 @@ int xe_display_probe(struct xe_device *xe); int xe_display_init_early(struct xe_device *xe); int xe_display_init(struct xe_device *xe); -void xe_display_fini(struct xe_device *xe); void xe_display_register(struct xe_device *xe); void xe_display_unregister(struct xe_device *xe); @@ -54,7 +53,6 @@ static inline int xe_display_probe(struct xe_device *xe) { return 0; } static inline int xe_display_init_early(struct xe_device *xe) { return 0; } static inline int xe_display_init(struct xe_device *xe) { return 0; } -static inline void xe_display_fini(struct xe_device *xe) {} static inline void xe_display_register(struct xe_device *xe) {} static inline void xe_display_unregister(struct xe_device *xe) {} diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 36d7ffb3b4d90..ac3e344fe04ec 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -735,6 +735,7 @@ static int probe_has_flat_ccs(struct xe_device *xe) "Flat CCS has been disabled in bios, May lead to performance impact"); xe_force_wake_put(gt_to_fw(gt), fw_ref); + return 0; } @@ -803,22 +804,26 @@ int xe_device_probe(struct xe_device *xe) err = xe_devcoredump_init(xe); if (err) return err; + + /* + * From here on, if a step fails, make sure a Driver-FLR is triggereed + */ err = devm_add_action_or_reset(xe->drm.dev, xe_driver_flr_fini, xe); if (err) return err; err = probe_has_flat_ccs(xe); if (err) - goto err; + return err; err = xe_vram_probe(xe); if (err) - goto err; + return err; for_each_tile(tile, xe, id) { err = xe_tile_init_noalloc(tile); if (err) - goto err; + return err; } /* Allocate and map stolen after potential VRAM resize */ @@ -832,17 +837,17 @@ int xe_device_probe(struct xe_device *xe) */ err = xe_display_init_early(xe); if (err) - goto err; + return err; for_each_tile(tile, xe, id) { err = xe_tile_init(tile); if (err) - goto err; + return err; } err = xe_irq_install(xe); if (err) - goto err; + return err; for_each_gt(gt, xe, id) { last_gt = id; @@ -902,8 +907,6 @@ int xe_device_probe(struct xe_device *xe) break; } -err: - xe_display_fini(xe); return err; } @@ -924,8 +927,6 @@ void xe_device_remove(struct xe_device *xe) xe_device_remove_display(xe); - xe_display_fini(xe); - xe_oa_fini(xe); xe_heci_gsc_fini(xe); -- 2.48.1