diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2016-11-30 17:43:06 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-12-07 15:20:43 +0200 |
| commit | 06bcd84873da324a69505cb489f61da2832d87cb (patch) | |
| tree | d2096f285801d72996429f6731c5bcf277adf72f | |
| parent | f69c11aeb872e51bf3900a6c0c8397f9ddb9f5bc (diff) | |
drm/i915: use platform enum instead of duplicating PCI ID if possible
Duplicating the PCI ID for IS_FOO checks is redundant for a bunch of
platforms. Simplify.
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/4f79321aca2e003a627ba8b6809af3716b7c25c9.1480520526.git.jani.nikula@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 01e9f5b11f35..8daa4fb13b52 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2515,13 +2515,13 @@ intel_info(const struct drm_i915_private *dev_priv) #define IS_REVID(p, since, until) \ (INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until)) -#define IS_I830(dev_priv) (INTEL_DEVID(dev_priv) == 0x3577) -#define IS_I845G(dev_priv) (INTEL_DEVID(dev_priv) == 0x2562) +#define IS_I830(dev_priv) ((dev_priv)->info.platform == INTEL_I830) +#define IS_I845G(dev_priv) ((dev_priv)->info.platform == INTEL_I845G) #define IS_I85X(dev_priv) ((dev_priv)->info.platform == INTEL_I85X) -#define IS_I865G(dev_priv) (INTEL_DEVID(dev_priv) == 0x2572) +#define IS_I865G(dev_priv) ((dev_priv)->info.platform == INTEL_I865G) #define IS_I915G(dev_priv) ((dev_priv)->info.platform == INTEL_I915G) -#define IS_I915GM(dev_priv) (INTEL_DEVID(dev_priv) == 0x2592) -#define IS_I945G(dev_priv) (INTEL_DEVID(dev_priv) == 0x2772) +#define IS_I915GM(dev_priv) ((dev_priv)->info.platform == INTEL_I915GM) +#define IS_I945G(dev_priv) ((dev_priv)->info.platform == INTEL_I945G) #define IS_I945GM(dev_priv) ((dev_priv)->info.platform == INTEL_I945GM) #define IS_I965G(dev_priv) ((dev_priv)->info.platform == INTEL_I965G) #define IS_I965GM(dev_priv) ((dev_priv)->info.platform == INTEL_I965GM) |