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 <[email protected]>
Reviewed-by: Paulo Zanoni <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ee8156cf6f619a786dd534c5df5fe35f17892f35..1fff5b20f2a07c235f823a1bef3f5e64595619ce 100644 (file)
--- 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))