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

Commit 3bd26263 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Make intel_fuzzy_clock_check() take in arbitrary clocks 



We want to do fuzzy clock checks for other things besides
adjusted_mode.clock, so just pass two two clocks to compare
to intel_fuzzy_clock_check().

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent eb14cb74

drivers/gpu/drm/i915/intel_display.c

+4 −7
Original line number Diff line number Diff line
@@ -8584,13 +8584,9 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes) 


}



static bool intel_fuzzy_clock_check(struct intel_crtc_config *cur,

				    struct intel_crtc_config *new)

static bool intel_fuzzy_clock_check(int clock1, int clock2)

{

	int clock1, clock2, diff;



	clock1 = cur->adjusted_mode.clock;

	clock2 = new->adjusted_mode.clock;

	int diff;



	if (clock1 == clock2)

		return true;
@@ -8722,7 +8718,8 @@ intel_pipe_config_compare(struct drm_device *dev, 
#undef PIPE_CONF_QUIRK



	if (!IS_HASWELL(dev)) {

		if (!intel_fuzzy_clock_check(current_config, pipe_config)) {

		if (!intel_fuzzy_clock_check(current_config->adjusted_mode.clock,

					     pipe_config->adjusted_mode.clock)) {

			DRM_ERROR("mismatch in clock (expected %d, found %d)\n",

				  current_config->adjusted_mode.clock,

				  pipe_config->adjusted_mode.clock);