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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 7738EF364A4 for ; Thu, 9 Apr 2026 17:09:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=PUrev3OwtF7+aQkaLQNcxHy9DAd6gNcwgyZHwoDRdgs=; b=QApBv3OXPcMqQb3SRIQJKSw25Q /5wCKacTdQEgVqm13pWiYcaY8fL3doT0bZVk+IkDzKCLNemzLDaN+w3yDbxqm/YpRG8ngFSFCdVbv 3IMAt8FImpXopOpb3ALFxiXrb4OcbYWSjMNOAp0Ze/hfRpEiciaTyFz3mwHvKj7vpaXwC2N3gmUen BglSPrQ6+md0nuAMXE/JkxIIv4ra7zudHw+V5dnwjMsAmrS4VzUuV9Xn9QImu9UzBfQVfQJOlhBIt Jjb4ht7hpfiCGlB4gTHuRINHOKZSEWColPm/Z7itdcB70OilW48CIe51CaaGuTk0JkS+abkslhhxs HlC5PcYg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wAssS-0000000Ayh8-2cuj; Thu, 09 Apr 2026 17:09:12 +0000 Received: from smtpout-03.galae.net ([185.246.85.4]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wAssQ-0000000AydQ-0db9; Thu, 09 Apr 2026 17:09:11 +0000 Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id A90004E429AA; Thu, 9 Apr 2026 17:09:07 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 7B402603E4; Thu, 9 Apr 2026 17:09:07 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 4A52E104501A3; Thu, 9 Apr 2026 19:09:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1775754545; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=PUrev3OwtF7+aQkaLQNcxHy9DAd6gNcwgyZHwoDRdgs=; b=OcWU6p4Eq4OVCUQGSq0OR24F3SV9U9aoJdhjwYfqGnATABnWmw3hYwQNxsrBWr7LFEN0wY +zjRqf2kiNbPo/mU9nW61kDj5CwC7jaSAc5Gy3rkPy5Fj6M7a6/HMc++qZJDBCIVp5SsPv dJE7aBu08Dc+AWujlXmml9BdfZqEFleNP2qMh7AKwPjvG6avstJ/DraY1cnCzO32nFb0hm MbWiVfy6jfzGcJ3GtebCNIHq3TMe8Qh8ej8R1eIvUEP/2XYnx7UGtypJKwFS4d41ddVztJ uP4X8e1sExgc0UDbrUrd84ESpva7V1NRlz9nbV2ut6fF2cmdpdkXxjNkFsekMA== From: Kory Maincent Date: Thu, 09 Apr 2026 19:08:20 +0200 Subject: [PATCH RFC 04/12] drm/i915/display: Switch to drmm_mode_config_init() and drop manual cleanup MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260409-feat_link_cap-v1-4-7069e8199ce2@bootlin.com> References: <20260409-feat_link_cap-v1-0-7069e8199ce2@bootlin.com> In-Reply-To: <20260409-feat_link_cap-v1-0-7069e8199ce2@bootlin.com> To: Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , David Airlie , Simona Vetter , Dave Airlie , Jesse Barnes , Eric Anholt , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , AngeloGioacchino Del Regno , Chris Wilson Cc: Thomas Petazzoni , Mark Yacoub , Sean Paul , Louis Chauvet , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Simona Vetter , Kory Maincent X-Mailer: b4 0.14-dev-d4707 X-Last-TLS-Session-Version: TLSv1.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260409_100910_472978_31F52438 X-CRM114-Status: GOOD ( 14.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Replace drm_mode_config_init() with drmm_mode_config_init() in intel_mode_config_init(). The managed variant automatically registers drm_mode_config_cleanup() with devres, so drivers must no longer call it directly. Since intel_mode_config_cleanup() was solely a wrapper combining intel_atomic_global_obj_cleanup() and drm_mode_config_cleanup(), and the latter is now handled by DRM core, remove it entirely. Instead, register intel_atomic_global_obj_cleanup() as a devres action so it still runs just before drm_mode_config_cleanup() during teardown, preserving the correct cleanup ordering. Change intel_mode_config_init() to return int to propagate any error from drmm_mode_config_init(). Signed-off-by: Kory Maincent --- .../gpu/drm/i915/display/intel_display_driver.c | 37 ++++++++++++++-------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index 23bfecc983e8d..d02393053cef4 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -48,6 +49,7 @@ #include "intel_fbdev.h" #include "intel_fdi.h" #include "intel_flipq.h" +#include "intel_global_state.h" #include "intel_gmbus.h" #include "intel_hdcp.h" #include "intel_hotplug.h" @@ -111,13 +113,28 @@ static const struct drm_mode_config_helper_funcs intel_mode_config_funcs = { .atomic_commit_setup = drm_dp_mst_atomic_setup_commit, }; -static void intel_mode_config_init(struct intel_display *display) +static void intel_atomic_global_obj_cleanup_action(struct drm_device *drm, void *data) +{ + intel_atomic_global_obj_cleanup((struct intel_display *)data); +} + +static int intel_mode_config_init(struct intel_display *display) { struct drm_mode_config *mode_config = &display->drm->mode_config; + int ret; + + ret = drmm_mode_config_init(display->drm); + if (ret) + return ret; - drm_mode_config_init(display->drm); INIT_LIST_HEAD(&display->global.obj_list); + ret = drmm_add_action_or_reset(display->drm, + intel_atomic_global_obj_cleanup_action, + display); + if (ret) + return ret; + mode_config->min_width = 0; mode_config->min_height = 0; @@ -148,12 +165,8 @@ static void intel_mode_config_init(struct intel_display *display) } intel_cursor_mode_config_init(display); -} -static void intel_mode_config_cleanup(struct intel_display *display) -{ - intel_atomic_global_obj_cleanup(display); - drm_mode_config_cleanup(display->drm); + return 0; } static void intel_plane_possible_crtcs_init(struct intel_display *display) @@ -255,7 +268,9 @@ int intel_display_driver_probe_noirq(struct intel_display *display) intel_dmc_init(display); - intel_mode_config_init(display); + ret = intel_mode_config_init(display); + if (ret) + goto cleanup_wq_unordered; ret = intel_cdclk_init(display); if (ret) @@ -456,7 +471,7 @@ int intel_display_driver_probe_nogem(struct intel_display *display) ret = intel_crtc_init(display); if (ret) - goto err_mode_config; + return ret; intel_plane_possible_crtcs_init(display); intel_dpll_init(display); @@ -497,8 +512,6 @@ int intel_display_driver_probe_nogem(struct intel_display *display) err_hdcp: intel_hdcp_component_fini(display); -err_mode_config: - intel_mode_config_cleanup(display); return ret; } @@ -618,8 +631,6 @@ void intel_display_driver_remove_noirq(struct intel_display *display) intel_hdcp_component_fini(display); - intel_mode_config_cleanup(display); - intel_dp_tunnel_mgr_cleanup(display); intel_overlay_cleanup(display); -- 2.43.0