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

Commit 1893a71b authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Inline feature detection into sanitize_enable_ppgtt 



Rather than splitting and hiding away critical parts of
sanitize_enable_ppgtt() into single use macros in the headers, inline
them into the function for clarity.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 00caf019

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -2139,8 +2139,6 @@ struct drm_i915_cmd_table { 


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

#define HAS_LOGICAL_RING_CONTEXTS(dev)	(INTEL_INFO(dev)->gen >= 8)

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

#define HAS_PPGTT(dev)		(INTEL_INFO(dev)->gen >= 7 && !IS_GEN8(dev))

#define USES_PPGTT(dev)		(i915.enable_ppgtt)

#define USES_FULL_PPGTT(dev)	(i915.enable_ppgtt == 2)

drivers/gpu/drm/i915/i915_gem_gtt.c

+11 −3
Original line number Diff line number Diff line
@@ -35,13 +35,21 @@ static void chv_setup_private_ppat(struct drm_i915_private *dev_priv); 


static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)

{

	if (enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))

	bool has_aliasing_ppgtt;

	bool has_full_ppgtt;



	has_aliasing_ppgtt = INTEL_INFO(dev)->gen >= 6;

	has_full_ppgtt = INTEL_INFO(dev)->gen >= 7;

	if (IS_GEN8(dev))

		has_full_ppgtt = false; /* XXX why? */



	if (enable_ppgtt == 0 || !has_aliasing_ppgtt)

		return 0;



	if (enable_ppgtt == 1)

		return 1;



	if (enable_ppgtt == 2 && HAS_PPGTT(dev))

	if (enable_ppgtt == 2 && has_full_ppgtt)

		return 2;



#ifdef CONFIG_INTEL_IOMMU
@@ -59,7 +67,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt) 
		return 0;

	}



	return HAS_PPGTT(dev) ? 2 : HAS_ALIASING_PPGTT(dev) ? 1 : 0;

	return has_full_ppgtt ? 2 : has_aliasing_ppgtt ? 1 : 0;

}