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

Commit 7e22dbbb authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Replace "INTEL_INFO->gen == x" checks with IS_GENx 



This way optimization from a previous patch works even better.

v2: Rebase.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent ab0d24ac

drivers/gpu/drm/i915/i915_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -2307,12 +2307,12 @@ static void gen6_ppgtt_info(struct seq_file *m, struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_engine_cs *engine;



	if (INTEL_INFO(dev)->gen == 6)

	if (IS_GEN6(dev_priv))

		seq_printf(m, "GFX_MODE: 0x%08x\n", I915_READ(GFX_MODE));



	for_each_engine(engine, dev_priv) {

		seq_printf(m, "%s\n", engine->name);

		if (INTEL_INFO(dev)->gen == 7)

		if (IS_GEN7(dev_priv))

			seq_printf(m, "GFX_MODE: 0x%08x\n",

				   I915_READ(RING_MODE_GEN7(engine)));

		seq_printf(m, "PP_DIR_BASE: 0x%08x\n",

drivers/gpu/drm/i915/i915_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev) 
		DRM_INFO("Display disabled (module parameter)\n");

		info->num_pipes = 0;

	} else if (info->num_pipes > 0 &&

		   (INTEL_INFO(dev)->gen == 7 || INTEL_INFO(dev)->gen == 8) &&

		   (IS_GEN7(dev_priv) || IS_GEN8(dev_priv)) &&

		   HAS_PCH_SPLIT(dev)) {

		u32 fuse_strap = I915_READ(FUSE_STRAP);

		u32 sfuse_strap = I915_READ(SFUSE_STRAP);
@@ -913,7 +913,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev) 
			DRM_INFO("PipeC fused off\n");

			info->num_pipes -= 1;

		}

	} else if (info->num_pipes > 0 && INTEL_INFO(dev)->gen == 9) {

	} else if (info->num_pipes > 0 && IS_GEN9(dev_priv)) {

		u32 dfsm = I915_READ(SKL_DFSM);

		u8 disabled_mask = 0;

		bool invalid;

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2702,7 +2702,7 @@ struct drm_i915_cmd_table { 
				 IS_CHERRYVIEW(dev) || IS_SKYLAKE(dev) || \

				 IS_KABYLAKE(dev) || IS_BROXTON(dev))

#define HAS_RC6(dev)		(INTEL_INFO(dev)->gen >= 6)

#define HAS_RC6p(dev)		(INTEL_INFO(dev)->gen == 6 || IS_IVYBRIDGE(dev))

#define HAS_RC6p(dev)		(IS_GEN6(dev) || IS_IVYBRIDGE(dev))



#define HAS_CSR(dev)	(IS_GEN9(dev))

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -1981,7 +1981,7 @@ i915_gem_get_gtt_size(struct drm_device *dev, uint32_t size, int tiling_mode) 
		return size;



	/* Previous chips need a power-of-two fence region when tiling */

	if (INTEL_INFO(dev)->gen == 3)

	if (IS_GEN3(dev))

		gtt_size = 1024*1024;

	else

		gtt_size = 512*1024;

drivers/gpu/drm/i915/i915_gem_stolen.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv, 


	/* See the comment at the drm_mm_init() call for more about this check.

	 * WaSkipStolenMemoryFirstPage:bdw,chv (incomplete) */

	if (INTEL_INFO(dev_priv)->gen == 8 && start < 4096)

	if (IS_GEN8(dev_priv) && start < 4096)

		start = 4096;



	mutex_lock(&dev_priv->mm.stolen_lock);