diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-12-03 17:14:42 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-12-07 14:55:56 -0800 |
| commit | f2b115e69d46344ae7afcaad5823496d2a0d8650 (patch) | |
| tree | 8bf56f7d43e3462a26088317bad04f04b676d26c /drivers/gpu/drm/i915/intel_i2c.c | |
| parent | 107f517b8f2a9d5858e640bc046606b1cff14bb5 (diff) | |
| download | blackbird-op-linux-f2b115e69d46344ae7afcaad5823496d2a0d8650.tar.gz blackbird-op-linux-f2b115e69d46344ae7afcaad5823496d2a0d8650.zip | |
drm/i915: Fix product names and #defines
IGD* isn't a useful name. Replace with the codenames, as sourced from
pci.ids.
Signed-off-by: Adam Jackson <ajax@redhat.com>
[anholt: Fixed up for merge with pineview/ironlake changes]
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_i2c.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index b94acc4cc05f..8673c735b8ab 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c @@ -39,7 +39,7 @@ void intel_i2c_quirk_set(struct drm_device *dev, bool enable) struct drm_i915_private *dev_priv = dev->dev_private; /* When using bit bashing for I2C, this bit needs to be set to 1 */ - if (!IS_IGD(dev)) + if (!IS_PINEVIEW(dev)) return; if (enable) I915_WRITE(DSPCLK_GATE_D, @@ -128,7 +128,7 @@ intel_i2c_reset_gmbus(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; - if (IS_IGDNG(dev)) { + if (IS_IRONLAKE(dev)) { I915_WRITE(PCH_GMBUS0, 0); } else { I915_WRITE(GMBUS0, 0); |
