drm/i915: do not mix workaround with normal flow (da17223e) · Commits · 戴 / test

Separate the two comments: one is a workaround and the other is a sanity check. We could just compare != 1, but let's treat them differently due to having different meaning. Signed-off-by:

Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by:

Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190404230426.15837-4-lucas.demarchi@intel.com

drivers/gpu/drm/i915/intel_pm.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -3753,14 +3753,16 @@ bool intel_can_enable_sagv(struct drm_atomic_state *state)
		sagv_block_time_us = 10;

		/*
		* SKL+ workaround: bspec recommends we disable SAGV when we have
		* more then one pipe enabled
		*
		* If there are no active CRTCs, no additional checks need be performed
		*/
		if (hweight32(intel_state->active_crtcs) == 0)
		return true;
		else if (hweight32(intel_state->active_crtcs) > 1)

		/*
		* SKL+ workaround: bspec recommends we disable SAGV when we have
		* more then one pipe enabled
		*/
		if (hweight32(intel_state->active_crtcs) > 1)
		return false;

		/* Since we're now guaranteed to only have one active CRTC... */

Admin message