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

drm/i915: Optimize out redundant dbuf slice updates 



if the new dbuf slices are a superset of the old
dbuf slices then we don't have to do anything in
intel_dbuf_post_plane_update(). Restructure the code
to skip such redundant dbuf slice updates. The main
benefit is slightly less confusing logs.

Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240402155016.13733-15-ville.syrjala@linux.intel.com
parent 96c420d5

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

+18 −9
Original line number Diff line number Diff line
@@ -3788,16 +3788,20 @@ void intel_dbuf_pre_plane_update(struct intel_atomic_state *state) 
		intel_atomic_get_new_dbuf_state(state);

	const struct intel_dbuf_state *old_dbuf_state =

		intel_atomic_get_old_dbuf_state(state);

	u8 old_slices, new_slices;



	if (!new_dbuf_state ||

	    new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)

	if (!new_dbuf_state)

		return;



	old_slices = old_dbuf_state->enabled_slices;

	new_slices = old_dbuf_state->enabled_slices | new_dbuf_state->enabled_slices;



	if (old_slices == new_slices)

		return;



	WARN_ON(!new_dbuf_state->base.changed);



	gen9_dbuf_slices_update(i915,

				old_dbuf_state->enabled_slices |

				new_dbuf_state->enabled_slices);

	gen9_dbuf_slices_update(i915, new_slices);

}



void intel_dbuf_post_plane_update(struct intel_atomic_state *state)
@@ -3807,15 +3811,20 @@ void intel_dbuf_post_plane_update(struct intel_atomic_state *state) 
		intel_atomic_get_new_dbuf_state(state);

	const struct intel_dbuf_state *old_dbuf_state =

		intel_atomic_get_old_dbuf_state(state);

	u8 old_slices, new_slices;



	if (!new_dbuf_state ||

	    new_dbuf_state->enabled_slices == old_dbuf_state->enabled_slices)

	if (!new_dbuf_state)

		return;



	old_slices = old_dbuf_state->enabled_slices | new_dbuf_state->enabled_slices;

	new_slices = new_dbuf_state->enabled_slices;



	if (old_slices == new_slices)

		return;



	WARN_ON(!new_dbuf_state->base.changed);



	gen9_dbuf_slices_update(i915,

				new_dbuf_state->enabled_slices);

	gen9_dbuf_slices_update(i915, new_slices);

}



static int skl_watermark_ipc_status_show(struct seq_file *m, void *data)