Commit 5f342993 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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



Move intel_atomic_state_free() next to its counterpart.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200120174728.21095-13-ville.syrjala@linux.intel.com


Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent ed645eee

drivers/gpu/drm/i915/display/intel_atomic.c

+11 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/display/intel_atomic.h

+1 −0
Original line number Diff line number Diff line
@@ -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 *

drivers/gpu/drm/i915/display/intel_display.c

+0 −11
Original line number Diff line number Diff line
@@ -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)



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE