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

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

drm/i915: Use HAS_PCH_CPT() everywhere 



We have a few cases comparing pch_type directly. Let's just replace
them with HAS_PCH_CPT() since CPT/PPT is what they're looking for.

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


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

drivers/gpu/drm/i915/intel_device_info.c

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) 
		 */

		if (fuse_strap & ILK_INTERNAL_DISPLAY_DISABLE ||

		    sfuse_strap & SFUSE_STRAP_DISPLAY_DISABLED ||

		    (dev_priv->pch_type == PCH_CPT &&

		    (HAS_PCH_CPT(dev_priv) &&

		     !(sfuse_strap & SFUSE_STRAP_FUSE_LOCK))) {

			DRM_INFO("Display fused off, disabling\n");

			info->num_pipes = 0;

drivers/gpu/drm/i915/intel_sdvo.c

+1 −1
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder, 
		sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;

	}



	if (INTEL_PCH_TYPE(dev_priv) >= PCH_CPT)

	if (HAS_PCH_CPT(dev_priv))

		sdvox |= SDVO_PIPE_SEL_CPT(crtc->pipe);

	else

		sdvox |= SDVO_PIPE_SEL(crtc->pipe);