aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-04-03 04:32:52 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-04-05 03:26:45 -0400
commitb260ac3ebef5eb748207cd542dba00af6c5caaa5 (patch)
tree083f1bfa3366408b58d05c17cf1f122dcab284c9
parentb95ff0319a829d5e707d64a3994c75f012f6b6ec (diff)
drm: Remove drm_modeset_legacy_acquire_ctx and crtc->acquire_ctx
With all the callers of drm_modeset_lock_crtc gone, and all the places it was formerly used properly wiring the acquire ctx through, we can remove this. The only hidden context magic we still have is now the global one. Reviewed-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170403083304.9083-4-daniel.vetter@ffwll.ch
-rw-r--r--drivers/gpu/drm/drm_atomic.c14
-rw-r--r--drivers/gpu/drm/drm_atomic_helper.c2
-rw-r--r--drivers/gpu/drm/drm_modeset_lock.c21
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
-rw-r--r--drivers/gpu/drm/i915/intel_pipe_crc.c2
-rw-r--r--include/drm/drm_crtc.h9
-rw-r--r--include/drm/drm_modeset_lock.h2
7 files changed, 4 insertions, 50 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 9b892af7811a..345310213820 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1516,19 +1516,9 @@ EXPORT_SYMBOL(drm_atomic_add_affected_planes);
1516void drm_atomic_legacy_backoff(struct drm_atomic_state *state) 1516void drm_atomic_legacy_backoff(struct drm_atomic_state *state)
1517{ 1517{
1518 struct drm_device *dev = state->dev; 1518 struct drm_device *dev = state->dev;
1519 unsigned crtc_mask = 0;
1520 struct drm_crtc *crtc;
1521 int ret; 1519 int ret;
1522 bool global = false; 1520 bool global = false;
1523 1521
1524 drm_for_each_crtc(crtc, dev) {
1525 if (crtc->acquire_ctx != state->acquire_ctx)
1526 continue;
1527
1528 crtc_mask |= drm_crtc_mask(crtc);
1529 crtc->acquire_ctx = NULL;
1530 }
1531
1532 if (WARN_ON(dev->mode_config.acquire_ctx == state->acquire_ctx)) { 1522 if (WARN_ON(dev->mode_config.acquire_ctx == state->acquire_ctx)) {
1533 global = true; 1523 global = true;
1534 1524
@@ -1542,10 +1532,6 @@ retry:
1542 if (ret) 1532 if (ret)
1543 goto retry; 1533 goto retry;
1544 1534
1545 drm_for_each_crtc(crtc, dev)
1546 if (drm_crtc_mask(crtc) & crtc_mask)
1547 crtc->acquire_ctx = state->acquire_ctx;
1548
1549 if (global) 1535 if (global)
1550 dev->mode_config.acquire_ctx = state->acquire_ctx; 1536 dev->mode_config.acquire_ctx = state->acquire_ctx;
1551} 1537}
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index c3994b4d5f32..3160d0881348 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2975,7 +2975,7 @@ int drm_atomic_helper_connector_dpms(struct drm_connector *connector,
2975 if (!state) 2975 if (!state)
2976 return -ENOMEM; 2976 return -ENOMEM;
2977 2977
2978 state->acquire_ctx = drm_modeset_legacy_acquire_ctx(crtc); 2978 state->acquire_ctx = crtc->dev->mode_config.acquire_ctx;
2979retry: 2979retry:
2980 crtc_state = drm_atomic_get_crtc_state(state, crtc); 2980 crtc_state = drm_atomic_get_crtc_state(state, crtc);
2981 if (IS_ERR(crtc_state)) { 2981 if (IS_ERR(crtc_state)) {
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index c3ca6b859236..64ef09a6cccb 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -149,27 +149,6 @@ void drm_modeset_unlock_all(struct drm_device *dev)
149EXPORT_SYMBOL(drm_modeset_unlock_all); 149EXPORT_SYMBOL(drm_modeset_unlock_all);
150 150
151/** 151/**
152 * drm_modeset_legacy_acquire_ctx - find acquire ctx for legacy ioctls
153 * @crtc: drm crtc
154 *
155 * Legacy ioctl operations like cursor updates or page flips only have per-crtc
156 * locking, and store the acquire ctx in the corresponding crtc. All other
157 * legacy operations take all locks and use a global acquire context. This
158 * function grabs the right one.
159 */
160struct drm_modeset_acquire_ctx *
161drm_modeset_legacy_acquire_ctx(struct drm_crtc *crtc)
162{
163 if (crtc->acquire_ctx)
164 return crtc->acquire_ctx;
165
166 WARN_ON(!crtc->dev->mode_config.acquire_ctx);
167
168 return crtc->dev->mode_config.acquire_ctx;
169}
170EXPORT_SYMBOL(drm_modeset_legacy_acquire_ctx);
171
172/**
173 * drm_warn_on_modeset_not_all_locked - check that all modeset locks are locked 152 * drm_warn_on_modeset_not_all_locked - check that all modeset locks are locked
174 * @dev: device 153 * @dev: device
175 * 154 *
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e27ea89efd67..84abff3f43d9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10715,7 +10715,7 @@ out_hang:
10715 state = drm_atomic_state_alloc(dev); 10715 state = drm_atomic_state_alloc(dev);
10716 if (!state) 10716 if (!state)
10717 return -ENOMEM; 10717 return -ENOMEM;
10718 state->acquire_ctx = drm_modeset_legacy_acquire_ctx(crtc); 10718 state->acquire_ctx = dev->mode_config.acquire_ctx;
10719 10719
10720retry: 10720retry:
10721 plane_state = drm_atomic_get_plane_state(state, primary); 10721 plane_state = drm_atomic_get_plane_state(state, primary);
@@ -13075,7 +13075,7 @@ void intel_crtc_restore_mode(struct drm_crtc *crtc)
13075 return; 13075 return;
13076 } 13076 }
13077 13077
13078 state->acquire_ctx = drm_modeset_legacy_acquire_ctx(crtc); 13078 state->acquire_ctx = crtc->dev->mode_config.acquire_ctx;
13079 13079
13080retry: 13080retry:
13081 crtc_state = drm_atomic_get_crtc_state(state, crtc); 13081 crtc_state = drm_atomic_get_crtc_state(state, crtc);
diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c
index 9fd9c70baeed..206ee4f0150e 100644
--- a/drivers/gpu/drm/i915/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/intel_pipe_crc.c
@@ -522,7 +522,7 @@ static void hsw_trans_edp_pipe_A_crc_wa(struct drm_i915_private *dev_priv,
522 goto unlock; 522 goto unlock;
523 } 523 }
524 524
525 state->acquire_ctx = drm_modeset_legacy_acquire_ctx(&crtc->base); 525 state->acquire_ctx = crtc->base.dev->mode_config.acquire_ctx;
526 pipe_config = intel_atomic_get_crtc_state(state, crtc); 526 pipe_config = intel_atomic_get_crtc_state(state, crtc);
527 if (IS_ERR(pipe_config)) { 527 if (IS_ERR(pipe_config)) {
528 ret = PTR_ERR(pipe_config); 528 ret = PTR_ERR(pipe_config);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 2be2192b1373..ede60d67976f 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -782,15 +782,6 @@ struct drm_crtc {
782 */ 782 */
783 spinlock_t commit_lock; 783 spinlock_t commit_lock;
784 784
785 /**
786 * @acquire_ctx:
787 *
788 * Per-CRTC implicit acquire context used by atomic drivers for legacy
789 * IOCTLs, so that atomic drivers can get at the locking acquire
790 * context.
791 */
792 struct drm_modeset_acquire_ctx *acquire_ctx;
793
794#ifdef CONFIG_DEBUG_FS 785#ifdef CONFIG_DEBUG_FS
795 /** 786 /**
796 * @debugfs_entry: 787 * @debugfs_entry:
diff --git a/include/drm/drm_modeset_lock.h b/include/drm/drm_modeset_lock.h
index 2bb065bf0593..4b27c2bb955c 100644
--- a/include/drm/drm_modeset_lock.h
+++ b/include/drm/drm_modeset_lock.h
@@ -122,8 +122,6 @@ struct drm_plane;
122void drm_modeset_lock_all(struct drm_device *dev); 122void drm_modeset_lock_all(struct drm_device *dev);
123void drm_modeset_unlock_all(struct drm_device *dev); 123void drm_modeset_unlock_all(struct drm_device *dev);
124void drm_warn_on_modeset_not_all_locked(struct drm_device *dev); 124void drm_warn_on_modeset_not_all_locked(struct drm_device *dev);
125struct drm_modeset_acquire_ctx *
126drm_modeset_legacy_acquire_ctx(struct drm_crtc *crtc);
127 125
128int drm_modeset_lock_all_ctx(struct drm_device *dev, 126int drm_modeset_lock_all_ctx(struct drm_device *dev,
129 struct drm_modeset_acquire_ctx *ctx); 127 struct drm_modeset_acquire_ctx *ctx);