Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5e855d0 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Always use 9 bits of the LPC bridge device ID for PCH detection 



Make the code less confusiong by always using the top 9 bits of the
LPC bridge device ID to detect the PCH type. We need to add a bit of
new code for WPT, and we need to adjust the KBP ID as well. All the
other pre-CNP IDs are fine as is.

The virtualization cases I think are fine. These P2X and P3X IDs
actually just look like the old PIIX4 and PIIX3 IDs to me. Not sure
why they're not called PIIX3/4 though. The qemu one has a comment
saying the full ID is 0x2918 which is fine with 9 bits.

v2: Keep the CNP ID as 0xa300 (DK)

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170621174944.23306-1-ville.syrjala@linux.intel.com
parent d4cdbf03

drivers/gpu/drm/i915/i915_drv.c

+20 −15
Original line number Diff line number Diff line
@@ -173,29 +173,25 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) 
	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;

			unsigned short id_ext = pch->device &

				INTEL_PCH_DEVICE_ID_MASK_EXT;



			if (id == INTEL_PCH_IBX_DEVICE_ID_TYPE) {

			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_id = id;

				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_id = id;

				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_id = id;

				dev_priv->pch_type = PCH_LPT;

				DRM_DEBUG_KMS("Found LynxPoint PCH\n");

				WARN_ON(!IS_HASWELL(dev_priv) &&
@@ -203,39 +199,49 @@ static void intel_detect_pch(struct drm_i915_private *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_id = id;

				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_id = id;

				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_ext == INTEL_PCH_SPT_LP_DEVICE_ID_TYPE) {

				dev_priv->pch_id = id_ext;

			} 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_id = id;

				dev_priv->pch_type = PCH_KBP;

				DRM_DEBUG_KMS("Found KabyPoint PCH\n");

				WARN_ON(!IS_SKYLAKE(dev_priv) &&

					!IS_KABYLAKE(dev_priv));

			} else if (id == INTEL_PCH_CNP_DEVICE_ID_TYPE) {

				dev_priv->pch_id = id;

				dev_priv->pch_type = PCH_CNP;

				DRM_DEBUG_KMS("Found CannonPoint PCH\n");

				WARN_ON(!IS_CANNONLAKE(dev_priv) &&

					!IS_COFFEELAKE(dev_priv));

			} else if (id_ext == INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {

				dev_priv->pch_id = id_ext;

			} else if (id == INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {

				dev_priv->pch_type = PCH_CNP;

				DRM_DEBUG_KMS("Found CannonPoint LP PCH\n");

				WARN_ON(!IS_CANNONLAKE(dev_priv) &&
@@ -247,7 +253,6 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) 
					    PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&

				    pch->subsystem_device ==

					    PCI_SUBDEVICE_ID_QEMU)) {

				dev_priv->pch_id = id;

				dev_priv->pch_type =

					intel_virt_detect_pch(dev_priv);

			} else

drivers/gpu/drm/i915/i915_drv.h

+8 −5
Original line number Diff line number Diff line
@@ -3011,16 +3011,17 @@ intel_info(const struct drm_i915_private *dev_priv) 


#define HAS_POOLED_EU(dev_priv)	((dev_priv)->info.has_pooled_eu)



#define INTEL_PCH_DEVICE_ID_MASK		0xff00

#define INTEL_PCH_DEVICE_ID_MASK_EXT		0xff80

#define INTEL_PCH_DEVICE_ID_MASK		0xff80

#define INTEL_PCH_IBX_DEVICE_ID_TYPE		0x3b00

#define INTEL_PCH_CPT_DEVICE_ID_TYPE		0x1c00

#define INTEL_PCH_PPT_DEVICE_ID_TYPE		0x1e00

#define INTEL_PCH_LPT_DEVICE_ID_TYPE		0x8c00

#define INTEL_PCH_LPT_LP_DEVICE_ID_TYPE		0x9c00

#define INTEL_PCH_WPT_DEVICE_ID_TYPE		0x8c80

#define INTEL_PCH_WPT_LP_DEVICE_ID_TYPE		0x9c80

#define INTEL_PCH_SPT_DEVICE_ID_TYPE		0xA100

#define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE		0x9D00

#define INTEL_PCH_KBP_DEVICE_ID_TYPE		0xA200

#define INTEL_PCH_KBP_DEVICE_ID_TYPE		0xA280

#define INTEL_PCH_CNP_DEVICE_ID_TYPE		0xA300

#define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE		0x9D80

#define INTEL_PCH_P2X_DEVICE_ID_TYPE		0x7100
@@ -3035,9 +3036,11 @@ intel_info(const struct drm_i915_private *dev_priv) 
#define HAS_PCH_SPT(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_SPT)

#define HAS_PCH_LPT(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_LPT)

#define HAS_PCH_LPT_LP(dev_priv) \

	((dev_priv)->pch_id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE)

	((dev_priv)->pch_id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE || \

	 (dev_priv)->pch_id == INTEL_PCH_WPT_LP_DEVICE_ID_TYPE)

#define HAS_PCH_LPT_H(dev_priv) \

	((dev_priv)->pch_id == INTEL_PCH_LPT_DEVICE_ID_TYPE)

	((dev_priv)->pch_id == INTEL_PCH_LPT_DEVICE_ID_TYPE || \

	 (dev_priv)->pch_id == INTEL_PCH_WPT_DEVICE_ID_TYPE)

#define HAS_PCH_CPT(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_CPT)

#define HAS_PCH_IBX(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_IBX)

#define HAS_PCH_NOP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_NOP)