From 7dfbba1e1a9d0f52092e7791406970a1234eb8be Mon Sep 17 00:00:00 2001
From: Sean Paul <seanpaul@chromium.org>
Date: Sat, 2 Oct 2021 11:45:28 -0400
Subject: Revert "drm/amd: cleanup: drm_modeset_lock_all() -->
DRM_MODESET_LOCK_ALL_BEGIN()"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Git-commit: 6f67e6fd4dc022265fb1b7bb26ef955d8d9e6540
Patch-mainline: v5.16-rc1
References: jsc#PED-1166 jsc#PED-1168 jsc#PED-1170 jsc#PED-1218 jsc#PED-1220 jsc#PED-1222 jsc#PED-1223 jsc#PED-1225
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
Acked-by: Patrik Jakobsson <pjakobsson@suse.de>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 21 ++++------
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 41 ++++++++-----------
.../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 25 +++++------
3 files changed, 35 insertions(+), 52 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 0ea7bdbc8482..dc50c05f23fc 100644
--- 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)
@@ -1575,21 +1574,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);
@@ -1627,8 +1621,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) {
@@ -1650,7 +1643,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)
@@ -1658,8 +1651,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 83aeb1442ebb..f35561b5a465 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -81,7 +81,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"
@@ -2907,8 +2906,6 @@ static void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector)
struct amdgpu_device *adev = drm_to_adev(dev);
struct dm_connector_state *dm_con_state = to_dm_connector_state(connector->state);
struct dm_crtc_state *dm_crtc_state = NULL;
- struct drm_modeset_acquire_ctx ctx;
- int ret;
if (adev->dm.disable_hpd_irq)
return;
@@ -2953,18 +2950,13 @@ static void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector)
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);
}
@@ -3080,7 +3072,6 @@ 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;
@@ -3090,7 +3081,6 @@ static void handle_hpd_rx_irq(void *param)
bool has_left_work = false;
int idx = aconnector->base.index;
struct hpd_rx_irq_offload_work_queue *offload_wq = &adev->dm.hpd_rx_offload_wq[idx];
- int ret;
memset(&hpd_irq_data, 0, sizeof(hpd_irq_data));
@@ -3154,6 +3144,12 @@ 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)
@@ -3161,17 +3157,14 @@ static void handle_hpd_rx_irq(void *param)
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 bbd6a7a736a5..d2f4b3e670d6 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
@@ -24,7 +24,6 @@
*/
#include <linux/uaccess.h>
-#include <drm/drm_drv.h>
#include "dc.h"
#include "amdgpu.h"
@@ -1193,14 +1192,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;
@@ -1240,6 +1237,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;
@@ -1257,18 +1260,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);
--
2.38.1