After all, no Cannonlake has HPD_PORT_F, even the skus with port F. Also we will only reach this case if PORT_F is already there in use. So let's use IS_CANNONLAKE directly here and avoid the ugly check starting from here. Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> --- drivers/gpu/drm/i915/intel_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c index 648a13c6043c..927e23cb426c 100644 --- a/drivers/gpu/drm/i915/intel_hotplug.c +++ b/drivers/gpu/drm/i915/intel_hotplug.c @@ -101,7 +101,7 @@ enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv, case PORT_E: return HPD_PORT_E; case PORT_F: - if (IS_CNL_WITH_PORT_F(dev_priv)) + if (IS_CANNONLAKE(dev_priv)) return HPD_PORT_E; return HPD_PORT_F; default: -- 2.19.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx