]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/amd/display: Don't lock connection_mutex for DMUB HPD
authorNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Thu, 4 Nov 2021 20:52:06 +0000 (16:52 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 9 Nov 2021 22:08:00 +0000 (17:08 -0500)
[Why]
Per DRM spec we only need to hold that lock when touching
connector->state - which we do not do in that handler.

Taking this locking introduces unnecessary dependencies with other
threads which is bad for performance and opens up the potential for
a deadlock since there are multiple locks being held at once.

[How]
Remove the connection_mutex lock/unlock routine and just iterate over
the drm connectors normally. The iter helpers implicitly lock the
connection list so this is safe to do.

DC link access also does not need to be guarded since the link
table is static at creation - we don't dynamically add or remove links,
just streams.

Fixes: e27c41d5b068 ("drm/amd/display: Support for DMUB HPD interrupt handling")
Reviewed-by: Jude Shih <shenshih@amd.com>
Acked-by: Anson Jacob <Anson.Jacob@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index d0d38d3631dc598d0a68a8d827b2fa1d274320df..6aafcc14b4797697936ee82159900a9decb8093b 100644 (file)
@@ -669,10 +669,7 @@ void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *not
                return;
        }
 
-       drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
-
        link_index = notify->link_index;
-
        link = adev->dm.dc->links[link_index];
 
        drm_connector_list_iter_begin(dev, &iter);
@@ -685,7 +682,6 @@ void dmub_hpd_callback(struct amdgpu_device *adev, struct dmub_notification *not
                }
        }
        drm_connector_list_iter_end(&iter);
-       drm_modeset_unlock(&dev->mode_config.connection_mutex);
 
        if (hpd_aconnector)
                handle_hpd_irq_helper(hpd_aconnector);