Commit dc430400 authored by Matthew Auld's avatar Matthew Auld Committed by Daniel Vetter
Browse files

drm/i915: give stolen system memory its own class 



In some future patches we will need to also support a stolen region
carved from device local memory, on platforms like DG1. To handle this
we can simply describe each in terms of its own memory class.

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20210205102026.806699-2-matthew.auld@intel.com


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 8ec8ad0f

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

+2 −2
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ struct drm_i915_gem_object * 
i915_gem_object_create_stolen(struct drm_i915_private *i915,

			      resource_size_t size)

{

	return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_STOLEN],

	return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_STOLEN_SMEM],

					     size, I915_BO_ALLOC_CONTIGUOUS);

}
@@ -726,7 +726,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *i915, 
					       resource_size_t stolen_offset,

					       resource_size_t size)

{

	struct intel_memory_region *mem = i915->mm.regions[INTEL_REGION_STOLEN];

	struct intel_memory_region *mem = i915->mm.regions[INTEL_REGION_STOLEN_SMEM];

	struct drm_i915_gem_object *obj;

	struct drm_mm_node *stolen;

	int ret;

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		if (INTEL_GEN(i915) >= 9 && i915_selftest.live < 0 &&

		    i915->params.fake_lmem_start) {

			mkwrite_device_info(i915)->memory_regions =

				REGION_SMEM | REGION_LMEM | REGION_STOLEN;

				REGION_SMEM | REGION_LMEM | REGION_STOLEN_SMEM;

			GEM_BUG_ON(!HAS_LMEM(i915));

		}

	}

drivers/gpu/drm/i915/i915_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
	.page_sizes = I915_GTT_PAGE_SIZE_4K



#define GEN_DEFAULT_REGIONS \

	.memory_regions = REGION_SMEM | REGION_STOLEN

	.memory_regions = REGION_SMEM | REGION_STOLEN_SMEM



#define I830_FEATURES \

	GEN(2), \

drivers/gpu/drm/i915/intel_memory_region.c

+3 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ static const struct { 
		.class = INTEL_MEMORY_LOCAL,

		.instance = 0,

	},

	[INTEL_REGION_STOLEN] = {

		.class = INTEL_MEMORY_STOLEN,

	[INTEL_REGION_STOLEN_SMEM] = {

		.class = INTEL_MEMORY_STOLEN_SYSTEM,

		.instance = 0,

	},

};
@@ -278,7 +278,7 @@ int intel_memory_regions_hw_probe(struct drm_i915_private *i915) 
		case INTEL_MEMORY_SYSTEM:

			mem = i915_gem_shmem_setup(i915);

			break;

		case INTEL_MEMORY_STOLEN:

		case INTEL_MEMORY_STOLEN_SYSTEM:

			mem = i915_gem_stolen_setup(i915);

			break;

		default:

drivers/gpu/drm/i915/intel_memory_region.h

+3 −3
Original line number Diff line number Diff line
@@ -25,19 +25,19 @@ struct sg_table; 
enum intel_memory_type {

	INTEL_MEMORY_SYSTEM = 0,

	INTEL_MEMORY_LOCAL,

	INTEL_MEMORY_STOLEN,

	INTEL_MEMORY_STOLEN_SYSTEM,

};



enum intel_region_id {

	INTEL_REGION_SMEM = 0,

	INTEL_REGION_LMEM,

	INTEL_REGION_STOLEN,

	INTEL_REGION_STOLEN_SMEM,

	INTEL_REGION_UNKNOWN, /* Should be last */

};



#define REGION_SMEM     BIT(INTEL_REGION_SMEM)

#define REGION_LMEM     BIT(INTEL_REGION_LMEM)

#define REGION_STOLEN   BIT(INTEL_REGION_STOLEN)

#define REGION_STOLEN_SMEM   BIT(INTEL_REGION_STOLEN_SMEM)



#define I915_ALLOC_MIN_PAGE_SIZE  BIT(0)

#define I915_ALLOC_CONTIGUOUS     BIT(1)