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

Commit 9119708c authored by Kenneth Graunke's avatar Kenneth Graunke Committed by Daniel Vetter
Browse files

drm/i915: Split out Haswell code from gen6_pte_encode. 



Now that we have function pointers, it's cleaner to just create a new
per-platform PTE encoding function.

This should be identical in behavior to the previous code.

v2: Drop accidental inline keyword on hsw_pte_encode.

Signed-off-by: default avatarKenneth Graunke <kenneth@whitecape.org>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Tested-by: Daniel Leung <daniel.leung@linux.intel.com> [v1]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 93c34e70

drivers/gpu/drm/i915/i915_gem_gtt.c

+21 −11
Original line number Diff line number Diff line
@@ -51,19 +51,12 @@ static gen6_gtt_pte_t gen6_pte_encode(struct drm_device *dev, 


	switch (level) {

	case I915_CACHE_LLC_MLC:

		/* Haswell doesn't set L3 this way */

		if (IS_HASWELL(dev))

			pte |= GEN6_PTE_CACHE_LLC;

		else

		pte |= GEN6_PTE_CACHE_LLC_MLC;

		break;

	case I915_CACHE_LLC:

		pte |= GEN6_PTE_CACHE_LLC;

		break;

	case I915_CACHE_NONE:

		if (IS_HASWELL(dev))

			pte |= HSW_PTE_UNCACHED;

		else

		pte |= GEN6_PTE_UNCACHED;

		break;

	default:
@@ -94,6 +87,19 @@ static gen6_gtt_pte_t byt_pte_encode(struct drm_device *dev, 
	return pte;

}



static gen6_gtt_pte_t hsw_pte_encode(struct drm_device *dev,

				     dma_addr_t addr,

				     enum i915_cache_level level)

{

	gen6_gtt_pte_t pte = GEN6_PTE_VALID;

	pte |= GEN6_PTE_ADDR_ENCODE(addr);



	if (level != I915_CACHE_NONE)

		pte |= GEN6_PTE_CACHE_LLC;



	return pte;

}



static int gen6_ppgtt_enable(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -255,7 +261,9 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) 
	first_pd_entry_in_global_pt =

		gtt_total_entries(dev_priv->gtt) - I915_PPGTT_PD_ENTRIES;



	if (IS_VALLEYVIEW(dev)) {

	if (IS_HASWELL(dev)) {

		ppgtt->pte_encode = hsw_pte_encode;

	} else if (IS_VALLEYVIEW(dev)) {

		ppgtt->pte_encode = byt_pte_encode;

	} else {

		ppgtt->pte_encode = gen6_pte_encode;
@@ -849,7 +857,9 @@ int i915_gem_gtt_init(struct drm_device *dev) 
	} else {

		dev_priv->gtt.gtt_probe = gen6_gmch_probe;

		dev_priv->gtt.gtt_remove = gen6_gmch_remove;

		if (IS_VALLEYVIEW(dev)) {

		if (IS_HASWELL(dev)) {

			dev_priv->gtt.pte_encode = hsw_pte_encode;

		} else if (IS_VALLEYVIEW(dev)) {

			dev_priv->gtt.pte_encode = byt_pte_encode;

		} else {

			dev_priv->gtt.pte_encode = gen6_pte_encode;