Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9486e65 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

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: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 0853723b

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2659,7 +2659,7 @@ struct drm_i915_cmd_table { 
#define IS_CHERRYVIEW(dev)	(INTEL_INFO(dev)->is_cherryview)

#define IS_HASWELL(dev_priv)	((dev_priv)->info.is_haswell)

#define IS_BROADWELL(dev_priv)	((dev_priv)->info.is_broadwell)

#define IS_SKYLAKE(dev)	(INTEL_INFO(dev)->is_skylake)

#define IS_SKYLAKE(dev_priv)	((dev_priv)->info.is_skylake)

#define IS_BROXTON(dev)		(INTEL_INFO(dev)->is_broxton)

#define IS_KABYLAKE(dev_priv)	((dev_priv)->info.is_kabylake)

#define IS_MOBILE(dev)		(INTEL_INFO(dev)->is_mobile)

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -2135,7 +2135,7 @@ static void gtt_write_workarounds(struct drm_device *dev) 
		I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW);

	else if (IS_CHERRYVIEW(dev))

		I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_CHV);

	else if (IS_SKYLAKE(dev))

	else if (IS_SKYLAKE(dev_priv))

		I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_SKL);

	else if (IS_BROXTON(dev))

		I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_BXT);

drivers/gpu/drm/i915/intel_guc_loader.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ void intel_guc_init(struct drm_device *dev) 


	if (!HAS_GUC_UCODE(dev)) {

		fw_path = NULL;

	} else if (IS_SKYLAKE(dev)) {

	} else if (IS_SKYLAKE(dev_priv)) {

		fw_path = I915_SKL_GUC_UCODE;

		guc_fw->guc_fw_major_wanted = SKL_FW_MAJOR;

		guc_fw->guc_fw_minor_wanted = SKL_FW_MINOR;