On Thu, Sep 16, 2021 at 11:15:51PM +0200, Fernando Ramos wrote:
As requested in Documentation/gpu/todo.rst, replace driver calls to drm_modeset_lock_all() with DRM_MODESET_LOCK_ALL_BEGIN() and DRM_MODESET_LOCK_ALL_END()
Signed-off-by: Fernando Ramos greenfoo@u92.eu
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 13 +++-- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 50 +++++++++---------- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 23 +++++---- 3 files changed, 46 insertions(+), 40 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 7a7316731911..55ecc4aa859f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -40,6 +40,7 @@ #include <drm/drm_fb_helper.h> #include <drm/drm_fourcc.h> #include <drm/drm_vblank.h> +#include <drm/drm_drv.h>
static void amdgpu_display_flip_callback(struct dma_fence *f, struct dma_fence_cb *cb) @@ -1543,16 +1544,18 @@ int amdgpu_display_suspend_helper(struct amdgpu_device *adev) struct drm_crtc *crtc; struct drm_connector *connector; struct drm_connector_list_iter iter;
- struct drm_modeset_acquire_ctx ctx; int r;
- int ret;
Relocate ret with r please
/* turn off display hw */
- drm_modeset_lock_all(dev);
- DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_connector_list_iter_begin(dev, &iter); drm_for_each_connector_iter(connector, &iter) drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); drm_connector_list_iter_end(&iter);
- drm_modeset_unlock_all(dev);
- DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
You should check ret here
/* unpin the front buffers and cursors */ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc); @@ -1590,7 +1593,9 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev) struct drm_connector *connector; struct drm_connector_list_iter iter; struct drm_crtc *crtc;
- struct drm_modeset_acquire_ctx ctx; int r;
- int ret;
Relocate ret with r
/* pin cursors */ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { @@ -1612,7 +1617,7 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev) drm_helper_resume_force_mode(dev);
/* turn on display hw */
- drm_modeset_lock_all(dev);
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
drm_connector_list_iter_begin(dev, &iter); drm_for_each_connector_iter(connector, &iter)
@@ -1620,7 +1625,7 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev) DRM_MODE_DPMS_ON); drm_connector_list_iter_end(&iter);
- drm_modeset_unlock_all(dev);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
return 0;
Return ret
} diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 9b1fc54555ee..5196c1d26f87 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -80,6 +80,7 @@ #include <drm/drm_edid.h> #include <drm/drm_vblank.h> #include <drm/drm_audio_component.h> +#include <drm/drm_drv.h>
#if defined(CONFIG_DRM_AMD_DC_DCN) #include "ivsrcid/dcn/irqsrcs_dcn_1_0.h" @@ -2621,6 +2622,9 @@ static void handle_hpd_irq(void *param) #ifdef CONFIG_DRM_AMD_DC_HDCP struct dm_connector_state *dm_con_state = to_dm_connector_state(connector->state); #endif
struct drm_modeset_acquire_ctx ctx;
int ret;
if (adev->dm.disable_hpd_irq) return;
@@ -2646,14 +2650,6 @@ static void handle_hpd_irq(void *param) if (aconnector->base.force && new_connection_type == dc_connection_none) { emulated_link_detect(aconnector->dc_link);
drm_modeset_lock_all(dev);dm_restore_drm_connector_state(dev, connector);drm_modeset_unlock_all(dev);if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)drm_kms_helper_hotplug_event(dev);- } else if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD)) { if (new_connection_type == dc_connection_none && aconnector->dc_link->type == dc_connection_none)
@@ -2661,13 +2657,18 @@ static void handle_hpd_irq(void *param)
amdgpu_dm_update_connector_after_detect(aconnector);
drm_modeset_lock_all(dev);dm_restore_drm_connector_state(dev, connector);drm_modeset_unlock_all(dev);if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)drm_kms_helper_hotplug_event(dev);
- } else {
goto out;- DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
- dm_restore_drm_connector_state(dev, connector);
- DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
Check ret here please
- if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
drm_kms_helper_hotplug_event(dev);+out: mutex_unlock(&aconnector->hpd_lock);
} @@ -2756,12 +2757,14 @@ static void handle_hpd_rx_irq(void *param) struct drm_connector *connector = &aconnector->base; struct drm_device *dev = connector->dev; struct dc_link *dc_link = aconnector->dc_link;
struct drm_modeset_acquire_ctx ctx; bool is_mst_root_connector = aconnector->mst_mgr.mst_state; bool result = false; enum dc_connection_type new_connection_type = dc_connection_none; struct amdgpu_device *adev = drm_to_adev(dev); union hpd_irq_data hpd_irq_data; bool lock_flag = 0;
int ret;
memset(&hpd_irq_data, 0, sizeof(hpd_irq_data));
@@ -2828,12 +2831,6 @@ static void handle_hpd_rx_irq(void *param)
amdgpu_dm_update_connector_after_detect(aconnector);
drm_modeset_lock_all(dev);dm_restore_drm_connector_state(dev, connector);drm_modeset_unlock_all(dev);drm_kms_helper_hotplug_event(dev);} else if (dc_link_detect(dc_link, DETECT_REASON_HPDRX)) {
if (aconnector->fake_enable)@@ -2841,14 +2838,17 @@ static void handle_hpd_rx_irq(void *param)
amdgpu_dm_update_connector_after_detect(aconnector);
} else {goto finish;
You used 'out' above and 'finish' here. It would be nice to be consistent with naming, I see 'out' a lot more than 'finish', so my vote would be to change this label to 'out'.
}
drm_modeset_lock_all(dev);dm_restore_drm_connector_state(dev, connector);drm_modeset_unlock_all(dev);
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);dm_restore_drm_connector_state(dev, connector);DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
Check ret here?
drm_kms_helper_hotplug_event(dev);}
drm_kms_helper_hotplug_event(dev);+finish: #ifdef CONFIG_DRM_AMD_DC_HDCP if (hpd_irq_data.bytes.device_service_irq.bits.CP_IRQ) { if (adev->dm.hdcp_workqueue) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c index 87daa78a32b8..6e5a8f4fc6bd 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c @@ -37,6 +37,8 @@ #include "link_hwss.h" #include "dc/dc_dmub_srv.h"
+#include <drm/drm_drv.h>
Top-level headers generally come above the driver headers. Also, now that I think about this a bit more, all of the new includes in this set should probably be for 'drm_modeset_lock.h' instead of 'drm_drv.h'.
struct dmub_debugfs_trace_header { uint32_t entry_count; uint32_t reserved[3]; @@ -1191,12 +1193,14 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf, struct drm_connector *connector = &aconnector->base; struct dc_link *link = NULL; struct drm_device *dev = connector->dev;
struct drm_modeset_acquire_ctx ctx; enum dc_connection_type new_connection_type = dc_connection_none; char *wr_buf = NULL; uint32_t wr_buf_size = 42; int max_param_num = 1; long param[1] = {0}; uint8_t param_nums = 0;
int ret;
if (!aconnector || !aconnector->dc_link) return -EINVAL;
@@ -1236,12 +1240,6 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf, goto unlock;
amdgpu_dm_update_connector_after_detect(aconnector);
drm_modeset_lock_all(dev);dm_restore_drm_connector_state(dev, connector);drm_modeset_unlock_all(dev);drm_kms_helper_hotplug_event(dev);@@ -1259,13 +1257,16 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf,
amdgpu_dm_update_connector_after_detect(aconnector);
drm_modeset_lock_all(dev);dm_restore_drm_connector_state(dev, connector);drm_modeset_unlock_all(dev);drm_kms_helper_hotplug_event(dev);
} else {
goto unlock;}
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
dm_restore_drm_connector_state(dev, connector);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
Check ret here?
- drm_kms_helper_hotplug_event(dev);
unlock: mutex_unlock(&aconnector->hpd_lock);
-- 2.33.0