diff options
| author | Jani Nikula | 2016-12-07 11:13:04 +0100 |
|---|---|---|
| committer | Jani Nikula | 2016-12-07 14:18:33 +0100 |
| commit | c0f86832e3fd0d125f22bf26040d24837d0412db (patch) | |
| tree | b99a4370532e31547c0fe207459b99289661652c /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | drm/i915: keep intel device info structs in gen based order (diff) | |
| download | kernel-qcow2-linux-c0f86832e3fd0d125f22bf26040d24837d0412db.tar.gz kernel-qcow2-linux-c0f86832e3fd0d125f22bf26040d24837d0412db.tar.xz kernel-qcow2-linux-c0f86832e3fd0d125f22bf26040d24837d0412db.zip | |
drm/i915: rename BROADWATER and CRESTLINE to I965G and I965GM, respectively
Add more consistency to our naming. Pineview remains the outlier. Keep
using code names for gen5+.
v2: rebased
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1481105584-23033-1-git-send-email-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 95f7a5ef0e36..00a36bf87993 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1734,7 +1734,7 @@ static int i915_sr_status(struct seq_file *m, void *unused) if (HAS_PCH_SPLIT(dev_priv)) sr_enabled = I915_READ(WM1_LP_ILK) & WM1_LP_SR_EN; - else if (IS_CRESTLINE(dev_priv) || IS_G4X(dev_priv) || + else if (IS_I965GM(dev_priv) || IS_G4X(dev_priv) || IS_I945G(dev_priv) || IS_I945GM(dev_priv)) sr_enabled = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN; else if (IS_I915GM(dev_priv)) |