From nobody Sat Jun 13 07:44:40 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6CCB23F6601; Fri, 8 May 2026 14:46:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778251589; cv=none; b=QTTtlUQzitvF5MDdAUpX44QM42Z3/W7Xpn9ws0MoiuUEuP2bgJ8xuoR/NkTR1I2y3dd7EwER6cQHNQBYmzZBTZ+hrqgGMjuU+kFgFjE4NFHIPMEKVdPGMIS7e1LguG3MbeI1b/IG6phKLnhUPgRMhl6vGNLPHgOeF4pc3eonu0c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778251589; c=relaxed/simple; bh=SZt0Xpr/BjtnhzyexlgcWrKbKSkAxPxwD2uZDoo72MY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lhCzCjyzI1/Hcr55WSvaI8dlC2522qPvpS0sIccOES0IqfFi2zdyGxMoXEb6bhrZ7m67zWo76ZWCr6PJx59qt/WFLAGtgPRzl0jmAqrFr0UZHfdwBcf/LLVSNDxFRAWtaosBkf+2BVQ2eIP290zDfGErHMNu62CtG/vk8p5MDgQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k0GNSU10; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k0GNSU10" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D74A8C2BCC7; Fri, 8 May 2026 14:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778251588; bh=SZt0Xpr/BjtnhzyexlgcWrKbKSkAxPxwD2uZDoo72MY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k0GNSU10PO8A209GclcjlNAHYHh0tUfHgCGxuABMbWj4U5pRW+B93DXIviHw3pfnL 0cJ3TMgLiH+5OeehtfRQEannYtIIBNfjL1DkwRjagqakOqeIISIVeBgkDcxC4EhJOk a2D2YSqQMGH6/JqzOwPE6lIt8awL0EVkgCtyxNvRrf586y/0WGMBLrDALo8Womgt8A 3tT+3T6Don5XouiUKODpu4HvyGfa5kB2JUa8RkZBWudnpizkuVyV2h3RcJU06a3cc1 LgsrhQWHue+MSSWI6kg7ISMd4Xt89LkeF6rF3KdgXgyUg6x2VaoyrfHNbD2Nd+Oqlb oJJFYO0MDy79Q== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wLMTC-00000000FZ3-2fyi; Fri, 08 May 2026 16:46:26 +0200 From: Johan Hovold To: Patrik Jakobsson Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/3] drm/gma500/oaktrail_hdmi: fix i2c adapter leak on setup Date: Fri, 8 May 2026 16:44:44 +0200 Message-ID: <20260508144446.59722-2-johan@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260508144446.59722-1-johan@kernel.org> References: <20260508144446.59722-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to drop the reference taken to the I2C adapter (and its module) when setting up HDMI to allow the adapter to be deregistered. Fixes: 1b082ccf5901 ("gma500: Add Oaktrail support") Cc: stable@vger.kernel.org # 3.3 Signed-off-by: Johan Hovold --- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma50= 0/oaktrail_hdmi.c index 58d7e191fd56..403d21cbb3a2 100644 --- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c +++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c @@ -580,6 +580,7 @@ static int oaktrail_hdmi_get_modes(struct drm_connector= *connector) } else { edid =3D (struct edid *)raw_edid; /* FIXME ? edid =3D drm_get_edid(connector, i2c_adap); */ + i2c_put_adapter(i2c_adap); } =20 if (edid) { --=20 2.53.0 From nobody Sat Jun 13 07:44:40 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6CF6F3F6603; Fri, 8 May 2026 14:46:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778251589; cv=none; b=XjBlBVfOaMw13Cpd/maZwvMPGmecor7vofskqDy6ha1MOyeuTUDlDGS5D7JO+TadInO664pzQJqbiraBVvvScq+xMZUG3BXx1PyRa0n2D2jTC4VZjjT3e7Bvi9zzWfabXdEJFeUh4HJNq8KpXN5M/RTnqW8lQuxQ7bCMUqOeyw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778251589; c=relaxed/simple; bh=2giSI3kqJQB//8Ul4n6V6oSBt4dteqqZbtnY9HL2lmI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jjXooWoQGEVRgUs+rR4v6Fraf0V8z+Yy4mKxjrH4o8pWTkkXTBIWqE6BgnQf/bKuFd0TGtXFke1VVvOOvseakm+REpXWGWyKhzIs085LKb7scB+5L5BdrF6B526529Npap+W5fI4CmkOOqJer8I78/ZH1GnNdHpCKbRFJqoHyDE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CZincF9m; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CZincF9m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC36EC2BCF4; Fri, 8 May 2026 14:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778251588; bh=2giSI3kqJQB//8Ul4n6V6oSBt4dteqqZbtnY9HL2lmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CZincF9mC3NmZSqxHHKRkfKONNaSaR+Mm6VKQ0Wyoho14LWeLeH3BvUK7sfhcGVVK 6kHXC92Ptya1PcIniCqAVsrnmACAiornk/fkc15wSIc0wQWiTxrU+XhxDQqAlFbDMu iCRWgyZ9ENGsmExpNIMgzxIxXob6eb47U1nufCyRtIPn6dlLio4m2a/k6CfjJsRIPV z99kDT3j3zGDLCH6x1f35pJ1wJv3VsMzuMKrBmgolv9bMcT4Q4UHbDY7tT3FL58Xl5 ODDZmm7u2OsUnDV1LH+KW9lj9b4QfCJKkhjwTUnyHm9OCFOX8D4mL7aKScU40neoOL R05oiK7wvwz2Q== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wLMTC-00000000FZ5-2iOV; Fri, 08 May 2026 16:46:26 +0200 From: Johan Hovold To: Patrik Jakobsson Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/3] drm/gma500/oaktrail_lvds: fix hang on init failure Date: Fri, 8 May 2026 16:44:45 +0200 Message-ID: <20260508144446.59722-3-johan@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260508144446.59722-1-johan@kernel.org> References: <20260508144446.59722-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The LVDS init code looks up an I2C adapter using i2c_get_adapter() and tries to read the EDID before falling back to allocating and registering its own adapter. The error handling does not separate these cases so on a late init failure it will try to deregister and free also an adapter that had previously been registered. Since i2c_get_adapter() takes another reference to the adapter, deregistration hangs indefinitely while waiting for the reference to be released. Fix this by only destroying adapters allocated during LVDS init on errors. Fixes: a57ebfc0b4da ("drm/gma500: Make oaktrail lvds use ddc adapter from d= rm_connector") Cc: stable@vger.kernel.org # 6.0 Cc: Patrik Jakobsson Signed-off-by: Johan Hovold --- drivers/gpu/drm/gma500/oaktrail_lvds.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma50= 0/oaktrail_lvds.c index 884d324f0044..983cc60a1e69 100644 --- a/drivers/gpu/drm/gma500/oaktrail_lvds.c +++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c @@ -293,7 +293,7 @@ void oaktrail_lvds_init(struct drm_device *dev, { struct gma_encoder *gma_encoder; struct gma_connector *gma_connector; - struct gma_i2c_chan *ddc_bus; + struct gma_i2c_chan *ddc_bus =3D NULL; struct drm_connector *connector; struct drm_encoder *encoder; struct drm_psb_private *dev_priv =3D to_drm_psb_private(dev); @@ -421,7 +421,8 @@ void oaktrail_lvds_init(struct drm_device *dev, =20 err_unlock: mutex_unlock(&dev->mode_config.mutex); - gma_i2c_destroy(to_gma_i2c_chan(connector->ddc)); + if (!IS_ERR_OR_NULL(ddc_bus)) + gma_i2c_destroy(ddc_bus); drm_encoder_cleanup(encoder); err_connector_cleanup: drm_connector_cleanup(connector); --=20 2.53.0 From nobody Sat Jun 13 07:44:40 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 43E313F54B3; Fri, 8 May 2026 14:46:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778251590; cv=none; b=gpscM3VC1zh05pnAzOgM2MPK4/4zEmN4/iF54TIYyoZ80/OIc/5Zq77keCQo0Kxrngm459JjxJOKnPvpn1/D1ghRzxnpXzpkC/JOAmBBUL+oNg3HgF2OdbbleAro79/kpxo4GuVauzd2fAD4LXi5lXYSK6cdmWtw7gqdLxwKVAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778251590; c=relaxed/simple; bh=G4Fkw46u7ywzQfjBZWK+OQ4pewgSnJib5ODBo6YmLF0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ay6TeA1kj4IN1o8VMBKP+ilSk21x8ERnDd2Z9U/0LFz+gnqgPIAOiNPEVzeMOVyXxqLdqHouAyat6YZwxL23/zOSzjidXt0fwmR9hAzrGs8iXERo69Rhb8Q2toFXF0+H0MxfvlNU0Zt39/HlGqg/fxLflTFVEQSHtB02SYqfgj0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tISLuLba; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tISLuLba" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 519CBC2BCC9; Fri, 8 May 2026 14:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778251589; bh=G4Fkw46u7ywzQfjBZWK+OQ4pewgSnJib5ODBo6YmLF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tISLuLbaQBDLelBEdX7IcdYPbIse/VEP3PQk32s/c9Sp8ATUJGHrIvuKl/e8u5NrP jo6assX84Y8cCs/Dm/Vj3xGPLdT71Yv009DeM5TLVpmq1X02Qn/1DvNeq4+zEEuprH CL/nNO2/aCS4sRMZvjrK6WUDWfiJJkEAAPxyfJvu/sPxqPfPB/k+lwtm17SG5TZSxC Q/VP/oC4ACaYBbcIglHgsR+HdagqlDWPoLrrzg5llqbbqUOF5aWSjk9UGGfDZ7heH3 aAyc4QbLW7qA3QsnXPZxpWiF5XepUvNyb3oBD8pz2gCAb23AMIK6EaN088KBrd+uer VlndpYkC4pz7g== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1wLMTC-00000000FZ7-2kkp; Fri, 08 May 2026 16:46:26 +0200 From: Johan Hovold To: Patrik Jakobsson Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 3/3] drm/gma500/oaktrail_lvds: fix i2c adapter leaks on init Date: Fri, 8 May 2026 16:44:46 +0200 Message-ID: <20260508144446.59722-4-johan@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260508144446.59722-1-johan@kernel.org> References: <20260508144446.59722-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The LVDS init code looks up an I2C adapter using i2c_get_adapter() and tries to read the EDID before falling back to allocating and registering its own adapter. Make sure to drop the references taken by i2c_get_adapter() when falling back to allocating an adapter as well as on late errors to allow the looked up adapter to be deregistered. Fixes: 1b082ccf5901 ("gma500: Add Oaktrail support") Cc: stable@vger.kernel.org # 3.3 Signed-off-by: Johan Hovold --- drivers/gpu/drm/gma500/oaktrail_lvds.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma50= 0/oaktrail_lvds.c index 983cc60a1e69..e194d0cce067 100644 --- a/drivers/gpu/drm/gma500/oaktrail_lvds.c +++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c @@ -367,6 +367,8 @@ void oaktrail_lvds_init(struct drm_device *dev, if (edid =3D=3D NULL && dev_priv->lpc_gpio_base) { ddc_bus =3D oaktrail_lvds_i2c_init(dev); if (!IS_ERR(ddc_bus)) { + if (i2c_adap) + i2c_put_adapter(i2c_adap); i2c_adap =3D &ddc_bus->base; edid =3D drm_get_edid(connector, i2c_adap); } @@ -423,6 +425,8 @@ void oaktrail_lvds_init(struct drm_device *dev, mutex_unlock(&dev->mode_config.mutex); if (!IS_ERR_OR_NULL(ddc_bus)) gma_i2c_destroy(ddc_bus); + else if (i2c_adap) + i2c_put_adapter(i2c_adap); drm_encoder_cleanup(encoder); err_connector_cleanup: drm_connector_cleanup(connector); --=20 2.53.0