[Intel-gfx] [PATCH v2 3/8] drm/i915/dp: Print only sink or branch specific OUI based on dev type

[Jani Nikula]

On Mon, 24 Oct 2016, Imre Deak <imre.deak at intel.com> wrote:
> There are two separate sets of DPCD registers for the DP OUI - as well as
> for the device ID and HW/SW revision - based on whether the given DP
> device is a branch or a sink. Currently we print both branch and sink
> OUIs, for consistency print only the one that corresponds to the
> probed device.
>
> v2:
> - Split out this change into a separate patch. (Jani)
>
> Cc: Jani Nikula <jani.nikula at intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>

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


> ---
>  drivers/gpu/drm/i915/intel_dp.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 1c1a8c8..1991250 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3624,17 +3624,17 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
>  static void
>  intel_dp_probe_oui(struct intel_dp *intel_dp)
>  {
> +	bool is_branch = drm_dp_is_branch(intel_dp->dpcd);
>  	u8 buf[3];
>  
>  	if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
>  		return;
>  
> -	if (drm_dp_dpcd_read(&intel_dp->aux, DP_SINK_OUI, buf, 3) == 3)
> -		DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n",
> -			      buf[0], buf[1], buf[2]);
> -
> -	if (drm_dp_dpcd_read(&intel_dp->aux, DP_BRANCH_OUI, buf, 3) == 3)
> -		DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
> +	if (drm_dp_dpcd_read(&intel_dp->aux,
> +			     is_branch ? DP_BRANCH_OUI : DP_SINK_OUI,
> +			     buf, 3) == 3)
> +		DRM_DEBUG_KMS("%s OUI: %02hx%02hx%02hx\n",
> +			      is_branch ? "Branch" : "Sink",
>  			      buf[0], buf[1], buf[2]);
>  }

-- 
Jani Nikula, Intel Open Source Technology Center