Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55c561a7 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Remove PIPE_CONF_CHECK_I_ALT 



And move the comment to the right macro. This was mixed up in

commit cfb23ed6
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date:   Tue Jul 14 12:17:40 2015 +0200

    drm/i915: Allow fuzzy matching in pipe_config_compare, v2

v2: Rebase.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Stone <daniels@collabora.com>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459330476-32453-1-git-send-email-daniel.vetter@ffwll.ch
parent 9c741702

drivers/gpu/drm/i915/intel_display.c

+5 −17
Original line number Diff line number Diff line
@@ -12569,6 +12569,11 @@ intel_pipe_config_compare(struct drm_device *dev, 
		ret = false; \

	}



/* This is required for BDW+ where there is only one set of registers for

 * switching between high and low RR.

 * This macro can be used whenever a comparison has to be made between one

 * hw state and multiple sw state variables.

 */

#define PIPE_CONF_CHECK_M_N_ALT(name, alt_name) \

	if (!intel_compare_link_m_n(&current_config->name, \

				    &pipe_config->name, adjust) && \
@@ -12596,22 +12601,6 @@ intel_pipe_config_compare(struct drm_device *dev, 
		ret = false; \

	}



/* This is required for BDW+ where there is only one set of registers for

 * switching between high and low RR.

 * This macro can be used whenever a comparison has to be made between one

 * hw state and multiple sw state variables.

 */

#define PIPE_CONF_CHECK_I_ALT(name, alt_name) \

	if ((current_config->name != pipe_config->name) && \

		(current_config->alt_name != pipe_config->name)) { \

			INTEL_ERR_OR_DBG_KMS("mismatch in " #name " " \

				  "(expected %i or %i, found %i)\n", \

				  current_config->name, \

				  current_config->alt_name, \

				  pipe_config->name); \

			ret = false; \

	}



#define PIPE_CONF_CHECK_FLAGS(name, mask)	\

	if ((current_config->name ^ pipe_config->name) & (mask)) { \

		INTEL_ERR_OR_DBG_KMS("mismatch in " #name "(" #mask ") " \
@@ -12736,7 +12725,6 @@ intel_pipe_config_compare(struct drm_device *dev, 
#undef PIPE_CONF_CHECK_X

#undef PIPE_CONF_CHECK_I

#undef PIPE_CONF_CHECK_P

#undef PIPE_CONF_CHECK_I_ALT

#undef PIPE_CONF_CHECK_FLAGS

#undef PIPE_CONF_CHECK_CLOCK_FUZZY

#undef PIPE_CONF_QUIRK