Commit 0768530b authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Don't reuse commit_work for the cleanup 



Currently we reuse the commit_work for a later cleanup step.
Let's not do that so that atomic ioctl handler won't accidentally
wait for the cleanup work when it really wants to just wait on the
commit_tail() part. We'll just add another work struct for the
cleanup.

Cc: Brian Geffon <bgeffon@google.com>
Cc: Vidya Srinivas <vidya.srinivas@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241127061117.25622-2-ville.syrjala@linux.intel.com


Reviewed-by: default avatarVidya Srinivas <vidya.srinivas@intel.com>
Tested-by: default avatarVidya Srinivas <vidya.srinivas@intel.com>
parent 36a585f6

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

+3 −3
Original line number Diff line number Diff line
@@ -7581,7 +7581,7 @@ static void intel_atomic_dsb_cleanup(struct intel_crtc_state *crtc_state) 
static void intel_atomic_cleanup_work(struct work_struct *work)

{

	struct intel_atomic_state *state =

		container_of(work, struct intel_atomic_state, base.commit_work);

		container_of(work, struct intel_atomic_state, cleanup_work);

	struct drm_i915_private *i915 = to_i915(state->base.dev);

	struct intel_crtc_state *old_crtc_state;

	struct intel_crtc *crtc;
@@ -7936,8 +7936,8 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) 
	 * schedule point (cond_resched()) here anyway to keep latencies

	 * down.

	 */

	INIT_WORK(&state->base.commit_work, intel_atomic_cleanup_work);

	queue_work(system_highpri_wq, &state->base.commit_work);

	INIT_WORK(&state->cleanup_work, intel_atomic_cleanup_work);

	queue_work(system_highpri_wq, &state->cleanup_work);

}



static void intel_atomic_commit_work(struct work_struct *work)

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

+2 −0
Original line number Diff line number Diff line
@@ -587,6 +587,8 @@ struct intel_atomic_state { 
	bool skip_intermediate_wm;



	bool rps_interactive;



	struct work_struct cleanup_work;

};



struct intel_plane_state {