diff options
| author | Ville Syrjälä | 2013-09-06 22:29:02 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-09-13 14:54:22 +0200 |
| commit | 3bd26263a9a0c4216d2a44e179265a9a05cda50f (patch) | |
| tree | c5df5a2dc2514a2227b4e191917b51416cb995c0 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Add state readout and checking for has_dp_encoder and dp_m_n (diff) | |
| download | kernel-qcow2-linux-3bd26263a9a0c4216d2a44e179265a9a05cda50f.tar.gz kernel-qcow2-linux-3bd26263a9a0c4216d2a44e179265a9a05cda50f.tar.xz kernel-qcow2-linux-3bd26263a9a0c4216d2a44e179265a9a05cda50f.zip | |
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: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a4f24346d0be..b8d409f5ead3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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); |