diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-01-24 01:07:01 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-01-24 01:07:01 +0000 |
| commit | 9ae7913fc2d331bcc0aeadaef2d5b4d23413e410 (patch) | |
| tree | 96032eefac0131561fc9356aa1c5a3ec68534f21 /sys/dev/pci/drm | |
| parent | 083c9edec3bbb58083c98a06e55c2a91431a0701 (diff) | |
add some HAS_DDI() conversions that were missed in the earlier commit
Diffstat (limited to 'sys/dev/pci/drm')
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_display.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/i915/intel_display.c b/sys/dev/pci/drm/i915/intel_display.c index ac959654bad..0278cf83e3e 100644 --- a/sys/dev/pci/drm/i915/intel_display.c +++ b/sys/dev/pci/drm/i915/intel_display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_display.c,v 1.22 2014/01/23 11:18:34 jsg Exp $ */ +/* $OpenBSD: intel_display.c,v 1.23 2014/01/24 01:07:00 jsg Exp $ */ /* * Copyright © 2006-2007 Intel Corporation * @@ -1154,8 +1154,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)) { - /* On Haswell, DDI is used instead of FDI_TX_CTL */ + if (HAS_DDI(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); @@ -1200,7 +1200,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)) + if (HAS_DDI(dev)) return; reg = FDI_TX_CTL(pipe); |