diff options
author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2017-09-20 05:26:59 -0400 |
---|---|---|
committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2017-09-26 09:52:07 -0400 |
commit | 5a127a8c4aaf6ea06752ee6404cd7eaea7154a6c (patch) | |
tree | 1736fb4a6f89d087642202938e391fd95a36add6 | |
parent | 87dc03ad268f285065cdd2e2ac75701a1f04d0b8 (diff) |
drm/i915: Add IS_PLATFORM macro
This will allow some code re-organization in a following patch.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170920092701.17963-2-tvrtko.ursulin@linux.intel.com
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 44f5569ed995..b5d65d07432d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -2907,37 +2907,39 @@ intel_info(const struct drm_i915_private *dev_priv) | |||
2907 | #define IS_REVID(p, since, until) \ | 2907 | #define IS_REVID(p, since, until) \ |
2908 | (INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until)) | 2908 | (INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until)) |
2909 | 2909 | ||
2910 | #define IS_I830(dev_priv) ((dev_priv)->info.platform == INTEL_I830) | 2910 | #define IS_PLATFORM(dev_priv, p) ((dev_priv)->info.platform == (p)) |
2911 | #define IS_I845G(dev_priv) ((dev_priv)->info.platform == INTEL_I845G) | 2911 | |
2912 | #define IS_I85X(dev_priv) ((dev_priv)->info.platform == INTEL_I85X) | 2912 | #define IS_I830(dev_priv) IS_PLATFORM(dev_priv, INTEL_I830) |
2913 | #define IS_I865G(dev_priv) ((dev_priv)->info.platform == INTEL_I865G) | 2913 | #define IS_I845G(dev_priv) IS_PLATFORM(dev_priv, INTEL_I845G) |
2914 | #define IS_I915G(dev_priv) ((dev_priv)->info.platform == INTEL_I915G) | 2914 | #define IS_I85X(dev_priv) IS_PLATFORM(dev_priv, INTEL_I85X) |
2915 | #define IS_I915GM(dev_priv) ((dev_priv)->info.platform == INTEL_I915GM) | 2915 | #define IS_I865G(dev_priv) IS_PLATFORM(dev_priv, INTEL_I865G) |
2916 | #define IS_I945G(dev_priv) ((dev_priv)->info.platform == INTEL_I945G) | 2916 | #define IS_I915G(dev_priv) IS_PLATFORM(dev_priv, INTEL_I915G) |
2917 | #define IS_I945GM(dev_priv) ((dev_priv)->info.platform == INTEL_I945GM) | 2917 | #define IS_I915GM(dev_priv) IS_PLATFORM(dev_priv, INTEL_I915GM) |
2918 | #define IS_I965G(dev_priv) ((dev_priv)->info.platform == INTEL_I965G) | 2918 | #define IS_I945G(dev_priv) IS_PLATFORM(dev_priv, INTEL_I945G) |
2919 | #define IS_I965GM(dev_priv) ((dev_priv)->info.platform == INTEL_I965GM) | 2919 | #define IS_I945GM(dev_priv) IS_PLATFORM(dev_priv, INTEL_I945GM) |
2920 | #define IS_G45(dev_priv) ((dev_priv)->info.platform == INTEL_G45) | 2920 | #define IS_I965G(dev_priv) IS_PLATFORM(dev_priv, INTEL_I965G) |
2921 | #define IS_GM45(dev_priv) ((dev_priv)->info.platform == INTEL_GM45) | 2921 | #define IS_I965GM(dev_priv) IS_PLATFORM(dev_priv, INTEL_I965GM) |
2922 | #define IS_G45(dev_priv) IS_PLATFORM(dev_priv, INTEL_G45) | ||
2923 | #define IS_GM45(dev_priv) IS_PLATFORM(dev_priv, INTEL_GM45) | ||
2922 | #define IS_G4X(dev_priv) (IS_G45(dev_priv) || IS_GM45(dev_priv)) | 2924 | #define IS_G4X(dev_priv) (IS_G45(dev_priv) || IS_GM45(dev_priv)) |
2923 | #define IS_PINEVIEW_G(dev_priv) (INTEL_DEVID(dev_priv) == 0xa001) | 2925 | #define IS_PINEVIEW_G(dev_priv) (INTEL_DEVID(dev_priv) == 0xa001) |
2924 | #define IS_PINEVIEW_M(dev_priv) (INTEL_DEVID(dev_priv) == 0xa011) | 2926 | #define IS_PINEVIEW_M(dev_priv) (INTEL_DEVID(dev_priv) == 0xa011) |
2925 | #define IS_PINEVIEW(dev_priv) ((dev_priv)->info.platform == INTEL_PINEVIEW) | 2927 | #define IS_PINEVIEW(dev_priv) IS_PLATFORM(dev_priv, INTEL_PINEVIEW) |
2926 | #define IS_G33(dev_priv) ((dev_priv)->info.platform == INTEL_G33) | 2928 | #define IS_G33(dev_priv) IS_PLATFORM(dev_priv, INTEL_G33) |
2927 | #define IS_IRONLAKE_M(dev_priv) (INTEL_DEVID(dev_priv) == 0x0046) | 2929 | #define IS_IRONLAKE_M(dev_priv) (INTEL_DEVID(dev_priv) == 0x0046) |
2928 | #define IS_IVYBRIDGE(dev_priv) ((dev_priv)->info.platform == INTEL_IVYBRIDGE) | 2930 | #define IS_IVYBRIDGE(dev_priv) IS_PLATFORM(dev_priv, INTEL_IVYBRIDGE) |
2929 | #define IS_IVB_GT1(dev_priv) (IS_IVYBRIDGE(dev_priv) && \ | 2931 | #define IS_IVB_GT1(dev_priv) (IS_IVYBRIDGE(dev_priv) && \ |
2930 | (dev_priv)->info.gt == 1) | 2932 | (dev_priv)->info.gt == 1) |
2931 | #define IS_VALLEYVIEW(dev_priv) ((dev_priv)->info.platform == INTEL_VALLEYVIEW) | 2933 | #define IS_VALLEYVIEW(dev_priv) IS_PLATFORM(dev_priv, INTEL_VALLEYVIEW) |
2932 | #define IS_CHERRYVIEW(dev_priv) ((dev_priv)->info.platform == INTEL_CHERRYVIEW) | 2934 | #define IS_CHERRYVIEW(dev_priv) IS_PLATFORM(dev_priv, INTEL_CHERRYVIEW) |
2933 | #define IS_HASWELL(dev_priv) ((dev_priv)->info.platform == INTEL_HASWELL) | 2935 | #define IS_HASWELL(dev_priv) IS_PLATFORM(dev_priv, INTEL_HASWELL) |
2934 | #define IS_BROADWELL(dev_priv) ((dev_priv)->info.platform == INTEL_BROADWELL) | 2936 | #define IS_BROADWELL(dev_priv) IS_PLATFORM(dev_priv, INTEL_BROADWELL) |
2935 | #define IS_SKYLAKE(dev_priv) ((dev_priv)->info.platform == INTEL_SKYLAKE) | 2937 | #define IS_SKYLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_SKYLAKE) |
2936 | #define IS_BROXTON(dev_priv) ((dev_priv)->info.platform == INTEL_BROXTON) | 2938 | #define IS_BROXTON(dev_priv) IS_PLATFORM(dev_priv, INTEL_BROXTON) |
2937 | #define IS_KABYLAKE(dev_priv) ((dev_priv)->info.platform == INTEL_KABYLAKE) | 2939 | #define IS_KABYLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_KABYLAKE) |
2938 | #define IS_GEMINILAKE(dev_priv) ((dev_priv)->info.platform == INTEL_GEMINILAKE) | 2940 | #define IS_GEMINILAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_GEMINILAKE) |
2939 | #define IS_COFFEELAKE(dev_priv) ((dev_priv)->info.platform == INTEL_COFFEELAKE) | 2941 | #define IS_COFFEELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE) |
2940 | #define IS_CANNONLAKE(dev_priv) ((dev_priv)->info.platform == INTEL_CANNONLAKE) | 2942 | #define IS_CANNONLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_CANNONLAKE) |
2941 | #define IS_MOBILE(dev_priv) ((dev_priv)->info.is_mobile) | 2943 | #define IS_MOBILE(dev_priv) ((dev_priv)->info.is_mobile) |
2942 | #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ | 2944 | #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ |
2943 | (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00) | 2945 | (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00) |