]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/vc4: hdmi: use eld_mutex to protect access to connector->eld
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Fri, 6 Dec 2024 09:43:13 +0000 (11:43 +0200)
committerDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Mon, 16 Dec 2024 16:02:08 +0000 (18:02 +0200)
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 <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241206-drm-connector-eld-mutex-v2-10-c9bce1ee8bea@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
drivers/gpu/drm/vc4/vc4_hdmi.c

index 23c6a823ab3e14ddeefcc9e778254179331b58ab..203293a8beca738dbfeaaf15f350026e263e646b 100644 (file)
@@ -2220,9 +2220,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;
 }