All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Weinehall <david.weinehall@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/i915: reduce indent in pch detection
Date: Fri, 26 Jan 2018 17:53:27 +0200	[thread overview]
Message-ID: <20180126155327.GC13657@boom> (raw)
In-Reply-To: <20180126144805.6276-1-jani.nikula@intel.com>

On Fri, Jan 26, 2018 at 04:48:04PM +0200, Jani Nikula wrote:
> Save some horizontal space.

Yes, please!

Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>

> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 189 ++++++++++++++++++++--------------------
>  1 file changed, 96 insertions(+), 93 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 1ec12add34b2..3e8664de025d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -176,100 +176,103 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv)
>  	 * of only checking the first one.
>  	 */
>  	while ((pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, pch))) {
> -		if (pch->vendor == PCI_VENDOR_ID_INTEL) {
> -			unsigned short id = pch->device & INTEL_PCH_DEVICE_ID_MASK;
> -
> -			dev_priv->pch_id = id;
> -
> -			if (id == INTEL_PCH_IBX_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_IBX;
> -				DRM_DEBUG_KMS("Found Ibex Peak PCH\n");
> -				WARN_ON(!IS_GEN5(dev_priv));
> -			} else if (id == INTEL_PCH_CPT_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_CPT;
> -				DRM_DEBUG_KMS("Found CougarPoint PCH\n");
> -				WARN_ON(!IS_GEN6(dev_priv) &&
> -					!IS_IVYBRIDGE(dev_priv));
> -			} else if (id == INTEL_PCH_PPT_DEVICE_ID_TYPE) {
> -				/* PantherPoint is CPT compatible */
> -				dev_priv->pch_type = PCH_CPT;
> -				DRM_DEBUG_KMS("Found PantherPoint PCH\n");
> -				WARN_ON(!IS_GEN6(dev_priv) &&
> -					!IS_IVYBRIDGE(dev_priv));
> -			} else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_LPT;
> -				DRM_DEBUG_KMS("Found LynxPoint PCH\n");
> -				WARN_ON(!IS_HASWELL(dev_priv) &&
> -					!IS_BROADWELL(dev_priv));
> -				WARN_ON(IS_HSW_ULT(dev_priv) ||
> -					IS_BDW_ULT(dev_priv));
> -			} else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_LPT;
> -				DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
> -				WARN_ON(!IS_HASWELL(dev_priv) &&
> -					!IS_BROADWELL(dev_priv));
> -				WARN_ON(!IS_HSW_ULT(dev_priv) &&
> -					!IS_BDW_ULT(dev_priv));
> -			} else if (id == INTEL_PCH_WPT_DEVICE_ID_TYPE) {
> -				/* WildcatPoint is LPT compatible */
> -				dev_priv->pch_type = PCH_LPT;
> -				DRM_DEBUG_KMS("Found WildcatPoint PCH\n");
> -				WARN_ON(!IS_HASWELL(dev_priv) &&
> -					!IS_BROADWELL(dev_priv));
> -				WARN_ON(IS_HSW_ULT(dev_priv) ||
> -					IS_BDW_ULT(dev_priv));
> -			} else if (id == INTEL_PCH_WPT_LP_DEVICE_ID_TYPE) {
> -				/* WildcatPoint is LPT compatible */
> -				dev_priv->pch_type = PCH_LPT;
> -				DRM_DEBUG_KMS("Found WildcatPoint LP PCH\n");
> -				WARN_ON(!IS_HASWELL(dev_priv) &&
> -					!IS_BROADWELL(dev_priv));
> -				WARN_ON(!IS_HSW_ULT(dev_priv) &&
> -					!IS_BDW_ULT(dev_priv));
> -			} else if (id == INTEL_PCH_SPT_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_SPT;
> -				DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
> -				WARN_ON(!IS_SKYLAKE(dev_priv) &&
> -					!IS_KABYLAKE(dev_priv));
> -			} else if (id == INTEL_PCH_SPT_LP_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_SPT;
> -				DRM_DEBUG_KMS("Found SunrisePoint LP PCH\n");
> -				WARN_ON(!IS_SKYLAKE(dev_priv) &&
> -					!IS_KABYLAKE(dev_priv));
> -			} else if (id == INTEL_PCH_KBP_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_KBP;
> -				DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");
> -				WARN_ON(!IS_SKYLAKE(dev_priv) &&
> -					!IS_KABYLAKE(dev_priv) &&
> -					!IS_COFFEELAKE(dev_priv));
> -			} else if (id == INTEL_PCH_CNP_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_CNP;
> -				DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
> -				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
> -					!IS_COFFEELAKE(dev_priv));
> -			} else if (id == INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_CNP;
> -				DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n");
> -				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
> -					!IS_COFFEELAKE(dev_priv));
> -			} else if (id == INTEL_PCH_ICP_DEVICE_ID_TYPE) {
> -				dev_priv->pch_type = PCH_ICP;
> -				DRM_DEBUG_KMS("Found Ice Lake PCH\n");
> -				WARN_ON(!IS_ICELAKE(dev_priv));
> -			} 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)) {
> -				dev_priv->pch_type =
> -					intel_virt_detect_pch(dev_priv);
> -			} else
> -				continue;
> -
> -			break;
> +		unsigned short id;
> +
> +		if (pch->vendor != PCI_VENDOR_ID_INTEL)
> +			continue;
> +
> +		id = pch->device & INTEL_PCH_DEVICE_ID_MASK;
> +
> +		dev_priv->pch_id = id;
> +
> +		if (id == INTEL_PCH_IBX_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_IBX;
> +			DRM_DEBUG_KMS("Found Ibex Peak PCH\n");
> +			WARN_ON(!IS_GEN5(dev_priv));
> +		} else if (id == INTEL_PCH_CPT_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_CPT;
> +			DRM_DEBUG_KMS("Found CougarPoint PCH\n");
> +			WARN_ON(!IS_GEN6(dev_priv) &&
> +				!IS_IVYBRIDGE(dev_priv));
> +		} else if (id == INTEL_PCH_PPT_DEVICE_ID_TYPE) {
> +			/* PantherPoint is CPT compatible */
> +			dev_priv->pch_type = PCH_CPT;
> +			DRM_DEBUG_KMS("Found PantherPoint PCH\n");
> +			WARN_ON(!IS_GEN6(dev_priv) &&
> +				!IS_IVYBRIDGE(dev_priv));
> +		} else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_LPT;
> +			DRM_DEBUG_KMS("Found LynxPoint PCH\n");
> +			WARN_ON(!IS_HASWELL(dev_priv) &&
> +				!IS_BROADWELL(dev_priv));
> +			WARN_ON(IS_HSW_ULT(dev_priv) ||
> +				IS_BDW_ULT(dev_priv));
> +		} else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_LPT;
> +			DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
> +			WARN_ON(!IS_HASWELL(dev_priv) &&
> +				!IS_BROADWELL(dev_priv));
> +			WARN_ON(!IS_HSW_ULT(dev_priv) &&
> +				!IS_BDW_ULT(dev_priv));
> +		} else if (id == INTEL_PCH_WPT_DEVICE_ID_TYPE) {
> +			/* WildcatPoint is LPT compatible */
> +			dev_priv->pch_type = PCH_LPT;
> +			DRM_DEBUG_KMS("Found WildcatPoint PCH\n");
> +			WARN_ON(!IS_HASWELL(dev_priv) &&
> +				!IS_BROADWELL(dev_priv));
> +			WARN_ON(IS_HSW_ULT(dev_priv) ||
> +				IS_BDW_ULT(dev_priv));
> +		} else if (id == INTEL_PCH_WPT_LP_DEVICE_ID_TYPE) {
> +			/* WildcatPoint is LPT compatible */
> +			dev_priv->pch_type = PCH_LPT;
> +			DRM_DEBUG_KMS("Found WildcatPoint LP PCH\n");
> +			WARN_ON(!IS_HASWELL(dev_priv) &&
> +				!IS_BROADWELL(dev_priv));
> +			WARN_ON(!IS_HSW_ULT(dev_priv) &&
> +				!IS_BDW_ULT(dev_priv));
> +		} else if (id == INTEL_PCH_SPT_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_SPT;
> +			DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
> +			WARN_ON(!IS_SKYLAKE(dev_priv) &&
> +				!IS_KABYLAKE(dev_priv));
> +		} else if (id == INTEL_PCH_SPT_LP_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_SPT;
> +			DRM_DEBUG_KMS("Found SunrisePoint LP PCH\n");
> +			WARN_ON(!IS_SKYLAKE(dev_priv) &&
> +				!IS_KABYLAKE(dev_priv));
> +		} else if (id == INTEL_PCH_KBP_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_KBP;
> +			DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");
> +			WARN_ON(!IS_SKYLAKE(dev_priv) &&
> +				!IS_KABYLAKE(dev_priv) &&
> +				!IS_COFFEELAKE(dev_priv));
> +		} else if (id == INTEL_PCH_CNP_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_CNP;
> +			DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
> +			WARN_ON(!IS_CANNONLAKE(dev_priv) &&
> +				!IS_COFFEELAKE(dev_priv));
> +		} else if (id == INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_CNP;
> +			DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n");
> +			WARN_ON(!IS_CANNONLAKE(dev_priv) &&
> +				!IS_COFFEELAKE(dev_priv));
> +		} else if (id == INTEL_PCH_ICP_DEVICE_ID_TYPE) {
> +			dev_priv->pch_type = PCH_ICP;
> +			DRM_DEBUG_KMS("Found Ice Lake PCH\n");
> +			WARN_ON(!IS_ICELAKE(dev_priv));
> +		} 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)) {
> +			dev_priv->pch_type = intel_virt_detect_pch(dev_priv);
> +		} else {
> +			continue;
>  		}
> +
> +		break;
>  	}
>  	if (!pch)
>  		DRM_DEBUG_KMS("No PCH found.\n");
> -- 
> 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

      parent reply	other threads:[~2018-01-26 15:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-26 14:48 [PATCH 1/2] drm/i915: reduce indent in pch detection Jani Nikula
2018-01-26 14:48 ` [PATCH 2/2] drm/i915: only assign dev_priv->pch_id on successful " Jani Nikula
2018-01-26 15:53   ` David Weinehall
2018-01-26 21:32     ` Chris Wilson
2018-01-27  9:22       ` Jani Nikula
2018-01-26 15:03 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: reduce indent in " Patchwork
2018-01-26 15:53 ` David Weinehall [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180126155327.GC13657@boom \
    --to=david.weinehall@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.