Commit d91a342e authored by Sean Paul's avatar Sean Paul
Browse files

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

drivers/gpu/drm/radeon/radeon_device.c

+6 −15
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <drm/drm_cache.h>

#include <drm/drm_cache.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_device.h>

#include <drm/drm_device.h>

#include <drm/drm_drv.h>

#include <drm/drm_file.h>

#include <drm/drm_file.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/radeon_drm.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 pci_dev *pdev;

	struct drm_crtc *crtc;

	struct drm_crtc *crtc;

	struct drm_connector *connector;

	struct drm_connector *connector;

	struct drm_modeset_acquire_ctx ctx;

	int i, r;

	int i, r, ret;





	if (dev == NULL || dev->dev_private == NULL) {

	if (dev == NULL || dev->dev_private == NULL) {

		return -ENODEV;

		return -ENODEV;
@@ -1575,15 +1573,12 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, 




	drm_kms_helper_poll_disable(dev);

	drm_kms_helper_poll_disable(dev);





	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);

	drm_modeset_lock_all(dev);

	/* turn off display hw */

	/* turn off display hw */

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);

		drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);

	}

	}

	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

	drm_modeset_unlock_all(dev);



	if (ret)

		return ret;





	/* unpin the front buffers and cursors */

	/* unpin the front buffers and cursors */

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

	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 radeon_device *rdev = dev->dev_private;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct drm_crtc *crtc;

	struct drm_crtc *crtc;

	struct drm_modeset_acquire_ctx ctx;

	int r;

	int r, ret;





	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)

	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;

		return 0;
@@ -1747,14 +1741,11 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon) 
	if (fbcon) {

	if (fbcon) {

		drm_helper_resume_force_mode(dev);

		drm_helper_resume_force_mode(dev);

		/* turn on display hw */

		/* 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) {

		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);

			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);

		}

		}

		DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

		drm_modeset_unlock_all(dev);



		if (ret)

			return ret;

	}

	}





	drm_kms_helper_poll_enable(dev);

	drm_kms_helper_poll_enable(dev);

drivers/gpu/drm/radeon/radeon_dp_mst.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <drm/drm_fb_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_file.h>

#include <drm/drm_file.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_drv.h>





#include "atom.h"

#include "atom.h"

#include "ni_reg.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 radeon_device *rdev = (struct radeon_device *)m->private;

	struct drm_device *dev = rdev->ddev;

	struct drm_device *dev = rdev->ddev;

	struct drm_connector *connector;

	struct drm_connector *connector;

	struct drm_modeset_acquire_ctx ctx;

	struct radeon_connector *radeon_connector;

	struct radeon_connector *radeon_connector;

	struct radeon_connector_atom_dig *dig_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) {

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)

		if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)

			continue;

			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].fe,

				   radeon_connector->cur_stream_attribs[i].slots);

				   radeon_connector->cur_stream_attribs[i].slots);

	}

	}

	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

	drm_modeset_unlock_all(dev);

	return ret;

	return 0;

}

}





DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_mst_info);

DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_mst_info);