| Message ID | 1459330476-32453-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 30 Mar 2016, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > And move the comment to the right macro. This was mixed up in > > commit cfb23ed622d040619abb91e625fcba74d356b8a8 > 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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Didn't read the history, but the change is sane. Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 22 +++++----------------- > 1 file changed, 5 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 29aa64be1f03..fec6392dfc02 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -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(¤t_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
On Wed, Mar 30, 2016 at 02:09:11PM +0300, Jani Nikula wrote: > On Wed, 30 Mar 2016, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > And move the comment to the right macro. This was mixed up in > > > > commit cfb23ed622d040619abb91e625fcba74d356b8a8 > > 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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Didn't read the history, but the change is sane. > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Queued for -next, thanks for the patch. -Daniel > > > --- > > drivers/gpu/drm/i915/intel_display.c | 22 +++++----------------- > > 1 file changed, 5 insertions(+), 17 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 29aa64be1f03..fec6392dfc02 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -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(¤t_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 > > -- > Jani Nikula, Intel Open Source Technology Center > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 29aa64be1f03..fec6392dfc02 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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(¤t_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
And move the comment to the right macro. This was mixed up in commit cfb23ed622d040619abb91e625fcba74d356b8a8 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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-)