Commit 3a34fd6d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/wm: add more accessors to dbuf state 



Add intel_dbuf_num_enabled_slices() and intel_dbuf_num_active_pipes()
helpers to avoid looking at struct intel_dbuf_state internals outside of
skl_watermark.c.

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/7d555e7b4e93632b732b8b5a3cd4076baf781bee.1750847509.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 70349f27

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

+3 −3
Original line number Diff line number Diff line
@@ -358,12 +358,12 @@ int intel_pmdemand_atomic_check(struct intel_atomic_state *state) 


	if (DISPLAY_VER(display) < 30) {

		new_pmdemand_state->params.active_dbufs =

			min_t(u8, hweight8(new_dbuf_state->enabled_slices), 3);

			min_t(u8, intel_dbuf_num_enabled_slices(new_dbuf_state), 3);

		new_pmdemand_state->params.active_pipes =

			min_t(u8, hweight8(new_dbuf_state->active_pipes), 3);

			min_t(u8, intel_dbuf_num_active_pipes(new_dbuf_state), 3);

	} else {

		new_pmdemand_state->params.active_pipes =

			min_t(u8, hweight8(new_dbuf_state->active_pipes), INTEL_NUM_PIPES(display));

			min_t(u8, intel_dbuf_num_active_pipes(new_dbuf_state), INTEL_NUM_PIPES(display));

	}



	new_cdclk_state = intel_atomic_get_cdclk_state(state);

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

+10 −0
Original line number Diff line number Diff line
@@ -3704,6 +3704,16 @@ void intel_dbuf_post_plane_update(struct intel_atomic_state *state) 
	gen9_dbuf_slices_update(display, new_slices);

}



int intel_dbuf_num_enabled_slices(const struct intel_dbuf_state *dbuf_state)

{

	return hweight8(dbuf_state->enabled_slices);

}



int intel_dbuf_num_active_pipes(const struct intel_dbuf_state *dbuf_state)

{

	return hweight8(dbuf_state->active_pipes);

}



bool intel_dbuf_pmdemand_needs_update(struct intel_atomic_state *state)

{

	struct intel_display *display = to_intel_display(state);

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

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ struct intel_dbuf_state { 
struct intel_dbuf_state *

intel_atomic_get_dbuf_state(struct intel_atomic_state *state);



int intel_dbuf_num_enabled_slices(const struct intel_dbuf_state *dbuf_state);

int intel_dbuf_num_active_pipes(const struct intel_dbuf_state *dbuf_state);



int intel_dbuf_init(struct intel_display *display);

int intel_dbuf_state_set_mdclk_cdclk_ratio(struct intel_atomic_state *state,

					   int ratio);