[Intel-gfx] [PATCH 4/4] drm/i915/display: move restore state and ctx under display sub-struct

[Jani Nikula]

Move display suspend/resume and display reset modeset state and ctx
members under drm_i915_private display sub-struct.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c      | 14 +++++++-------
 drivers/gpu/drm/i915/display/intel_display_core.h |  7 +++++++
 drivers/gpu/drm/i915/i915_drv.h                   |  3 ---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 63f25d6bf0bf..c50bdcdc9081 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -890,7 +890,7 @@ static bool gpu_reset_clobbers_display(struct 
drm_i915_private *dev_priv)
 
 void intel_display_prepare_reset(struct drm_i915_private *dev_priv)
 {
-       struct drm_modeset_acquire_ctx *ctx = &dev_priv->reset_ctx;
+       struct drm_modeset_acquire_ctx *ctx = 
&dev_priv->display.restore.reset_ctx;
        struct drm_atomic_state *state;
        int ret;
 
@@ -946,13 +946,13 @@ void intel_display_prepare_reset(struct drm_i915_private 
*dev_priv)
                return;
        }
 
-       dev_priv->modeset_restore_state = state;
+       dev_priv->display.restore.modeset_state = state;
        state->acquire_ctx = ctx;
 }
 
 void intel_display_finish_reset(struct drm_i915_private *i915)
 {
-       struct drm_modeset_acquire_ctx *ctx = &i915->reset_ctx;
+       struct drm_modeset_acquire_ctx *ctx = &i915->display.restore.reset_ctx;
        struct drm_atomic_state *state;
        int ret;
 
@@ -963,7 +963,7 @@ void intel_display_finish_reset(struct drm_i915_private 
*i915)
        if (!test_bit(I915_RESET_MODESET, &to_gt(i915)->reset.flags))
                return;
 
-       state = fetch_and_zero(&i915->modeset_restore_state);
+       state = fetch_and_zero(&i915->display.restore.modeset_state);
        if (!state)
                goto unlock;
 
@@ -2443,7 +2443,7 @@ int intel_display_suspend(struct drm_device *dev)
                drm_err(&dev_priv->drm, "Suspending crtc's failed with %i\n",
                        ret);
        else
-               dev_priv->modeset_restore_state = state;
+               dev_priv->display.restore.modeset_state = state;
        return ret;
 }
 
@@ -8899,14 +8899,14 @@ void i830_disable_pipe(struct drm_i915_private 
*dev_priv, enum pipe pipe)
 void intel_display_resume(struct drm_device *dev)
 {
        struct drm_i915_private *i915 = to_i915(dev);
-       struct drm_atomic_state *state = i915->modeset_restore_state;
+       struct drm_atomic_state *state = i915->display.restore.modeset_state;
        struct drm_modeset_acquire_ctx ctx;
        int ret;
 
        if (!HAS_DISPLAY(i915))
                return;
 
-       i915->modeset_restore_state = NULL;
+       i915->display.restore.modeset_state = NULL;
        if (state)
                state->acquire_ctx = &ctx;
 
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h 
b/drivers/gpu/drm/i915/display/intel_display_core.h
index 7eb705a0fa19..57ddce3ba02b 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -14,6 +14,7 @@
 #include <linux/workqueue.h>
 
 #include <drm/drm_connector.h>
+#include <drm/drm_modeset_lock.h>
 
 #include "intel_cdclk.h"
 #include "intel_display.h"
@@ -410,6 +411,12 @@ struct intel_display {
                unsigned long mask;
        } quirks;
 
+       struct {
+               /* restore state for suspend/resume and display reset */
+               struct drm_atomic_state *modeset_state;
+               struct drm_modeset_acquire_ctx reset_ctx;
+       } restore;
+
        struct {
                enum {
                        I915_SAGV_UNKNOWN = 0,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index fdf330a29ec0..2f074d7e0d31 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -287,9 +287,6 @@ struct drm_i915_private {
 
        unsigned long gem_quirks;
 
-       struct drm_atomic_state *modeset_restore_state;
-       struct drm_modeset_acquire_ctx reset_ctx;
-
        struct i915_gem_mm mm;
 
        bool mchbar_need_disable;
-- 
2.34.1