drm/i915: add HAS_DDI check

And use it whenever we call code that uses the DDIs. We already have
intel_ddi.c and prefix every function with intel_ddi_something instead of
haswell_something, so I think replacing the checks with HAS_DDI makes more
sense. Just a cosmetical change, yes I know, but I have this OCD...

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 511b397b5aaa..52b6b0e811bc 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1072,8 +1072,8 @@ static void assert_fdi_tx(struct drm_i915_private *dev_priv,
         enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv,
                                                                       pipe);
 
-        if (IS_HASWELL(dev_priv->dev)) {
-                /* On Haswell, DDI is used instead of FDI_TX_CTL */
+        if (HAS_DDI(dev_priv->dev)) {
+                /* DDI does not have a specific FDI_TX register */
                 reg = TRANS_DDI_FUNC_CTL(cpu_transcoder);
                 val = I915_READ(reg);
                 cur_state = !!(val & TRANS_DDI_FUNC_ENABLE);
@@ -1117,7 +1117,7 @@ static void assert_fdi_tx_pll_enabled(struct drm_i915_private *dev_priv,
                 return;
 
         /* On Haswell, DDI ports are responsible for the FDI PLL setup */
-        if (IS_HASWELL(dev_priv->dev))
+        if (HAS_DDI(dev_priv->dev))
                 return;
 
         reg = FDI_TX_CTL(pipe);
@@ -7976,7 +7976,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
 
 static void intel_cpu_pll_init(struct drm_device *dev)
 {
-        if (IS_HASWELL(dev))
+        if (HAS_DDI(dev))
                 intel_ddi_pll_init(dev);
 }
 
@@ -8112,11 +8112,10 @@ static void intel_setup_outputs(struct drm_device *dev)
                 I915_WRITE(PFIT_CONTROL, 0);
         }
 
-        if (!(IS_HASWELL(dev) &&
-              (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)))
+        if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)))
                 intel_crt_init(dev);
 
-        if (IS_HASWELL(dev)) {
+        if (HAS_DDI(dev)) {
                 int found;
 
                 /* Haswell uses DDI functions to detect digital outputs */
@@ -8360,7 +8359,7 @@ static void intel_init_display(struct drm_device *dev)
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         /* We always want a DPMS function */
-        if (IS_HASWELL(dev)) {
+        if (HAS_DDI(dev)) {
                 dev_priv->display.crtc_mode_set = haswell_crtc_mode_set;
                 dev_priv->display.crtc_enable = haswell_crtc_enable;
                 dev_priv->display.crtc_disable = haswell_crtc_disable;
@@ -8849,7 +8848,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
         struct intel_encoder *encoder;
         struct intel_connector *connector;
 
-        if (IS_HASWELL(dev)) {
+        if (HAS_DDI(dev)) {
                 tmp = I915_READ(TRANS_DDI_FUNC_CTL(TRANSCODER_EDP));
 
                 if (tmp & TRANS_DDI_FUNC_ENABLE) {
@@ -8890,7 +8889,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
                               crtc->active ? "enabled" : "disabled");
         }
 
-        if (IS_HASWELL(dev))
+        if (HAS_DDI(dev))
                 intel_ddi_setup_hw_pll_state(dev);
 
         list_for_each_entry(encoder, &dev->mode_config.encoder_list,