From: Sean Paul <sean@poorly.run>
To: dri-devel@lists.freedesktop.org
Cc: "Sean Paul" <seanpaul@chromium.org>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Fernando Ramos" <greenfoo@u92.eu>
Subject: [PATCH 03/16] Revert "drm/gma500: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()"
Date: Sat, 2 Oct 2021 11:45:29 -0400 [thread overview]
Message-ID: <20211002154542.15800-3-sean@poorly.run> (raw)
In-Reply-To: <20211002154542.15800-1-sean@poorly.run>
From: Sean Paul <seanpaul@chromium.org>
This reverts commit 4f9e860e6ad65ff4ea8ce165a1407d96ff1b2211.
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>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
drivers/gpu/drm/gma500/psb_device.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
index 021a7238508f..3030f18ba022 100644
--- a/drivers/gpu/drm/gma500/psb_device.c
+++ b/drivers/gpu/drm/gma500/psb_device.c
@@ -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)
--
Sean Paul, Software Engineer, Google / Chromium OS
next prev parent reply other threads:[~2021-10-02 15:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-02 15:45 [PATCH 01/16] Revert "drm: cleanup: remove drm_modeset_(un)lock_all()" Sean Paul
2021-10-02 15:45 ` [PATCH 02/16] Revert "drm/amd: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()" Sean Paul
2021-10-02 15:45 ` Sean Paul [this message]
2021-10-02 15:45 ` [PATCH 04/16] Revert "drm/i915: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() part 2" Sean Paul
2021-10-02 15:45 ` [PATCH 05/16] Revert "drm/i915: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()" Sean Paul
2021-10-02 15:45 ` [PATCH 06/16] Revert "drm/msm: " Sean Paul
2021-10-02 15:45 ` [PATCH 07/16] Revert "drm/nouveau: " Sean Paul
2021-10-02 15:45 ` [PATCH 08/16] Revert "drm/omapdrm: " Sean Paul
2021-10-02 15:45 ` [PATCH 09/16] Revert "drm/radeon: " Sean Paul
2021-10-02 15:45 ` [PATCH 10/16] Revert "drm/shmobile: " Sean Paul
2021-10-02 15:45 ` [PATCH 11/16] Revert "drm/tegra: " Sean Paul
2021-10-02 15:45 ` [PATCH 12/16] Revert "drm/vmwgfx: " Sean Paul
2021-10-02 15:45 ` [PATCH 13/16] Revert "drm: " Sean Paul
2021-10-02 15:45 ` [PATCH 14/16] Revert "drm/msm: cleanup: drm_modeset_lock_all_ctx() " Sean Paul
2021-10-02 15:45 ` [PATCH 15/16] Revert "drm/i915: " Sean Paul
2021-10-04 9:41 ` Ville Syrjälä
2021-10-04 15:56 ` Sean Paul
2021-10-04 20:31 ` Fernando Ramos
2021-10-13 11:49 ` Daniel Vetter
2021-10-02 15:45 ` [PATCH 16/16] Revert "drm: " Sean Paul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211002154542.15800-3-sean@poorly.run \
--to=sean@poorly.run \
--cc=dri-devel@lists.freedesktop.org \
--cc=greenfoo@u92.eu \
--cc=seanpaul@chromium.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox