leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 746826bcf8.

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-5-sean@poorly.run
This commit is contained in:
Sean Paul
2021-10-02 11:45:31 -04:00
parent 91a8fb071f
commit 077b319146
6 changed files with 32 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/i915/display/intel_audio.c
View File

@@ -26,7 +26,6 @@
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <drm/i915_component.h> #include <drm/i915_component.h>
#include <drm/drm_drv.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_atomic.h" #include "intel_atomic.h"
@@ -1215,8 +1214,7 @@ static int i915_audio_component_bind(struct device *i915_kdev,
{ {
struct i915_audio_component *acomp = data; struct i915_audio_component *acomp = data;
struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev); struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);
struct drm_modeset_acquire_ctx ctx; int i;
int i, ret;
if (drm_WARN_ON(&dev_priv->drm, acomp->base.ops || acomp->base.dev)) if (drm_WARN_ON(&dev_priv->drm, acomp->base.ops || acomp->base.dev))
return -EEXIST; return -EEXIST;
@@ -1226,16 +1224,16 @@ static int i915_audio_component_bind(struct device *i915_kdev,
DL_FLAG_STATELESS))) DL_FLAG_STATELESS)))
return -ENOMEM; return -ENOMEM;
DRM_MODESET_LOCK_ALL_BEGIN((&dev_priv->drm), ctx, 0, ret); drm_modeset_lock_all(&dev_priv->drm);
acomp->base.ops = &i915_audio_component_ops; acomp->base.ops = &i915_audio_component_ops;
acomp->base.dev = i915_kdev; acomp->base.dev = i915_kdev;
BUILD_BUG_ON(MAX_PORTS != I915_MAX_PORTS); BUILD_BUG_ON(MAX_PORTS != I915_MAX_PORTS);
for (i = 0; i < ARRAY_SIZE(acomp->aud_sample_rate); i++) for (i = 0; i < ARRAY_SIZE(acomp->aud_sample_rate); i++)
acomp->aud_sample_rate[i] = 0; acomp->aud_sample_rate[i] = 0;
dev_priv->audio_component = acomp; dev_priv->audio_component = acomp;
DRM_MODESET_LOCK_ALL_END((&dev_priv->drm), ctx, ret); drm_modeset_unlock_all(&dev_priv->drm);
return ret; return 0;
} }
static void i915_audio_component_unbind(struct device *i915_kdev, static void i915_audio_component_unbind(struct device *i915_kdev,
@@ -1243,14 +1241,12 @@ static void i915_audio_component_unbind(struct device *i915_kdev,
{ {
struct i915_audio_component *acomp = data; struct i915_audio_component *acomp = data;
struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev); struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);
struct drm_modeset_acquire_ctx ctx;
int ret;
DRM_MODESET_LOCK_ALL_BEGIN((&dev_priv->drm), ctx, 0, ret); drm_modeset_lock_all(&dev_priv->drm);
acomp->base.ops = NULL; acomp->base.ops = NULL;
acomp->base.dev = NULL; acomp->base.dev = NULL;
dev_priv->audio_component = NULL; dev_priv->audio_component = NULL;
DRM_MODESET_LOCK_ALL_END((&dev_priv->drm), ctx, ret); drm_modeset_unlock_all(&dev_priv->drm);
device_link_remove(hda_kdev, i915_kdev); device_link_remove(hda_kdev, i915_kdev);

5
drivers/gpu/drm/i915/display/intel_display.c
View File

@@ -12512,7 +12512,6 @@ cleanup_bios:
int intel_modeset_init_nogem(struct drm_i915_private *i915) int intel_modeset_init_nogem(struct drm_i915_private *i915)
{ {
struct drm_device *dev = &i915->drm; struct drm_device *dev = &i915->drm;
struct drm_modeset_acquire_ctx ctx;
enum pipe pipe; enum pipe pipe;
struct intel_crtc *crtc; struct intel_crtc *crtc;
int ret; int ret;
@@ -12564,9 +12563,9 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)
intel_vga_disable(i915); intel_vga_disable(i915);
intel_setup_outputs(i915); intel_setup_outputs(i915);
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
intel_modeset_setup_hw_state(dev, dev->mode_config.acquire_ctx); intel_modeset_setup_hw_state(dev, dev->mode_config.acquire_ctx);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
for_each_intel_crtc(dev, crtc) { for_each_intel_crtc(dev, crtc) {
struct intel_initial_plane_config plane_config = {}; struct intel_initial_plane_config plane_config = {};

46
drivers/gpu/drm/i915/display/intel_display_debugfs.c
View File

@@ -5,7 +5,6 @@
#include <drm/drm_debugfs.h> #include <drm/drm_debugfs.h>
#include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h>
#include <drm/drm_drv.h>
#include "i915_debugfs.h" #include "i915_debugfs.h"
#include "intel_display_debugfs.h" #include "intel_display_debugfs.h"
@@ -1058,13 +1057,11 @@ static int i915_display_info(struct seq_file *m, void *unused)
struct intel_crtc *crtc; struct intel_crtc *crtc;
struct drm_connector *connector; struct drm_connector *connector;
struct drm_connector_list_iter conn_iter; struct drm_connector_list_iter conn_iter;
struct drm_modeset_acquire_ctx ctx;
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
int ret;
wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm); wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
seq_printf(m, "CRTC info\n"); seq_printf(m, "CRTC info\n");
seq_printf(m, "---------\n"); seq_printf(m, "---------\n");
@@ -1079,21 +1076,20 @@ static int i915_display_info(struct seq_file *m, void *unused)
intel_connector_info(m, connector); intel_connector_info(m, connector);
drm_connector_list_iter_end(&conn_iter); drm_connector_list_iter_end(&conn_iter);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref); intel_runtime_pm_put(&dev_priv->runtime_pm, wakeref);
return ret; return 0;
} }
static int i915_shared_dplls_info(struct seq_file *m, void *unused) static int i915_shared_dplls_info(struct seq_file *m, void *unused)
{ {
struct drm_i915_private *dev_priv = node_to_i915(m->private); struct drm_i915_private *dev_priv = node_to_i915(m->private);
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct drm_modeset_acquire_ctx ctx; int i;
int i, ret;
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
seq_printf(m, "PLL refclks: non-SSC: %d kHz, SSC: %d kHz\n", seq_printf(m, "PLL refclks: non-SSC: %d kHz, SSC: %d kHz\n",
dev_priv->dpll.ref_clks.nssc, dev_priv->dpll.ref_clks.nssc,
@@ -1136,9 +1132,9 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)
seq_printf(m, " mg_pll_tdc_coldst_bias: 0x%08x\n", seq_printf(m, " mg_pll_tdc_coldst_bias: 0x%08x\n",
pll->state.hw_state.mg_pll_tdc_coldst_bias); pll->state.hw_state.mg_pll_tdc_coldst_bias);
} }
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
return ret; return 0;
} }
static int i915_ipc_status_show(struct seq_file *m, void *data) static int i915_ipc_status_show(struct seq_file *m, void *data)
@@ -1197,15 +1193,13 @@ static int i915_ddb_info(struct seq_file *m, void *unused)
{ {
struct drm_i915_private *dev_priv = node_to_i915(m->private); struct drm_i915_private *dev_priv = node_to_i915(m->private);
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct drm_modeset_acquire_ctx ctx;
struct skl_ddb_entry *entry; struct skl_ddb_entry *entry;
struct intel_crtc *crtc; struct intel_crtc *crtc;
int ret;
if (DISPLAY_VER(dev_priv) < 9) if (DISPLAY_VER(dev_priv) < 9)
return -ENODEV; return -ENODEV;
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
seq_printf(m, "%-15s%8s%8s%8s\n", "", "Start", "End", "Size"); seq_printf(m, "%-15s%8s%8s%8s\n", "", "Start", "End", "Size");
@@ -1229,9 +1223,9 @@ static int i915_ddb_info(struct seq_file *m, void *unused)
entry->end, skl_ddb_entry_size(entry)); entry->end, skl_ddb_entry_size(entry));
} }
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
return ret; return 0;
} }
static void drrs_status_per_crtc(struct seq_file *m, static void drrs_status_per_crtc(struct seq_file *m,
@@ -1309,12 +1303,10 @@ static int i915_drrs_status(struct seq_file *m, void *unused)
{ {
struct drm_i915_private *dev_priv = node_to_i915(m->private); struct drm_i915_private *dev_priv = node_to_i915(m->private);
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct drm_modeset_acquire_ctx ctx;
struct intel_crtc *crtc; struct intel_crtc *crtc;
int active_crtc_cnt = 0; int active_crtc_cnt = 0;
int ret;
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
for_each_intel_crtc(dev, crtc) { for_each_intel_crtc(dev, crtc) {
if (crtc->base.state->active) { if (crtc->base.state->active) {
active_crtc_cnt++; active_crtc_cnt++;
@@ -1323,7 +1315,7 @@ static int i915_drrs_status(struct seq_file *m, void *unused)
drrs_status_per_crtc(m, dev, crtc); drrs_status_per_crtc(m, dev, crtc);
} }
} }
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
if (!active_crtc_cnt) if (!active_crtc_cnt)
seq_puts(m, "No active crtc found\n"); seq_puts(m, "No active crtc found\n");
@@ -1615,10 +1607,8 @@ static void wm_latency_show(struct seq_file *m, const u16 wm[8])
{ {
struct drm_i915_private *dev_priv = m->private; struct drm_i915_private *dev_priv = m->private;
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct drm_modeset_acquire_ctx ctx;
int level; int level;
int num_levels; int num_levels;
int ret;
if (IS_CHERRYVIEW(dev_priv)) if (IS_CHERRYVIEW(dev_priv))
num_levels = 3; num_levels = 3;
@@ -1629,7 +1619,7 @@ static void wm_latency_show(struct seq_file *m, const u16 wm[8])
else else
num_levels = ilk_wm_max_level(dev_priv) + 1; num_levels = ilk_wm_max_level(dev_priv) + 1;
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
for (level = 0; level < num_levels; level++) { for (level = 0; level < num_levels; level++) {
unsigned int latency = wm[level]; unsigned int latency = wm[level];
@@ -1650,7 +1640,7 @@ static void wm_latency_show(struct seq_file *m, const u16 wm[8])
level, wm[level], latency / 10, latency % 10); level, wm[level], latency / 10, latency % 10);
} }
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
} }
static int pri_wm_latency_show(struct seq_file *m, void *data) static int pri_wm_latency_show(struct seq_file *m, void *data)
@@ -1734,7 +1724,6 @@ static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,
struct seq_file *m = file->private_data; struct seq_file *m = file->private_data;
struct drm_i915_private *dev_priv = m->private; struct drm_i915_private *dev_priv = m->private;
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct drm_modeset_acquire_ctx ctx;
u16 new[8] = { 0 }; u16 new[8] = { 0 };
int num_levels; int num_levels;
int level; int level;
@@ -1764,15 +1753,12 @@ static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,
if (ret != num_levels) if (ret != num_levels)
return -EINVAL; return -EINVAL;
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
for (level = 0; level < num_levels; level++) for (level = 0; level < num_levels; level++)
wm[level] = new[level]; wm[level] = new[level];
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
if (ret)
return ret;
return len; return len;
} }

6
drivers/gpu/drm/i915/display/intel_overlay.c
View File

@@ -27,7 +27,6 @@
*/ */
#include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h>
#include <drm/drm_drv.h>
#include "gem/i915_gem_pm.h" #include "gem/i915_gem_pm.h"
#include "gt/intel_gpu_commands.h" #include "gt/intel_gpu_commands.h"
@@ -1264,7 +1263,6 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
{ {
struct drm_intel_overlay_attrs *attrs = data; struct drm_intel_overlay_attrs *attrs = data;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
struct drm_modeset_acquire_ctx ctx;
struct intel_overlay *overlay; struct intel_overlay *overlay;
int ret; int ret;
@@ -1274,7 +1272,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
return -ENODEV; return -ENODEV;
} }
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
ret = -EINVAL; ret = -EINVAL;
if (!(attrs->flags & I915_OVERLAY_UPDATE_ATTRS)) { if (!(attrs->flags & I915_OVERLAY_UPDATE_ATTRS)) {
@@ -1331,7 +1329,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,
ret = 0; ret = 0;
out_unlock: out_unlock:
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
return ret; return ret;
} }

7
drivers/gpu/drm/i915/display/intel_pipe_crc.c
View File

@@ -29,8 +29,6 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <drm/drm_drv.h>
#include "intel_atomic.h" #include "intel_atomic.h"
#include "intel_de.h" #include "intel_de.h"
#include "intel_display_types.h" #include "intel_display_types.h"
@@ -78,7 +76,6 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,
enum intel_pipe_crc_source *source) enum intel_pipe_crc_source *source)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct drm_modeset_acquire_ctx ctx;
struct intel_encoder *encoder; struct intel_encoder *encoder;
struct intel_crtc *crtc; struct intel_crtc *crtc;
struct intel_digital_port *dig_port; struct intel_digital_port *dig_port;
@@ -86,7 +83,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,
*source = INTEL_PIPE_CRC_SOURCE_PIPE; *source = INTEL_PIPE_CRC_SOURCE_PIPE;
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
for_each_intel_encoder(dev, encoder) { for_each_intel_encoder(dev, encoder) {
if (!encoder->base.crtc) if (!encoder->base.crtc)
continue; continue;
@@ -123,7 +120,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,
break; break;
} }
} }
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
return ret; return ret;
} }

13
drivers/gpu/drm/i915/i915_drv.c
View File

@@ -44,7 +44,6 @@
#include <drm/drm_ioctl.h> #include <drm/drm_ioctl.h>
#include <drm/drm_managed.h> #include <drm/drm_managed.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
#include <drm/drm_drv.h>
#include "display/intel_acpi.h" #include "display/intel_acpi.h"
#include "display/intel_bw.h" #include "display/intel_bw.h"
@@ -1010,35 +1009,31 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)
static void intel_suspend_encoders(struct drm_i915_private *dev_priv) static void intel_suspend_encoders(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct drm_modeset_acquire_ctx ctx;
struct intel_encoder *encoder; struct intel_encoder *encoder;
int ret;
if (!HAS_DISPLAY(dev_priv)) if (!HAS_DISPLAY(dev_priv))
return; return;
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
for_each_intel_encoder(dev, encoder) for_each_intel_encoder(dev, encoder)
if (encoder->suspend) if (encoder->suspend)
encoder->suspend(encoder); encoder->suspend(encoder);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
} }
static void intel_shutdown_encoders(struct drm_i915_private *dev_priv) static void intel_shutdown_encoders(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct drm_modeset_acquire_ctx ctx;
struct intel_encoder *encoder; struct intel_encoder *encoder;
int ret;
if (!HAS_DISPLAY(dev_priv)) if (!HAS_DISPLAY(dev_priv))
return; return;
DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); drm_modeset_lock_all(dev);
for_each_intel_encoder(dev, encoder) for_each_intel_encoder(dev, encoder)
if (encoder->shutdown) if (encoder->shutdown)
encoder->shutdown(encoder); encoder->shutdown(encoder);
DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); drm_modeset_unlock_all(dev);
} }
void i915_driver_shutdown(struct drm_i915_private *i915) void i915_driver_shutdown(struct drm_i915_private *i915)