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

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

drm/i915: Clean up some expressions 



Write the '!(SNB||IVB)' checks in the CPT/PPT detections
as '!SNB && !IVB' to make it less messy looking, and clear out
some useless parens the from the virtualization PCH detection case.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170620130310.13245-5-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 243dec58

drivers/gpu/drm/i915/i915_drv.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -185,15 +185,15 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) 
				dev_priv->pch_id = id;

				dev_priv->pch_id = id;

				dev_priv->pch_type = PCH_CPT;

				dev_priv->pch_type = PCH_CPT;

				DRM_DEBUG_KMS("Found CougarPoint PCH\n");

				DRM_DEBUG_KMS("Found CougarPoint PCH\n");

				WARN_ON(!(IS_GEN6(dev_priv) ||

				WARN_ON(!IS_GEN6(dev_priv) &&

					IS_IVYBRIDGE(dev_priv)));

					!IS_IVYBRIDGE(dev_priv));

			} else if (id == INTEL_PCH_PPT_DEVICE_ID_TYPE) {

			} else if (id == INTEL_PCH_PPT_DEVICE_ID_TYPE) {

				/* PantherPoint is CPT compatible */

				/* PantherPoint is CPT compatible */

				dev_priv->pch_id = id;

				dev_priv->pch_id = id;

				dev_priv->pch_type = PCH_CPT;

				dev_priv->pch_type = PCH_CPT;

				DRM_DEBUG_KMS("Found PantherPoint PCH\n");

				DRM_DEBUG_KMS("Found PantherPoint PCH\n");

				WARN_ON(!(IS_GEN6(dev_priv) ||

				WARN_ON(!IS_GEN6(dev_priv) &&

					IS_IVYBRIDGE(dev_priv)));

					!IS_IVYBRIDGE(dev_priv));

			} else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {

			} else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {

				dev_priv->pch_id = id;

				dev_priv->pch_id = id;

				dev_priv->pch_type = PCH_LPT;

				dev_priv->pch_type = PCH_LPT;
@@ -240,9 +240,9 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) 
				DRM_DEBUG_KMS("Found CannonPoint LP PCH\n");

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

				WARN_ON(!IS_CANNONLAKE(dev_priv) &&

				WARN_ON(!IS_CANNONLAKE(dev_priv) &&

					!IS_COFFEELAKE(dev_priv));

					!IS_COFFEELAKE(dev_priv));

			} else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) ||

			} else if (id == INTEL_PCH_P2X_DEVICE_ID_TYPE ||

				   (id == INTEL_PCH_P3X_DEVICE_ID_TYPE) ||

				   id == INTEL_PCH_P3X_DEVICE_ID_TYPE ||

				   ((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) &&

				   (id == INTEL_PCH_QEMU_DEVICE_ID_TYPE &&

				    pch->subsystem_vendor ==

				    pch->subsystem_vendor ==

					    PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&

					    PCI_SUBVENDOR_ID_REDHAT_QUMRANET &&

				    pch->subsystem_device ==

				    pch->subsystem_device ==