Commit 9d0bad17 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move page_sizes to runtime info 



If it's modified runtime, it's runtime info.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMaarten Lankhort <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f6825dd97d2ba63aa395c30131c4b9e6ef32b0c8.1660910433.git.jani.nikula@intel.com
parent e6f19648

drivers/gpu/drm/i915/gem/i915_gem_pages.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, 
				 unsigned int sg_page_sizes)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	unsigned long supported = INTEL_INFO(i915)->page_sizes;

	unsigned long supported = RUNTIME_INFO(i915)->page_sizes;

	bool shrinkable;

	int i;

drivers/gpu/drm/i915/gem/selftests/huge_pages.c

+7 −7
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ fake_huge_pages_object(struct drm_i915_private *i915, u64 size, bool single) 
static int igt_check_page_sizes(struct i915_vma *vma)

{

	struct drm_i915_private *i915 = vma->vm->i915;

	unsigned int supported = INTEL_INFO(i915)->page_sizes;

	unsigned int supported = RUNTIME_INFO(i915)->page_sizes;

	struct drm_i915_gem_object *obj = vma->obj;

	int err;
@@ -419,7 +419,7 @@ static int igt_mock_exhaust_device_supported_pages(void *arg) 
{

	struct i915_ppgtt *ppgtt = arg;

	struct drm_i915_private *i915 = ppgtt->vm.i915;

	unsigned int saved_mask = INTEL_INFO(i915)->page_sizes;

	unsigned int saved_mask = RUNTIME_INFO(i915)->page_sizes;

	struct drm_i915_gem_object *obj;

	struct i915_vma *vma;

	int i, j, single;
@@ -438,7 +438,7 @@ static int igt_mock_exhaust_device_supported_pages(void *arg) 
				combination |= page_sizes[j];

		}



		mkwrite_device_info(i915)->page_sizes = combination;

		RUNTIME_INFO(i915)->page_sizes = combination;



		for (single = 0; single <= 1; ++single) {

			obj = fake_huge_pages_object(i915, combination, !!single);
@@ -485,7 +485,7 @@ static int igt_mock_exhaust_device_supported_pages(void *arg) 
out_put:

	i915_gem_object_put(obj);

out_device:

	mkwrite_device_info(i915)->page_sizes = saved_mask;

	RUNTIME_INFO(i915)->page_sizes = saved_mask;



	return err;

}
@@ -495,7 +495,7 @@ static int igt_mock_memory_region_huge_pages(void *arg) 
	const unsigned int flags[] = { 0, I915_BO_ALLOC_CONTIGUOUS };

	struct i915_ppgtt *ppgtt = arg;

	struct drm_i915_private *i915 = ppgtt->vm.i915;

	unsigned long supported = INTEL_INFO(i915)->page_sizes;

	unsigned long supported = RUNTIME_INFO(i915)->page_sizes;

	struct intel_memory_region *mem;

	struct drm_i915_gem_object *obj;

	struct i915_vma *vma;
@@ -573,7 +573,7 @@ static int igt_mock_ppgtt_misaligned_dma(void *arg) 
{

	struct i915_ppgtt *ppgtt = arg;

	struct drm_i915_private *i915 = ppgtt->vm.i915;

	unsigned long supported = INTEL_INFO(i915)->page_sizes;

	unsigned long supported = RUNTIME_INFO(i915)->page_sizes;

	struct drm_i915_gem_object *obj;

	int bit;

	int err;
@@ -1390,7 +1390,7 @@ static int igt_ppgtt_smoke_huge(void *arg) 
static int igt_ppgtt_sanity_check(void *arg)

{

	struct drm_i915_private *i915 = arg;

	unsigned int supported = INTEL_INFO(i915)->page_sizes;

	unsigned int supported = RUNTIME_INFO(i915)->page_sizes;

	struct {

		igt_create_fn fn;

		unsigned int flags;

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1218,7 +1218,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 


#define HAS_PAGE_SIZES(dev_priv, sizes) ({ \

	GEM_BUG_ON((sizes) == 0); \

	((sizes) & ~INTEL_INFO(dev_priv)->page_sizes) == 0; \

	((sizes) & ~RUNTIME_INFO(dev_priv)->page_sizes) == 0; \

})



#define HAS_OVERLAY(dev_priv)		 (INTEL_INFO(dev_priv)->display.has_overlay)

drivers/gpu/drm/i915/i915_gem.c

+1 −2
Original line number Diff line number Diff line
@@ -1091,8 +1091,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 


	/* We need to fallback to 4K pages if host doesn't support huge gtt. */

	if (intel_vgpu_active(dev_priv) && !intel_vgpu_has_huge_gtt(dev_priv))

		mkwrite_device_info(dev_priv)->page_sizes =

			I915_GTT_PAGE_SIZE_4K;

		RUNTIME_INFO(dev_priv)->page_sizes = I915_GTT_PAGE_SIZE_4K;



	ret = i915_gem_init_userptr(dev_priv);

	if (ret)

drivers/gpu/drm/i915/i915_pci.c

+9 −9
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 
/* Keep in gen based order, and chronological order within a gen */



#define GEN_DEFAULT_PAGE_SIZES \

	.page_sizes = I915_GTT_PAGE_SIZE_4K

	.__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K



#define GEN_DEFAULT_REGIONS \

	.memory_regions = REGION_SMEM | REGION_STOLEN_SMEM
@@ -647,7 +647,7 @@ static const struct intel_device_info chv_info = { 
};



#define GEN9_DEFAULT_PAGE_SIZES \

	.page_sizes = I915_GTT_PAGE_SIZE_4K | \

	.__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K | \

		I915_GTT_PAGE_SIZE_64K



#define GEN9_FEATURES \
@@ -802,7 +802,7 @@ static const struct intel_device_info cml_gt2_info = { 
};



#define GEN11_DEFAULT_PAGE_SIZES \

	.page_sizes = I915_GTT_PAGE_SIZE_4K | \

	.__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K | \

		I915_GTT_PAGE_SIZE_64K |		\

		I915_GTT_PAGE_SIZE_2M
@@ -1001,7 +1001,7 @@ static const struct intel_device_info adl_p_info = { 
#undef GEN



#define XE_HP_PAGE_SIZES \

	.page_sizes = I915_GTT_PAGE_SIZE_4K | \

	.__runtime.page_sizes = I915_GTT_PAGE_SIZE_4K | \

		I915_GTT_PAGE_SIZE_64K |		\

		I915_GTT_PAGE_SIZE_2M