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

Commit b7128ef1 authored by Matthew Auld's avatar Matthew Auld Committed by Joonas Lahtinen
Browse files

drm/i915: prefer resource_size_t for everything stolen 



Keeps things consistent now that we make use of struct resource. This
should keep us covered in case we ever get huge amounts of stolen
memory.

v2: bunch of missing conversions (Chris)

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171211151822.20953-10-matthew.auld@intel.com
parent b1ace601

drivers/char/agp/intel-gtt.c

+6 −6
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct _intel_private { 
	unsigned int needs_dmar : 1;

	phys_addr_t gma_bus_addr;

	/*  Size of memory reserved for graphics by the BIOS */

	unsigned int stolen_size;

	resource_size_t stolen_size;

	/* Total number of gtt entries. */

	unsigned int gtt_total_entries;

	/* Part of the gtt that is mappable by the cpu, for those chips where
@@ -333,13 +333,13 @@ static void i810_write_entry(dma_addr_t addr, unsigned int entry, 
	writel_relaxed(addr | pte_flags, intel_private.gtt + entry);

}



static unsigned int intel_gtt_stolen_size(void)

static resource_size_t intel_gtt_stolen_size(void)

{

	u16 gmch_ctrl;

	u8 rdct;

	int local = 0;

	static const int ddt[4] = { 0, 16, 32, 64 };

	unsigned int stolen_size = 0;

	resource_size_t stolen_size = 0;



	if (INTEL_GTT_GEN == 1)

		return 0; /* no stolen mem on i81x */
@@ -417,8 +417,8 @@ static unsigned int intel_gtt_stolen_size(void) 
	}



	if (stolen_size > 0) {

		dev_info(&intel_private.bridge_dev->dev, "detected %dK %s memory\n",

		       stolen_size / KB(1), local ? "local" : "stolen");

		dev_info(&intel_private.bridge_dev->dev, "detected %lluK %s memory\n",

		       (u64)stolen_size / KB(1), local ? "local" : "stolen");

	} else {

		dev_info(&intel_private.bridge_dev->dev,

		       "no pre-allocated video memory detected\n");
@@ -1425,7 +1425,7 @@ EXPORT_SYMBOL(intel_gmch_probe); 


void intel_gtt_get(u64 *gtt_total,

		   phys_addr_t *mappable_base,

		   u64 *mappable_end)

		   resource_size_t *mappable_end)

{

	*gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;

	*mappable_base = intel_private.gma_bus_addr;

drivers/gpu/drm/i915/i915_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -522,8 +522,8 @@ static int i915_gem_object_info(struct seq_file *m, void *data) 
	seq_printf(m, "%u display objects (globally pinned), %llu bytes\n",

		   dpy_count, dpy_size);



	seq_printf(m, "%llu [%llu] gtt total\n",

		   ggtt->base.total, ggtt->mappable_end);

	seq_printf(m, "%llu [%pa] gtt total\n",

		   ggtt->base.total, &ggtt->mappable_end);

	seq_printf(m, "Supported page sizes: %s\n",

		   stringify_page_sizes(INTEL_INFO(dev_priv)->page_sizes,

					buf, sizeof(buf)));

drivers/gpu/drm/i915/i915_drv.h

+6 −5
Original line number Diff line number Diff line
@@ -2273,7 +2273,7 @@ struct drm_i915_private { 
	 * avoid the first page! The upper end of stolen memory is reserved for

	 * hardware functions and similarly removed from the accessible range.

	 */

	u32 stolen_usable_size;	/* Total size minus reserved ranges */

	resource_size_t stolen_usable_size;	/* Total size minus reserved ranges */



	void __iomem *regs;
@@ -3932,12 +3932,13 @@ void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, 
int i915_gem_init_stolen(struct drm_i915_private *dev_priv);

void i915_gem_cleanup_stolen(struct drm_device *dev);

struct drm_i915_gem_object *

i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, u32 size);

i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,

			      resource_size_t size);

struct drm_i915_gem_object *

i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv,

					       u32 stolen_offset,

					       u32 gtt_offset,

					       u32 size);

					       resource_size_t stolen_offset,

					       resource_size_t gtt_offset,

					       resource_size_t size);



/* i915_gem_internal.c */

struct drm_i915_gem_object *

drivers/gpu/drm/i915/i915_gem_gtt.c

+5 −5
Original line number Diff line number Diff line
@@ -3354,7 +3354,7 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt) 
	 * a coarse sanity check.

	 */

	if (ggtt->mappable_end < (64<<20) || ggtt->mappable_end > (512<<20)) {

		DRM_ERROR("Unknown GMADR size (%llx)\n", ggtt->mappable_end);

		DRM_ERROR("Unknown GMADR size (%pa)\n", &ggtt->mappable_end);

		return -ENXIO;

	}
@@ -3464,7 +3464,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv) 
	 */

	if (USES_GUC(dev_priv)) {

		ggtt->base.total = min_t(u64, ggtt->base.total, GUC_GGTT_TOP);

		ggtt->mappable_end = min(ggtt->mappable_end, ggtt->base.total);

		ggtt->mappable_end = min_t(u64, ggtt->mappable_end, ggtt->base.total);

	}



	if ((ggtt->base.total - 1) >> 32) {
@@ -3472,13 +3472,13 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv) 
			  " of address space! Found %lldM!\n",

			  ggtt->base.total >> 20);

		ggtt->base.total = 1ULL << 32;

		ggtt->mappable_end = min(ggtt->mappable_end, ggtt->base.total);

		ggtt->mappable_end = min_t(u64, ggtt->mappable_end, ggtt->base.total);

	}



	if (ggtt->mappable_end > ggtt->base.total) {

		DRM_ERROR("mappable aperture extends past end of GGTT,"

			  " aperture=%llx, total=%llx\n",

			  ggtt->mappable_end, ggtt->base.total);

			  " aperture=%pa, total=%llx\n",

			  &ggtt->mappable_end, ggtt->base.total);

		ggtt->mappable_end = ggtt->base.total;

	}

drivers/gpu/drm/i915/i915_gem_gtt.h

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ struct i915_ggtt { 


	struct io_mapping iomap;	/* Mapping to our CPU mappable region */

	struct resource gmadr;          /* GMADR resource */

	u64 mappable_end;		/* End offset that we can CPU map */

	resource_size_t mappable_end;	/* End offset that we can CPU map */



	/** "Graphics Stolen Memory" holds the global PTEs */

	void __iomem *gsm;