Revert "drm/amd: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()"

This reverts commit 299f040e855b69c29522cde446777902381a07f5.

This patchset breaks on intel platforms and was previously NACK'd by
Ville.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Fernando Ramos <greenfoo@u92.eu>
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211002154542.15800-2-sean@poorly.run

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index b07e845a2600a0a9b45c96d375ce62502b55631c..7a731673191168bee5042115b729812a35607d20 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -40,7 +40,6 @@
 #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)
@@ -1544,21 +1543,16 @@ 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, ret;
+       int r;
 
        /* turn off display hw */
-       DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
+       drm_modeset_lock_all(dev);
        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_LOCK_ALL_END(dev, ctx, ret);
-
-       if (ret)
-               return ret;
-
+       drm_modeset_unlock_all(dev);
        /* 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);
@@ -1596,8 +1590,7 @@ 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, ret;
+       int r;
 
        /* pin cursors */
        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -1619,7 +1612,7 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
        drm_helper_resume_force_mode(dev);
 
        /* turn on display hw */
-       DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
+       drm_modeset_lock_all(dev);
 
        drm_connector_list_iter_begin(dev, &iter);
        drm_for_each_connector_iter(connector, &iter)
@@ -1627,8 +1620,8 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
                                          DRM_MODE_DPMS_ON);
        drm_connector_list_iter_end(&iter);
 
-       DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+       drm_modeset_unlock_all(dev);
 
-       return ret;
+       return 0;
 }
 

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 5196c1d26f87005f7391539a042a19478dc325eb..9b1fc54555ee63130dcbaf49f2750ddf325cfae7 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -80,7 +80,6 @@
 #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"
@@ -2622,9 +2621,6 @@ 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;
@@ -2650,6 +2646,14 @@ 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)
@@ -2657,18 +2661,13 @@ static void handle_hpd_irq(void *param)
 
                amdgpu_dm_update_connector_after_detect(aconnector);
 
-       } 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);
-
-       if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
-               drm_kms_helper_hotplug_event(dev);
+               drm_modeset_lock_all(dev);
+               dm_restore_drm_connector_state(dev, connector);
+               drm_modeset_unlock_all(dev);
 
-out:
+               if (aconnector->base.force == DRM_FORCE_UNSPECIFIED)
+                       drm_kms_helper_hotplug_event(dev);
+       }
        mutex_unlock(&aconnector->hpd_lock);
 
 }
@@ -2757,14 +2756,12 @@ 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));
 
@@ -2831,6 +2828,12 @@ out:
 
                        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)
@@ -2838,17 +2841,14 @@ out:
 
                        amdgpu_dm_update_connector_after_detect(aconnector);
 
-               } else {
-                       goto finish;
-               }
 
-               DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
-               dm_restore_drm_connector_state(dev, connector);
-               DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+                       drm_modeset_lock_all(dev);
+                       dm_restore_drm_connector_state(dev, connector);
+                       drm_modeset_unlock_all(dev);
 
-               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 fb7b56fa26730cea364a175b27babdb2fe5d4995..87daa78a32b8bd4071a3ebdc59476abefc4074d0 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
@@ -24,7 +24,6 @@
  */
 
 #include <linux/uaccess.h>
-#include <drm/drm_drv.h>
 
 #include "dc.h"
 #include "amdgpu.h"
@@ -1192,14 +1191,12 @@ 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;
@@ -1239,6 +1236,12 @@ 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);
        } else if (param[0] == 0) {
                if (!aconnector->dc_link)
                        goto unlock;
@@ -1256,18 +1259,12 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf,
 
                amdgpu_dm_update_connector_after_detect(aconnector);
 
-       } 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);
-
-       if (ret)
-               return ret;
+               drm_modeset_lock_all(dev);
+               dm_restore_drm_connector_state(dev, connector);
+               drm_modeset_unlock_all(dev);
 
-       drm_kms_helper_hotplug_event(dev);
+               drm_kms_helper_hotplug_event(dev);
+       }
 
 unlock:
        mutex_unlock(&aconnector->hpd_lock);