diff options
| author | Jani Nikula <[email protected]> | 2023-04-14 12:41:53 +0300 |
|---|---|---|
| committer | Jani Nikula <[email protected]> | 2023-04-17 11:16:49 +0300 |
| commit | ae52dd7d6d933511c90d129addfc629feff147b5 (patch) | |
| tree | 57ab09a0f8f3f1c1aa4403f5386ba20d7899f229 | |
| parent | e920aabf8348de4160301b029b13d72eae0531d5 (diff) | |
drm/i915/display: remove intel_display_commit_duplicated_state()
This seems like an unnecessary wrapper layer. Removing it will be
helpful later.
Reviewed-by: Gustavo Sousa <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/a38f08e259221d71314ce6d764431147b0fba218.1681465222.git.jani.nikula@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 52a5857946aa..32e939017b4e 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -702,27 +702,13 @@ intel_plane_fence_y_offset(const struct intel_plane_state *plane_state) } static int -intel_display_commit_duplicated_state(struct intel_atomic_state *state, - struct drm_modeset_acquire_ctx *ctx) -{ - struct drm_i915_private *i915 = to_i915(state->base.dev); - int ret; - - ret = drm_atomic_helper_commit_duplicated_state(&state->base, ctx); - - drm_WARN_ON(&i915->drm, ret == -EDEADLK); - - return ret; -} - -static int __intel_display_resume(struct drm_i915_private *i915, struct drm_atomic_state *state, struct drm_modeset_acquire_ctx *ctx) { struct drm_crtc_state *crtc_state; struct drm_crtc *crtc; - int i; + int ret, i; intel_modeset_setup_hw_state(i915, ctx); intel_vga_redisable(i915); @@ -748,7 +734,11 @@ __intel_display_resume(struct drm_i915_private *i915, if (!HAS_GMCH(i915)) to_intel_atomic_state(state)->skip_intermediate_wm = true; - return intel_display_commit_duplicated_state(to_intel_atomic_state(state), ctx); + ret = drm_atomic_helper_commit_duplicated_state(state, ctx); + + drm_WARN_ON(&i915->drm, ret == -EDEADLK); + + return ret; } static bool gpu_reset_clobbers_display(struct drm_i915_private *dev_priv) @@ -839,10 +829,12 @@ void intel_display_finish_reset(struct drm_i915_private *i915) /* reset doesn't touch the display */ if (!gpu_reset_clobbers_display(i915)) { /* for testing only restore the display */ - ret = intel_display_commit_duplicated_state(to_intel_atomic_state(state), ctx); - if (ret) + ret = drm_atomic_helper_commit_duplicated_state(state, ctx); + if (ret) { + drm_WARN_ON(&i915->drm, ret == -EDEADLK); drm_err(&i915->drm, "Restoring old state failed with %i\n", ret); + } } else { /* * The display has been reset as well, |