| Message ID | 20241206-drm-connector-eld-mutex-v2-0-c9bce1ee8bea@linaro.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | drm/connector: add eld_mutex to protect connector->eld | expand |
On Fri, Dec 06, 2024 at 11:43:03AM +0200, Dmitry Baryshkov wrote: > The connector->eld is accessed by the .get_eld() callback. This access > can collide with the drm_edid_to_eld() updating the data at the same > time. Add drm_connector.eld_mutex to protect the data from concurrenct > access. > > The individual drivers were just compile tested. I propose to merge the > drm_connector and bridge drivers through drm-misc, allowing other > maintainers either to ack merging through drm-misc or merging the > drm-misc into their tree and then picking up correcponding patch. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > Changes in v2: > - Also take the mutex in clear_eld() (Jani) > - Rebased on top of linux-next + drm-misc-next to solve build error > - Link to v1: https://lore.kernel.org/r/20241201-drm-connector-eld-mutex-v1-0-ba56a6545c03@linaro.org > > --- > Dmitry Baryshkov (10): > drm/connector: add mutex to protect ELD from concurrent access > drm/bridge: anx7625: use eld_mutex to protect access to connector->eld > drm/bridge: ite-it66121: use eld_mutex to protect access to connector->eld > drm/amd/display: use eld_mutex to protect access to connector->eld > drm/exynos: hdmi: use eld_mutex to protect access to connector->eld > drm/i915/audio: use eld_mutex to protect access to connector->eld > drm/msm/dp: use eld_mutex to protect access to connector->eld > drm/radeon: use eld_mutex to protect access to connector->eld > drm/sti: hdmi: use eld_mutex to protect access to connector->eld > drm/vc4: hdmi: use eld_mutex to protect access to connector->eld Granted the lack of reviews from AMD maintainers and granted that the rest of the series was reviewed and acked, is it suitable to leave those two patches out and merge the rest through drm-misc-next?
On Mon, Dec 16, 2024 at 01:24:29PM +0200, Dmitry Baryshkov wrote: > On Fri, Dec 06, 2024 at 11:43:03AM +0200, Dmitry Baryshkov wrote: > > The connector->eld is accessed by the .get_eld() callback. This access > > can collide with the drm_edid_to_eld() updating the data at the same > > time. Add drm_connector.eld_mutex to protect the data from concurrenct > > access. > > > > The individual drivers were just compile tested. I propose to merge the > > drm_connector and bridge drivers through drm-misc, allowing other > > maintainers either to ack merging through drm-misc or merging the > > drm-misc into their tree and then picking up correcponding patch. > > > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > --- > > Changes in v2: > > - Also take the mutex in clear_eld() (Jani) > > - Rebased on top of linux-next + drm-misc-next to solve build error > > - Link to v1: https://lore.kernel.org/r/20241201-drm-connector-eld-mutex-v1-0-ba56a6545c03@linaro.org > > > > --- > > Dmitry Baryshkov (10): > > drm/connector: add mutex to protect ELD from concurrent access > > drm/bridge: anx7625: use eld_mutex to protect access to connector->eld > > drm/bridge: ite-it66121: use eld_mutex to protect access to connector->eld > > drm/amd/display: use eld_mutex to protect access to connector->eld > > drm/exynos: hdmi: use eld_mutex to protect access to connector->eld > > drm/i915/audio: use eld_mutex to protect access to connector->eld > > drm/msm/dp: use eld_mutex to protect access to connector->eld > > drm/radeon: use eld_mutex to protect access to connector->eld > > drm/sti: hdmi: use eld_mutex to protect access to connector->eld > > drm/vc4: hdmi: use eld_mutex to protect access to connector->eld > > Granted the lack of reviews from AMD maintainers and granted that the > rest of the series was reviewed and acked, is it suitable to leave those > two patches out and merge the rest through drm-misc-next? Sounds reasonable to me Maxime
On Fri, 06 Dec 2024 11:43:03 +0200, Dmitry Baryshkov wrote: > The connector->eld is accessed by the .get_eld() callback. This access > can collide with the drm_edid_to_eld() updating the data at the same > time. Add drm_connector.eld_mutex to protect the data from concurrenct > access. > > The individual drivers were just compile tested. I propose to merge the > drm_connector and bridge drivers through drm-misc, allowing other > maintainers either to ack merging through drm-misc or merging the > drm-misc into their tree and then picking up correcponding patch. > > [...] Applied to drm-misc-next, thanks! [01/10] drm/connector: add mutex to protect ELD from concurrent access commit: df7c8e3dde37a9d81c0613285b43600f3cc70f34 [02/10] drm/bridge: anx7625: use eld_mutex to protect access to connector->eld commit: e72bf423a60afd744d13e40ab2194044a3af5217 [03/10] drm/bridge: ite-it66121: use eld_mutex to protect access to connector->eld commit: 39ead6e02ea7d19b421e9d42299d4293fed3064e [04/10] drm/amd/display: use eld_mutex to protect access to connector->eld commit: 819bee01eea06282d7bda17d46caf29cae4f6d84 [05/10] drm/exynos: hdmi: use eld_mutex to protect access to connector->eld commit: 5e8436d334ed7f6785416447c50b42077c6503e0 [06/10] drm/i915/audio: use eld_mutex to protect access to connector->eld commit: 5db44dd1528625c73a31542df2a68972327c9897 [07/10] drm/msm/dp: use eld_mutex to protect access to connector->eld commit: 9aad030dc64f6994dc5de7bb81ceca55dbc555c3 [08/10] drm/radeon: use eld_mutex to protect access to connector->eld commit: b54c14f82428c8a602392d4cae1958a71a578132 [09/10] drm/sti: hdmi: use eld_mutex to protect access to connector->eld commit: e99c0b517bcd53cf61f998a3c4291333401cb391 [10/10] drm/vc4: hdmi: use eld_mutex to protect access to connector->eld commit: 81a9a93b169a273ccc4a9a1ee56f17e9981d3f98 Best regards,
The connector->eld is accessed by the .get_eld() callback. This access can collide with the drm_edid_to_eld() updating the data at the same time. Add drm_connector.eld_mutex to protect the data from concurrenct access. The individual drivers were just compile tested. I propose to merge the drm_connector and bridge drivers through drm-misc, allowing other maintainers either to ack merging through drm-misc or merging the drm-misc into their tree and then picking up correcponding patch. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- Changes in v2: - Also take the mutex in clear_eld() (Jani) - Rebased on top of linux-next + drm-misc-next to solve build error - Link to v1: https://lore.kernel.org/r/20241201-drm-connector-eld-mutex-v1-0-ba56a6545c03@linaro.org --- Dmitry Baryshkov (10): drm/connector: add mutex to protect ELD from concurrent access drm/bridge: anx7625: use eld_mutex to protect access to connector->eld drm/bridge: ite-it66121: use eld_mutex to protect access to connector->eld drm/amd/display: use eld_mutex to protect access to connector->eld drm/exynos: hdmi: use eld_mutex to protect access to connector->eld drm/i915/audio: use eld_mutex to protect access to connector->eld drm/msm/dp: use eld_mutex to protect access to connector->eld drm/radeon: use eld_mutex to protect access to connector->eld drm/sti: hdmi: use eld_mutex to protect access to connector->eld drm/vc4: hdmi: use eld_mutex to protect access to connector->eld drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ drivers/gpu/drm/bridge/analogix/anx7625.c | 2 ++ drivers/gpu/drm/bridge/ite-it66121.c | 2 ++ drivers/gpu/drm/drm_connector.c | 1 + drivers/gpu/drm/drm_edid.c | 6 ++++++ drivers/gpu/drm/exynos/exynos_hdmi.c | 2 ++ drivers/gpu/drm/i915/display/intel_audio.c | 3 +++ drivers/gpu/drm/msm/dp/dp_audio.c | 2 ++ drivers/gpu/drm/radeon/radeon_audio.c | 2 ++ drivers/gpu/drm/sti/sti_hdmi.c | 2 ++ drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++-- include/drm/drm_connector.h | 5 ++++- 12 files changed, 30 insertions(+), 3 deletions(-) --- base-commit: 84e541b1e58e04d808e1bb13ef566ffbe87aa89b change-id: 20241201-drm-connector-eld-mutex-8a39a35e9a38 Best regards,