On Tue, 03 Sep 2013, ville.syrjala@xxxxxxxxxxxxxxx wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Add a new pipe config check macro PIPE_CONF_CHECK_CLOCK_FUZZY() to make
> it trivial and error proof to compare clocks in a fuzzy manner.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_display.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 1fea189..bfa531a 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -8601,6 +8601,15 @@ intel_pipe_config_compare(struct drm_device *dev,
> return false; \
> }
>
> +#define PIPE_CONF_CHECK_CLOCK_FUZZY(name) \
> + if (!intel_fuzzy_clock_check(current_config->name, pipe_config->name)) { \
> + DRM_ERROR("mismatch in " #name " " \
> + "(expected %i, found %i)\n", \
> + current_config->name, \
> + pipe_config->name); \
> + return false; \
> + }
I think I'd find this to have more clarity, but ymmv:
DRM_ERROR("mismatch in %s (expected %i, found %i)\n", \
#name, current_config->name, pipe_config->name); \
Either way, on the series,
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> +
> #define PIPE_CONF_QUIRK(quirk) \
> ((current_config->quirks | pipe_config->quirks) & (quirk))
>
> @@ -8663,21 +8672,16 @@ intel_pipe_config_compare(struct drm_device *dev,
> PIPE_CONF_CHECK_X(dpll_hw_state.fp0);
> PIPE_CONF_CHECK_X(dpll_hw_state.fp1);
>
> + if (!IS_HASWELL(dev)) {
> + PIPE_CONF_CHECK_CLOCK_FUZZY(adjusted_mode.clock);
> + }
> +
> #undef PIPE_CONF_CHECK_X
> #undef PIPE_CONF_CHECK_I
> #undef PIPE_CONF_CHECK_FLAGS
> +#undef PIPE_CONF_CHECK_CLOCK_FUZZY
> #undef PIPE_CONF_QUIRK
>
> - if (!IS_HASWELL(dev)) {
> - 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);
> - return false;
> - }
> - }
> -
> return true;
> }
>
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
