[Intel-gfx] [PATCH 03/13] drm/i915/sdvo: s/sdvo_inputs_mask/sdvo_num_inputs/

[Jani Nikula]

On Wed, 05 Jul 2023, Ville Syrjala <ville.syrjala at linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> The SDVO inputs are reportes a simple number, not a bitmask.

*reported as a

> Adjust the code to match reality.
>
> Note that we don't actually support dual input SDVO devices,
> and we just always use the first input.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Didn't actually check this against any spec, but looks reasonable.

Reviewed-by: Jani Nikula <jani.nikula at intel.com>


> ---
>  drivers/gpu/drm/i915/display/intel_sdvo.c      | 9 ++++-----
>  drivers/gpu/drm/i915/display/intel_sdvo_regs.h | 2 +-
>  2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index ec94da6cb7bb..76eed11e9fed 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -1955,7 +1955,7 @@ static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct in
>  		      "  device_rev_id: %d\n"
>  		      "  sdvo_version_major: %d\n"
>  		      "  sdvo_version_minor: %d\n"
> -		      "  sdvo_inputs_mask: %d\n"
> +		      "  sdvo_num_inputs: %d\n"
>  		      "  smooth_scaling: %d\n"
>  		      "  sharp_scaling: %d\n"
>  		      "  up_scaling: %d\n"
> @@ -1967,7 +1967,7 @@ static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct in
>  		      caps->device_rev_id,
>  		      caps->sdvo_version_major,
>  		      caps->sdvo_version_minor,
> -		      caps->sdvo_inputs_mask,
> +		      caps->sdvo_num_inputs,
>  		      caps->smooth_scaling,
>  		      caps->sharp_scaling,
>  		      caps->up_scaling,
> @@ -3436,15 +3436,14 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,
>  
>  	drm_dbg_kms(&dev_priv->drm, "%s device VID/DID: %02X:%02X.%02X, "
>  			"clock range %dMHz - %dMHz, "
> -			"input 1: %c, input 2: %c, "
> +			"num inputs: %d, "
>  			"output 1: %c, output 2: %c\n",
>  			SDVO_NAME(intel_sdvo),
>  			intel_sdvo->caps.vendor_id, intel_sdvo->caps.device_id,
>  			intel_sdvo->caps.device_rev_id,
>  			intel_sdvo->pixel_clock_min / 1000,
>  			intel_sdvo->pixel_clock_max / 1000,
> -			(intel_sdvo->caps.sdvo_inputs_mask & 0x1) ? 'Y' : 'N',
> -			(intel_sdvo->caps.sdvo_inputs_mask & 0x2) ? 'Y' : 'N',
> +			intel_sdvo->caps.sdvo_num_inputs,
>  			/* check currently supported outputs */
>  			intel_sdvo->caps.output_flags &
>  			(SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_RGB0 |
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo_regs.h b/drivers/gpu/drm/i915/display/intel_sdvo_regs.h
> index 74dc6c042b6e..54f099abefeb 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo_regs.h
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo_regs.h
> @@ -57,7 +57,7 @@ struct intel_sdvo_caps {
>  	u8 device_rev_id;
>  	u8 sdvo_version_major;
>  	u8 sdvo_version_minor;
> -	unsigned int sdvo_inputs_mask:2;
> +	unsigned int sdvo_num_inputs:2;
>  	unsigned int smooth_scaling:1;
>  	unsigned int sharp_scaling:1;
>  	unsigned int up_scaling:1;

-- 
Jani Nikula, Intel Open Source Graphics Center