Re: [Intel-gfx] [PATCH v2 2/2] drm/i915: add bool type checks in PIPE_CONF_CHECK_*

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Wed, Nov 29, 2023 at 07:33:17PM +0200, Jani Nikula wrote:
> Avoid bool/int mismatches in state checker macros.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index d62cdae7ab6b..7d48bcdd5797 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -4923,6 +4923,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_X(name) do { \
>  	if (current_config->name != pipe_config->name) { \
> +		BUILD_BUG_ON_MSG(__same_type(current_config->name, bool), \
> +				 __stringify(name) " is bool");	\
>  		pipe_config_mismatch(fastset, crtc, __stringify(name), \
>  				     "(expected 0x%08x, found 0x%08x)", \
>  				     current_config->name, \
> @@ -4933,6 +4935,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_X_WITH_MASK(name, mask) do { \
>  	if ((current_config->name & (mask)) != (pipe_config->name & (mask))) { \
> +		BUILD_BUG_ON_MSG(__same_type(current_config->name, bool), \
> +				 __stringify(name) " is bool");	\
>  		pipe_config_mismatch(fastset, crtc, __stringify(name), \
>  				     "(expected 0x%08x, found 0x%08x)", \
>  				     current_config->name & (mask), \
> @@ -4943,6 +4947,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_I(name) do { \
>  	if (current_config->name != pipe_config->name) { \
> +		BUILD_BUG_ON_MSG(__same_type(current_config->name, bool), \
> +				 __stringify(name) " is bool");	\
>  		pipe_config_mismatch(fastset, crtc, __stringify(name), \
>  				     "(expected %i, found %i)", \
>  				     current_config->name, \
> @@ -4953,6 +4959,8 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
>  
>  #define PIPE_CONF_CHECK_BOOL(name) do { \
>  	if (current_config->name != pipe_config->name) { \
> +		BUILD_BUG_ON_MSG(!__same_type(current_config->name, bool), \
> +				 __stringify(name) " is not bool");	\
>  		pipe_config_mismatch(fastset, crtc,  __stringify(name), \
>  				     "(expected %s, found %s)", \
>  				     str_yes_no(current_config->name), \
> -- 
> 2.39.2
>