diff mbox

[6/6] drm/i915: use platform enum instead of duplicating PCI ID if possible

Message ID 4f79321aca2e003a627ba8b6809af3716b7c25c9.1480520526.git.jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jani Nikula Nov. 30, 2016, 3:43 p.m. UTC 
Duplicating the PCI ID for IS_FOO checks is redundant for a bunch of
platforms. Simplify.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Joonas Lahtinen Dec. 1, 2016, 8 a.m. UTC | #1 
On ke, 2016-11-30 at 17:43 +0200, Jani Nikula wrote:
> Duplicating the PCI ID for IS_FOO checks is redundant for a bunch of
> platforms. Simplify.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

This should do pure good when optimizing the checks.

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Regards, Joonas
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 373eeef4f67c..4d573705a836 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2509,13 +2509,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)