From mboxrd@z Thu Jan 1 00:00:00 1970 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: 7bit 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 connector->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 *dig_port, connector->get_hw_state = intel_connector_get_hw_state; connector->sync_state = intel_dp_connector_sync_state; - if (!intel_edp_init_connector(intel_dp, connector)) { - intel_dp_aux_fini(intel_dp); + if (!intel_edp_init_connector(intel_dp, connector)) goto fail; - } intel_dp_set_source_rates(intel_dp); intel_dp_set_common_rates(intel_dp); -- 2.43.0