Commit d91a342e authored by Sean Paul's avatar Sean Paul

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

This reverts commit 26723c3d.

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211002154542.15800-9-sean@poorly.run
parent ff6c898f
......@@ -37,7 +37,6 @@
#include <drm/drm_cache.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_device.h>
#include <drm/drm_drv.h>
#include <drm/drm_file.h>
#include <drm/drm_probe_helper.h>
#include <drm/radeon_drm.h>
......@@ -1560,8 +1559,7 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,
struct pci_dev *pdev;
struct drm_crtc *crtc;
struct drm_connector *connector;
struct drm_modeset_acquire_ctx ctx;
int i, r, ret;
int i, r;
if (dev == NULL || dev->dev_private == NULL) {
return -ENODEV;
......@@ -1575,15 +1573,12 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,
drm_kms_helper_poll_disable(dev);
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
drm_modeset_lock_all(dev);
/* turn off display hw */
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
}
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) {
......@@ -1668,8 +1663,7 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
struct radeon_device *rdev = dev->dev_private;
struct pci_dev *pdev = to_pci_dev(dev->dev);
struct drm_crtc *crtc;
struct drm_modeset_acquire_ctx ctx;
int r, ret;
int r;
if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0;
......@@ -1747,14 +1741,11 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
if (fbcon) {
drm_helper_resume_force_mode(dev);
/* turn on display hw */
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
drm_modeset_lock_all(dev);
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
}
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
if (ret)
return ret;
drm_modeset_unlock_all(dev);
}
drm_kms_helper_poll_enable(dev);
......
......@@ -4,7 +4,6 @@
#include <drm/drm_fb_helper.h>
#include <drm/drm_file.h>
#include <drm/drm_probe_helper.h>
#include <drm/drm_drv.h>
#include "atom.h"
#include "ni_reg.h"
......@@ -738,12 +737,11 @@ static int radeon_debugfs_mst_info_show(struct seq_file *m, void *unused)
struct radeon_device *rdev = (struct radeon_device *)m->private;
struct drm_device *dev = rdev->ddev;
struct drm_connector *connector;
struct drm_modeset_acquire_ctx ctx;
struct radeon_connector *radeon_connector;
struct radeon_connector_atom_dig *dig_connector;
int i, ret;
int i;
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
drm_modeset_lock_all(dev);
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)
continue;
......@@ -761,8 +759,8 @@ static int radeon_debugfs_mst_info_show(struct seq_file *m, void *unused)
radeon_connector->cur_stream_attribs[i].fe,
radeon_connector->cur_stream_attribs[i].slots);
}
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
return ret;
drm_modeset_unlock_all(dev);
return 0;
}
DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_mst_info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment