From: Damien Lespiau Date: Wed, 1 Oct 2014 19:04:15 +0000 (+0100) Subject: drm/i915: Spell out IS_HSW/BDW_ULT() in intel_crt_present() X-Git-Tag: v3.19-rc1~73^2~78^2~53 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cf404ce4b1de77017208e73c91cd6f09524678b7;p=~emulex%2Finfiniband.git drm/i915: Spell out IS_HSW/BDW_ULT() in intel_crt_present() The quality of being a ULT or ULX package doesn't tell anything across generations and so a global IS_ULT() macro doesn't make much sense, esp. as we're adding new products. So, spell out which ULT/ULX SKUs we are talking about here, namely HSW and BDW. Signed-off-by: Damien Lespiau Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ee8156cf6f6..1fff5b20f2a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12162,7 +12162,7 @@ static bool intel_crt_present(struct drm_device *dev) if (INTEL_INFO(dev)->gen >= 9) return false; - if (IS_ULT(dev)) + if (IS_HSW_ULT(dev) || IS_BDW_ULT(dev)) return false; if (IS_CHERRYVIEW(dev))