Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/xe/compat: clean up unused platform check macros

Clean up unused platform check macros from compat i915_drv.h. Display no
longer uses any of the IS_*() platform checks. The remaining users are
part of the soc/ code. Note that in a comment.

Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://lore.kernel.org/r/2f09b3c60223d9426049a28d3d06a3ec2c6ec348.1744222449.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

+1 -35
+1 -35
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
··· 21 21 return container_of(dev, struct drm_i915_private, drm); 22 22 } 23 23 24 + /* compat platform checks only for soc/ usage */ 24 25 #define IS_PLATFORM(xe, x) ((xe)->info.platform == x) 25 - #define INTEL_INFO(dev_priv) (&((dev_priv)->info)) 26 - #define IS_I830(dev_priv) (dev_priv && 0) 27 - #define IS_I845G(dev_priv) (dev_priv && 0) 28 - #define IS_I85X(dev_priv) (dev_priv && 0) 29 - #define IS_I865G(dev_priv) (dev_priv && 0) 30 26 #define IS_I915G(dev_priv) (dev_priv && 0) 31 27 #define IS_I915GM(dev_priv) (dev_priv && 0) 32 - #define IS_I945G(dev_priv) (dev_priv && 0) 33 - #define IS_I945GM(dev_priv) (dev_priv && 0) 34 - #define IS_I965G(dev_priv) (dev_priv && 0) 35 - #define IS_I965GM(dev_priv) (dev_priv && 0) 36 - #define IS_G45(dev_priv) (dev_priv && 0) 37 - #define IS_GM45(dev_priv) (dev_priv && 0) 38 - #define IS_G4X(dev_priv) (dev_priv && 0) 39 28 #define IS_PINEVIEW(dev_priv) (dev_priv && 0) 40 - #define IS_G33(dev_priv) (dev_priv && 0) 41 - #define IS_IRONLAKE(dev_priv) (dev_priv && 0) 42 - #define IS_IRONLAKE_M(dev_priv) (dev_priv && 0) 43 - #define IS_SANDYBRIDGE(dev_priv) (dev_priv && 0) 44 29 #define IS_IVYBRIDGE(dev_priv) (dev_priv && 0) 45 - #define IS_IVB_GT1(dev_priv) (dev_priv && 0) 46 30 #define IS_VALLEYVIEW(dev_priv) (dev_priv && 0) 47 31 #define IS_CHERRYVIEW(dev_priv) (dev_priv && 0) 48 32 #define IS_HASWELL(dev_priv) (dev_priv && 0) ··· 54 70 55 71 #define IS_HASWELL_ULT(dev_priv) (dev_priv && 0) 56 72 #define IS_BROADWELL_ULT(dev_priv) (dev_priv && 0) 57 - #define IS_BROADWELL_ULX(dev_priv) (dev_priv && 0) 58 73 59 74 #define IS_MOBILE(xe) (xe && 0) 60 75 61 - #define IS_TIGERLAKE_UY(xe) (xe && 0) 62 - #define IS_COMETLAKE_ULX(xe) (xe && 0) 63 - #define IS_COFFEELAKE_ULX(xe) (xe && 0) 64 - #define IS_KABYLAKE_ULX(xe) (xe && 0) 65 - #define IS_SKYLAKE_ULX(xe) (xe && 0) 66 - #define IS_HASWELL_ULX(xe) (xe && 0) 67 - #define IS_COMETLAKE_ULT(xe) (xe && 0) 68 - #define IS_COFFEELAKE_ULT(xe) (xe && 0) 69 - #define IS_KABYLAKE_ULT(xe) (xe && 0) 70 - #define IS_SKYLAKE_ULT(xe) (xe && 0) 71 - 72 - #define IS_DG2_G10(xe) ((xe)->info.subplatform == XE_SUBPLATFORM_DG2_G10) 73 - #define IS_DG2_G11(xe) ((xe)->info.subplatform == XE_SUBPLATFORM_DG2_G11) 74 - #define IS_DG2_G12(xe) ((xe)->info.subplatform == XE_SUBPLATFORM_DG2_G12) 75 - #define IS_RAPTORLAKE_U(xe) ((xe)->info.subplatform == XE_SUBPLATFORM_ALDERLAKE_P_RPLU) 76 - #define IS_ICL_WITH_PORT_F(xe) (xe && 0) 77 76 #define HAS_FLAT_CCS(xe) (xe_device_has_flat_ccs(xe)) 78 - 79 77 #define HAS_128_BYTE_Y_TILING(xe) (xe || 1) 80 78 81 79 #ifdef CONFIG_ARM64