From mboxrd@z Thu Jan 1 00:00:00 1970 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 372C21F37AC; Sun, 26 Jan 2025 14:54:19 +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=1737903259; cv=none; b=iLD/5msJ7b0jnr7K372iV+CWA/xaj5QKtFOmCf9AisBK/qS4hJNmoQAhuB/2oVry/mRoCh+LfFrdZrYL11q5JIriPBp9SsR/qeA1XaQGi2SrN1BCQXZIsYMh9q2SR1uE2ScbJ8moK2g1/b4MJgCN+gz5r8LdHMNADuzc8CPZT5o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737903259; c=relaxed/simple; bh=fJyTBS2ExqGpvNbdJ1n6lStfVfvPf17Xj4nym5EELzw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fPa1G0pxMPsln47S/afTGIH8szN0TS68UrXgPXMkuunhbMI/v+Yq1zbOC3cZXKUHIeALlhspktJTY/bTyOWDQLi6VZKPbDVuOz+HIM+MdqqRQM25s/uWTGGVe7clid714i869yk03fF/2Fy72f2aPAiMH4sAjR5jDke8g+/jkDo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aGwoEWKM; 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="aGwoEWKM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEC85C4CED3; Sun, 26 Jan 2025 14:54:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737903259; bh=fJyTBS2ExqGpvNbdJ1n6lStfVfvPf17Xj4nym5EELzw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aGwoEWKM/0G22AHOzr9tGLUtqc+7kJBzRmrdLtjgE/yP3eTqyvu2Y3muNXrsLiKtH UoHFgBTwBhd4a78fOBGWh3zrabrXbkXggFRGpOT1ED5yqOh3iK7zsPdw4kkMsImeyW FN7BfOMlkdxOzzS4r39ZdMoNOvysGCKZguM5YlmuAoP/siFTu3WcMMgERW6KG/UFdZ nxWl5U3JO7gIHSs1Gl/Bb0HCH+z5l7lye5FfzijYD5kaWka3fSI7M7OVUmOda+HjLd 30RlALQ7inW3DYXGSBQpgqvGc+2F0JVHn/PsDGKVGJGAS3CdtfL+fyC+AatjPaS2vg fupQXGjYwUArQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Baryshkov , Maxime Ripard , Sasha Levin , dave.stevenson@raspberrypi.com, maarten.lankhorst@linux.intel.com, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.13 22/34] drm/vc4: hdmi: use eld_mutex to protect access to connector->eld Date: Sun, 26 Jan 2025 09:52:58 -0500 Message-Id: <20250126145310.926311-22-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250126145310.926311-1-sashal@kernel.org> References: <20250126145310.926311-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.13 Content-Transfer-Encoding: 8bit From: Dmitry Baryshkov [ Upstream commit 81a9a93b169a273ccc4a9a1ee56f17e9981d3f98 ] Reading access to connector->eld can happen at the same time the drm_edid_to_eld() updates the data. Take the newly added eld_mutex in order to protect connector->eld from concurrent access. Reviewed-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20241206-drm-connector-eld-mutex-v2-10-c9bce1ee8bea@linaro.org Signed-off-by: Dmitry Baryshkov Signed-off-by: Sasha Levin --- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index e3818c48c9b8c..e86123009c905 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -2193,9 +2193,9 @@ static int vc4_hdmi_audio_get_eld(struct device *dev, void *data, struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev); struct drm_connector *connector = &vc4_hdmi->connector; - mutex_lock(&vc4_hdmi->mutex); + mutex_lock(&connector->eld_mutex); memcpy(buf, connector->eld, min(sizeof(connector->eld), len)); - mutex_unlock(&vc4_hdmi->mutex); + mutex_unlock(&connector->eld_mutex); return 0; } -- 2.39.5