drm/i915: Move intel_atomic_state_free() into intel_atomic.c

Move intel_atomic_state_free() next to its counterpart.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200120174728.21095-13-ville.syrjala@linux.intel.com
Reviewed-by: Imre Deak <imre.deak@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 014927edd5bc42b6ac65f837ac5db5d80a2c6466..110cc58346f5946c4daec19e9267635036bcf9f7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -497,6 +497,17 @@ intel_atomic_state_alloc(struct drm_device *dev)
        return &state->base;
 }
 
+void intel_atomic_state_free(struct drm_atomic_state *_state)
+{
+       struct intel_atomic_state *state = to_intel_atomic_state(_state);
+
+       drm_atomic_state_default_release(&state->base);
+
+       i915_sw_fence_fini(&state->commit_ready);
+
+       kfree(state);
+}
+
 void intel_atomic_state_clear(struct drm_atomic_state *s)
 {
        struct intel_atomic_state *state = to_intel_atomic_state(s);

diff --git a/drivers/gpu/drm/i915/display/intel_atomic.h b/drivers/gpu/drm/i915/display/intel_atomic.h
index 74c749dbfb4fbd44745cebe2fc6000956bb341a7..88133eea0a171b71353bb91e6a30289082d4584e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic.h
+++ b/drivers/gpu/drm/i915/display/intel_atomic.h
@@ -45,6 +45,7 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc,
 void intel_crtc_free_hw_state(struct intel_crtc_state *crtc_state);
 void intel_crtc_copy_color_blobs(struct intel_crtc_state *crtc_state);
 struct drm_atomic_state *intel_atomic_state_alloc(struct drm_device *dev);
+void intel_atomic_state_free(struct drm_atomic_state *state);
 void intel_atomic_state_clear(struct drm_atomic_state *state);
 
 struct intel_crtc_state *

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 7ab1936e630aa8f8aaef9339a95ed36a82b39d91..cced6b9b8ee2909b6c851872d28b098023a8f2aa 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -17333,17 +17333,6 @@ intel_user_framebuffer_create(struct drm_device *dev,
        return fb;
 }
 
-static void intel_atomic_state_free(struct drm_atomic_state *state)
-{
-       struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
-
-       drm_atomic_state_default_release(state);
-
-       i915_sw_fence_fini(&intel_state->commit_ready);
-
-       kfree(state);
-}
-
 static enum drm_mode_status
 intel_mode_valid(struct drm_device *dev,
                 const struct drm_display_mode *mode)