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 80DA0CD6E69 for ; Wed, 3 Jun 2026 09:00:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0ADA7113C62; Wed, 3 Jun 2026 09:00:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="JFsxQYCq"; dkim-atps=neutral Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) by gabe.freedesktop.org (Postfix) with ESMTPS id 75E1F113C71; Wed, 3 Jun 2026 09:00:38 +0000 (UTC) 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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/i915/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); /* 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; + } intel_panel_init(connector, drm_edid); @@ -1004,12 +1006,4 @@ void intel_lvds_init(struct intel_display *display) lvds_encoder->a3_power = lvds & LVDS_A3_POWER_MASK; 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; } -- 2.43.0