From nobody Mon Jun 8 07:24:28 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB30134678E; Wed, 3 Jun 2026 09:00:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780477238; cv=none; b=mdyyw5NrlMkuwrg3lIGQianK0FG6jr0rDoC389Oc4dUIfOYT16KhEXJbdxQVBYxnc6DYsvZyfQ2NAftZnupofX/jk1ic938jBn5FOzUi57YZESBQUUPdwI9O2xAsiJZSX6SFvwjDhwO84ZJIaE7RC5V+JuhXUlNhPv7270P04O8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780477238; c=relaxed/simple; bh=vXVCuN6NAVWtC4G/8GUc3Hfrre7cwpZFQ2oHAGj7kRE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MHD8TT9WOdwFqY0ht7fkFBlrEsF3DK3p2xXwLD69YXz2hItOo8AQdc22ltFkjBDuyBZrH0GPoQ/GI6I41Xp5HCfRhfSlUhMzNHiqiHqT0v+GgWtzY03PJVmFRHNFvBevkH41QWvMp69IAuIWhsWn0I5uV6FY6ovoLkXQdNmVx84= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=dLJJnzFK; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="dLJJnzFK" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 27A701A37D1; Wed, 3 Jun 2026 09:00:35 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id EE76D5FD24; Wed, 3 Jun 2026 09:00:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 80C8510888CC5; Wed, 3 Jun 2026 11:00:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1780477233; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=SWJLbwcw1LfuoUnP65FT41JauKFUhB7nEOh+Gt4WQSE=; b=dLJJnzFK0xuKU5smX78GcLw72hCR9Rf7iBilOH4NL8BPKQekXcEy/YH8lpyX1vFD548KSm NB4YXxMFI/0tFNp9Mo6kP3KtrnJszt9IolCxhPwtf1p5nLwHz6QM/A9CwNc090o/m8X/Nt HhpVHtNIJORCX1y/qs5NwU5Cf2rgdzz6yFGokKruyJ9WWmf5cC9o1jnoQL1kyuzpv2tiPh YOa2q3HlFxmIby9mxm4iyRjTi5AlouOat7vyfEtJuo6g9cj8xVG6dwAMzf5pfA2BQbP1Ir LkzRTp0XTgrgZAJIXs/tRPXQnmmZCqgMQqNHLuWhn6Fx/hPTkQVp/UpltjPk0w== From: Kory Maincent Date: Wed, 03 Jun 2026 10:59:52 +0200 Subject: [PATCH 1/3] drm/i915/display/intel_sdvo: Fix double connector destroy in error paths Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260603-fix_i915-v1-1-7479ff64e705@bootlin.com> References: <20260603-fix_i915-v1-0-7479ff64e705@bootlin.com> In-Reply-To: <20260603-fix_i915-v1-0-7479ff64e705@bootlin.com> To: Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , David Airlie , Simona Vetter , Chris Wilson , Eric Anholt , Dave Airlie , Jesse Barnes Cc: Thomas Petazzoni , Louis Chauvet , Mark Yacoub , Sean Paul , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Simona Vetter , Kory Maincent , stable@vger.kernel.org X-Mailer: b4 0.15.0 X-Last-TLS-Session-Version: TLSv1.3 intel_sdvo_connector_funcs registers intel_connector_destroy() as the .destroy callback. Once drm_connector_init_with_ddc() succeeds inside intel_sdvo_connector_init(), the DRM core takes ownership of the connector object and will call .destroy on teardown. The error labels in intel_sdvo_tv_init() and intel_sdvo_lvds_init() call intel_connector_destroy() explicitly before returning false, causing it to be invoked twice: once in the error path and again by the DRM core through the registered .destroy callback. Remove the manual intel_connector_destroy() calls from the error labels and return false directly instead. Cc: stable@vger.kernel.org Fixes: 32aad86fe88e7 ("drm/i915/sdvo: Propagate errors from reading/writing= control bus.") Signed-off-by: Kory Maincent --- Not tested as I don't have such hardware. --- drivers/gpu/drm/i915/display/intel_sdvo.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i9= 15/display/intel_sdvo.c index d83d350959d88..0f3aa879e39e1 100644 --- a/drivers/gpu/drm/i915/display/intel_sdvo.c +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c @@ -2878,16 +2878,12 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, u= 16 type) } =20 if (!intel_sdvo_tv_create_property(intel_sdvo, intel_sdvo_connector, type= )) - goto err; + return false; =20 if (!intel_sdvo_create_enhance_property(intel_sdvo, intel_sdvo_connector)) - goto err; + return false; =20 return true; - -err: - intel_connector_destroy(connector); - return false; } =20 static bool @@ -2950,7 +2946,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, u= 16 type) } =20 if (!intel_sdvo_create_enhance_property(intel_sdvo, intel_sdvo_connector)) - goto err; + return false; =20 intel_bios_init_panel_late(display, &intel_connector->panel, NULL, NULL); =20 @@ -2972,13 +2968,9 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, = u16 type) intel_panel_init(intel_connector, NULL); =20 if (!intel_panel_preferred_fixed_mode(intel_connector)) - goto err; + return false; =20 return true; - -err: - intel_connector_destroy(connector); - return false; } =20 static u16 intel_sdvo_filter_output_flags(u16 flags) --=20 2.43.0 From nobody Mon Jun 8 07:24:28 2026 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E38E346777 for ; Wed, 3 Jun 2026 09:00:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780477242; cv=none; b=cT17ZSOq64m6BQ3AkEnQlYYLwksSMrFTTY5Y1ht2gPVOLzDFYq467DHFfC1BMlVZNHxYKDgMGL+2FVVXzbcQsZUl5Fpe7S85pj/s4JJt5qy7kqqbxaYXX0rk4tk3kcEcGQSmJpDvfOxAnzCnCsF+QoFXSysoBn5Ecm+/coDHhOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780477242; c=relaxed/simple; bh=C+G5Uf/2i+LZcXERuus3LfCyP+sYSn+cml0wSXoCCzg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gRtpXTFkmpjdpzB+Bz21+1et/UVibvJO/Knr9EVwp2Xj+VjznuWJ9wB/cZyMXeDY14Zp4KyLDq6L7UtS59SrLHRkAYat4V8r7Smhm+qX5Oha0klb3jCj8OedKPsychfDYZF4O+M5utG0Et3/8z5pCQhF5GnjAPP2UG8d+HDO+jk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=JFsxQYCq; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="JFsxQYCq" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id E83C2C62218; Wed, 3 Jun 2026 09:00:39 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 0DF245FD24; Wed, 3 Jun 2026 09:00:37 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1866E10888CC6; Wed, 3 Jun 2026 11:00:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1780477235; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=r/NN9pViPdyj5cuEJSEypzO3N+Y1PCVc8NIitOG1U6o=; b=JFsxQYCqBNmAgsmCbRMq5hbFW3Zvu2lp5Q57fsRA/fLYBenc9qdcsG4zUSzi/cvYXRotXp sL1AfhNzTOQMIzErLXMeeaH9LNetB3kxdwlCwT0CvL1zZPRWXJ23sKUHSZ8ml3A7TJTvB1 eXe32XGGsl1q+TTD3RjTjA0RY4F4szkDqyaAftTK9uMrV39JlU62AfST0SmDcHxL1BFhUs oBC+SNT0U/mlOyANf56JUIY23WAv1XDC70Lgo8CN7++qWJWeA6YRtZ1SwPWyv50uigb5sQ SdlFvUcWBkvFHeUcTOWTZX9q4JsNGBk3Vs5pS6p7WNWjsMbtX+rY8CQ1n/NfYw== From: Kory Maincent Date: Wed, 03 Jun 2026 10:59:53 +0200 Subject: [PATCH 2/3] drm/i915/display/intel_lvds: Drop redundant manual cleanup on init failure Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260603-fix_i915-v1-2-7479ff64e705@bootlin.com> References: <20260603-fix_i915-v1-0-7479ff64e705@bootlin.com> In-Reply-To: <20260603-fix_i915-v1-0-7479ff64e705@bootlin.com> To: Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , David Airlie , Simona Vetter , Chris Wilson , Eric Anholt , Dave Airlie , Jesse Barnes Cc: Thomas Petazzoni , Louis Chauvet , Mark Yacoub , Sean Paul , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Simona Vetter , Kory Maincent , stable@vger.kernel.org X-Mailer: b4 0.15.0 X-Last-TLS-Session-Version: TLSv1.3 intel_lvds_init() had a goto-based error path that manually called drm_connector_cleanup(), drm_encoder_cleanup(), kfree() and intel_connector_free() when no LVDS panel mode could be found. Once drm_connector_init_with_ddc() and drm_encoder_init() have been called, the DRM core takes ownership of these objects and will invoke their .destroy callbacks (intel_connector_destroy and intel_encoder_destroy) during device teardown. The manual cleanup in the failed: label is therefore redundant. Remove it and replace the goto with a simple early return. Cc: stable@vger.kernel.org Fixes: 79e539453b34e ("DRM: i915: add mode setting support") Signed-off-by: Kory Maincent --- Not tested as I don't have such hardware. --- drivers/gpu/drm/i915/display/intel_lvds.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i9= 15/display/intel_lvds.c index c8098104d853a..2a1301eda5fe5 100644 --- a/drivers/gpu/drm/i915/display/intel_lvds.c +++ b/drivers/gpu/drm/i915/display/intel_lvds.c @@ -990,8 +990,10 @@ void intel_lvds_init(struct intel_display *display) mutex_unlock(&display->drm->mode_config.mutex); =20 /* If we still don't have a mode after all that, give up. */ - if (!intel_panel_preferred_fixed_mode(connector)) - goto failed; + if (!intel_panel_preferred_fixed_mode(connector)) { + drm_dbg_kms(display->drm, "No LVDS modes found, disabling.\n"); + return; + } =20 intel_panel_init(connector, drm_edid); =20 @@ -1004,12 +1006,4 @@ void intel_lvds_init(struct intel_display *display) lvds_encoder->a3_power =3D lvds & LVDS_A3_POWER_MASK; =20 return; - -failed: - drm_dbg_kms(display->drm, "No LVDS modes found, disabling.\n"); - drm_connector_cleanup(&connector->base); - drm_encoder_cleanup(&encoder->base); - kfree(lvds_encoder); - intel_connector_free(connector); - return; } --=20 2.43.0 From nobody Mon Jun 8 07:24:28 2026 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32FB9335BBB; Wed, 3 Jun 2026 09:00:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780477242; cv=none; b=cl/8idrmT/ebHACt0iFMA7QVGuYo+1gDn/NSxUnpbE71j4rtAJGtPYI8tv6Klo85a3t/CPfINZXCBQlOLNb1nSQNor7BsRvIRpFjCGVYc+DmwxD6sV7DBEjIqWTHVASRdNrxoaqG3XQQn7TglFBi2fNnz/GhrwyaWTDkkPvQ+GQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780477242; c=relaxed/simple; bh=7iaLCBnvkEjWZi6ZwCEL/kKap3F4J5QHzCPV5d8J2kc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m9IjKltT+7w/5QtenohfgtvzY3ZKUmlWWwe+PxRshJjnIX0NQQNdi31kN7SLJfo0vfUOqy0T3K1TepFNTv2TZBuxjDkYTeIivbQn3w5PefOPrQGI8qPTNhe7kpZ5drIx3Kp84JSleg1V8pwjDli40NKIozhELRULIPglsPm6TnU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=04B6lho+; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="04B6lho+" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id E45A0C62216; Wed, 3 Jun 2026 09:00:41 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 2072C5FD24; Wed, 3 Jun 2026 09:00:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 2723110888413; Wed, 3 Jun 2026 11:00:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1780477237; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=YQGOVjJ70TJqHQ6t2vTYiGOL39RZYVDa4SJTFCWKyZo=; b=04B6lho+Bh//vim3TDYdAaLB6/BgNYrsH6G8def+gohQ4WgWK2QOntZiy/TTDyjGkLdJM6 xT3A2e75f8OvhX4GZJ4pn/xI917zNPAopGnmTAanFRNzstyTO8xdSC/c1dv/kLudqcK2V0 IDXHDfRcqjUMJMYJ6W45S/a4TkYWtA1Kb/KVVUSFkkV3yC1WcFtc5LIsLRfPbLj+swReab 4gXvU7+o7GdnjYoERGvFoS8i+X+aNvyQfukBvoPX7+3UxpCGHtGKiAtoB9Dwt5pw/P2ZnR e3YRQACR5R/Jo1pgt/HVqLEBQMF4GLybIQ4xNYkTAnN34NT3m0OnVlBSAzZDuA== From: Kory Maincent Date: Wed, 03 Jun 2026 10:59:54 +0200 Subject: [PATCH 3/3] drm/i915/display/intel_dp: Drop redundant intel_dp_aux_fini() on init failure Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260603-fix_i915-v1-3-7479ff64e705@bootlin.com> References: <20260603-fix_i915-v1-0-7479ff64e705@bootlin.com> In-Reply-To: <20260603-fix_i915-v1-0-7479ff64e705@bootlin.com> To: Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , David Airlie , Simona Vetter , Chris Wilson , Eric Anholt , Dave Airlie , Jesse Barnes Cc: Thomas Petazzoni , Louis Chauvet , Mark Yacoub , Sean Paul , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Simona Vetter , Kory Maincent , stable@vger.kernel.org X-Mailer: b4 0.15.0 X-Last-TLS-Session-Version: TLSv1.3 intel_dp_aux_fini() is already invoked via intel_dp_encoder_flush_work() in the encoder destroy path (intel_dp_encoder_destroy() and intel_ddi_encoder_destroy()). Calling it explicitly when intel_edp_init_connector() fails before jumping to the fail label therefore results in a double invocation. Drop the redundant call. Cc: stable@vger.kernel.org Fixes: c191eca110a37 ("drm/i915: Move intel_connector->unregister to connec= tor->early_unregister") Signed-off-by: Kory Maincent --- drivers/gpu/drm/i915/display/intel_dp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915= /display/intel_dp.c index f01a6eed38395..f4fab568172f4 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -7310,10 +7310,8 @@ intel_dp_init_connector(struct intel_digital_port *d= ig_port, connector->get_hw_state =3D intel_connector_get_hw_state; connector->sync_state =3D intel_dp_connector_sync_state; =20 - if (!intel_edp_init_connector(intel_dp, connector)) { - intel_dp_aux_fini(intel_dp); + if (!intel_edp_init_connector(intel_dp, connector)) goto fail; - } =20 intel_dp_set_source_rates(intel_dp); intel_dp_set_common_rates(intel_dp); --=20 2.43.0