Commit 1f9e2f44 authored by Sean Paul's avatar Sean Paul
Browse files

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



This reverts commit 4f9e860e.

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-3-sean@poorly.run
parent 6f67e6fd

drivers/gpu/drm/gma500/psb_device.c

+6 −12
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/backlight.h>



#include <drm/drm.h>

#include <drm/drm_drv.h>



#include "gma_device.h"

#include "intel_bios.h"
@@ -170,10 +169,8 @@ static int psb_save_display_registers(struct drm_device *dev) 
{

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct drm_crtc *crtc;

	struct drm_modeset_acquire_ctx ctx;

	struct gma_connector *connector;

	struct psb_state *regs = &dev_priv->regs.psb;

	int ret;



	/* Display arbitration control + watermarks */

	regs->saveDSPARB = PSB_RVDC32(DSPARB);
@@ -186,7 +183,7 @@ static int psb_save_display_registers(struct drm_device *dev) 
	regs->saveCHICKENBIT = PSB_RVDC32(DSPCHICKENBIT);



	/* Save crtc and output state */

	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);

	drm_modeset_lock_all(dev);

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

		if (drm_helper_crtc_in_use(crtc))

			dev_priv->ops->save_crtc(crtc);
@@ -196,9 +193,8 @@ static int psb_save_display_registers(struct drm_device *dev) 
		if (connector->save)

			connector->save(&connector->base);



	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);



	return ret;

	drm_modeset_unlock_all(dev);

	return 0;

}



/**
@@ -211,10 +207,8 @@ static int psb_restore_display_registers(struct drm_device *dev) 
{

	struct drm_psb_private *dev_priv = to_drm_psb_private(dev);

	struct drm_crtc *crtc;

	struct drm_modeset_acquire_ctx ctx;

	struct gma_connector *connector;

	struct psb_state *regs = &dev_priv->regs.psb;

	int ret;



	/* Display arbitration + watermarks */

	PSB_WVDC32(regs->saveDSPARB, DSPARB);
@@ -229,7 +223,7 @@ static int psb_restore_display_registers(struct drm_device *dev) 
	/*make sure VGA plane is off. it initializes to on after reset!*/

	PSB_WVDC32(0x80000000, VGACNTRL);



	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);

	drm_modeset_lock_all(dev);

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

		if (drm_helper_crtc_in_use(crtc))

			dev_priv->ops->restore_crtc(crtc);
@@ -238,8 +232,8 @@ static int psb_restore_display_registers(struct drm_device *dev) 
		if (connector->restore)

			connector->restore(&connector->base);



	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);

	return ret;

	drm_modeset_unlock_all(dev);

	return 0;

}



static int psb_power_down(struct drm_device *dev)