github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 08:33:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/display: remove intel_display_commit_duplicated_state()

Browse Source 
This seems like an unnecessary wrapper layer. Removing it will be
helpful later.

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a38f08e259221d71314ce6d764431147b0fba218.1681465222.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2023-04-14 12:41:53 +03:00
parent e920aabf83
commit ae52dd7d6d
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,20 +701,6 @@ intel_plane_fence_y_offset(const struct intel_plane_state *plane_state)
return y;
}
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,
@ -722,7 +708,7 @@ __intel_display_resume(struct drm_i915_private *i915,
{
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,