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

drm/i915: Make IS_SKYLAKE only take dev_priv

Saves 1016 bytes of .rodata strings and couple hundred of .text.

v2: Add parantheses around dev_priv. (Ville Syrjala)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Jani Nikula <jani.nikula@linux.intel.com>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

+3 -3
+1 -1
drivers/gpu/drm/i915/i915_drv.h
··· 2659 2659 #define IS_CHERRYVIEW(dev) (INTEL_INFO(dev)->is_cherryview) 2660 2660 #define IS_HASWELL(dev_priv) ((dev_priv)->info.is_haswell) 2661 2661 #define IS_BROADWELL(dev_priv) ((dev_priv)->info.is_broadwell) 2662 - #define IS_SKYLAKE(dev) (INTEL_INFO(dev)->is_skylake) 2662 + #define IS_SKYLAKE(dev_priv) ((dev_priv)->info.is_skylake) 2663 2663 #define IS_BROXTON(dev) (INTEL_INFO(dev)->is_broxton) 2664 2664 #define IS_KABYLAKE(dev_priv) ((dev_priv)->info.is_kabylake) 2665 2665 #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile)
+1 -1
drivers/gpu/drm/i915/i915_gem_gtt.c
··· 2135 2135 I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW); 2136 2136 else if (IS_CHERRYVIEW(dev)) 2137 2137 I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_CHV); 2138 - else if (IS_SKYLAKE(dev)) 2138 + else if (IS_SKYLAKE(dev_priv)) 2139 2139 I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_SKL); 2140 2140 else if (IS_BROXTON(dev)) 2141 2141 I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_BXT);
+1 -1
drivers/gpu/drm/i915/intel_guc_loader.c
··· 728 728 729 729 if (!HAS_GUC_UCODE(dev)) { 730 730 fw_path = NULL; 731 - } else if (IS_SKYLAKE(dev)) { 731 + } else if (IS_SKYLAKE(dev_priv)) { 732 732 fw_path = I915_SKL_GUC_UCODE; 733 733 guc_fw->guc_fw_major_wanted = SKL_FW_MAJOR; 734 734 guc_fw->guc_fw_minor_wanted = SKL_FW_MINOR;