Re: [PATCH 2/4] drm/i915: abstract virtual PCH id detection

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

On Mon, Feb 05, 2018 at 05:31:37PM +0000, Jani Nikula wrote:
> Make the code slightly more pleasant to look at.

indeed

> No functional changes.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>


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

> ---
>  drivers/gpu/drm/i915/i915_drv.c | 19 ++++++++++++-------
>  1 file changed, 12 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 08e97b6e976b..52666c6cbbcc 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -192,6 +192,16 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
>  	}
>  }
>  
> +static bool intel_is_virt_pch(unsigned short id,
> +			      unsigned short svendor, unsigned short sdevice)
> +{
> +	return (id == INTEL_PCH_P2X_DEVICE_ID_TYPE ||
> +		id == INTEL_PCH_P3X_DEVICE_ID_TYPE ||
> +		(id == INTEL_PCH_QEMU_DEVICE_ID_TYPE &&
> +		 svendor == PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
> +		 sdevice == PCI_SUBDEVICE_ID_QEMU));
> +}
> +
>  static enum intel_pch intel_virt_detect_pch(struct drm_i915_private *dev_priv)
>  {
>  	enum intel_pch ret = PCH_NOP;
> @@ -264,13 +274,8 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv)
>  		pch_type = intel_pch_type(dev_priv, id);
>  		if (pch_type != PCH_NONE) {
>  			dev_priv->pch_type = pch_type;
> -		} else if (id == INTEL_PCH_P2X_DEVICE_ID_TYPE ||
> -			   id == INTEL_PCH_P3X_DEVICE_ID_TYPE ||
> -			   (id == INTEL_PCH_QEMU_DEVICE_ID_TYPE &&
> -			    pch->subsystem_vendor ==
> -			    PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&
> -			    pch->subsystem_device ==
> -			    PCI_SUBDEVICE_ID_QEMU)) {
> +		} else if (intel_is_virt_pch(id, pch->subsystem_vendor,
> +					     pch->subsystem_device)) {
>  			dev_priv->pch_type = intel_virt_detect_pch(dev_priv);
>  		} else {
>  			continue;
> -- 
> 2.11.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx