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

Commit 772c2a51 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Make IS_HASWELL only take dev_priv 



Saves 2432 bytes of .rodata strings.

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 8652744b

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2657,7 +2657,7 @@ struct drm_i915_cmd_table { 
				 INTEL_DEVID(dev_priv) == 0x015a)

#define IS_VALLEYVIEW(dev)	(INTEL_INFO(dev)->is_valleyview)

#define IS_CHERRYVIEW(dev)	(INTEL_INFO(dev)->is_cherryview)

#define IS_HASWELL(dev)	(INTEL_INFO(dev)->is_haswell)

#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_BROXTON(dev)		(INTEL_INFO(dev)->is_broxton)

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -4428,7 +4428,7 @@ i915_gem_init_hw(struct drm_device *dev) 
	if (HAS_EDRAM(dev) && INTEL_GEN(dev_priv) < 9)

		I915_WRITE(HSW_IDICR, I915_READ(HSW_IDICR) | IDIHASHMSK(0xf));



	if (IS_HASWELL(dev))

	if (IS_HASWELL(dev_priv))

		I915_WRITE(MI_PREDICATE_RESULT_2, IS_HSW_GT3(dev_priv) ?

			   LOWER_SLICE_ENABLED : LOWER_SLICE_DISABLED);

drivers/gpu/drm/i915/i915_gem_gtt.c

+2 −2
Original line number Diff line number Diff line
@@ -1748,7 +1748,7 @@ static void gen7_ppgtt_enable(struct drm_device *dev) 
	I915_WRITE(GAC_ECO_BITS, ecobits | ECOBITS_PPGTT_CACHE64B);



	ecochk = I915_READ(GAM_ECOCHK);

	if (IS_HASWELL(dev)) {

	if (IS_HASWELL(dev_priv)) {

		ecochk |= ECOCHK_PPGTT_WB_HSW;

	} else {

		ecochk |= ECOCHK_PPGTT_LLC_IVB;
@@ -2060,7 +2060,7 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) 
	ppgtt->base.pte_encode = ggtt->base.pte_encode;

	if (intel_vgpu_active(dev_priv) || IS_GEN6(dev))

		ppgtt->switch_mm = gen6_mm_switch;

	else if (IS_HASWELL(dev))

	else if (IS_HASWELL(dev_priv))

		ppgtt->switch_mm = hsw_mm_switch;

	else if (IS_GEN7(dev))

		ppgtt->switch_mm = gen7_mm_switch;

drivers/gpu/drm/i915/i915_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -3591,8 +3591,8 @@ static void gen5_gt_irq_postinstall(struct drm_device *dev) 
	dev_priv->gt_irq_mask = ~0;

	if (HAS_L3_DPF(dev)) {

		/* L3 parity interrupt is always unmasked. */

		dev_priv->gt_irq_mask = ~GT_PARITY_ERROR(dev);

		gt_irqs |= GT_PARITY_ERROR(dev);

		dev_priv->gt_irq_mask = ~GT_PARITY_ERROR(dev_priv);

		gt_irqs |= GT_PARITY_ERROR(dev_priv);

	}



	gt_irqs |= GT_RENDER_USER_INTERRUPT;

drivers/gpu/drm/i915/i915_reg.h

+2 −2
Original line number Diff line number Diff line
@@ -2093,9 +2093,9 @@ enum skl_disp_power_wells { 
#define PM_VEBOX_CS_ERROR_INTERRUPT		(1 << 12) /* hsw+ */

#define PM_VEBOX_USER_INTERRUPT			(1 << 10) /* hsw+ */



#define GT_PARITY_ERROR(dev) \

#define GT_PARITY_ERROR(dev_priv) \

	(GT_RENDER_L3_PARITY_ERROR_INTERRUPT | \

	 (IS_HASWELL(dev) ? GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 : 0))

	 (IS_HASWELL(dev_priv) ? GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 : 0))



/* These are all the "old" interrupts */

#define ILK_BSD_USER_INTERRUPT				(1<<5)