Attachment 96403 Details for Bug 76619 – Replace size_t with u64

[patch] Replace size_t with u64

0001-drm-i915-Replace-size_t-in-GTT-probing-with-u64.patch (text/plain), 7.46 KB, created by Chris Wilson on 2014-03-26 08:23:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-03-26 08:23:25 UTC

Size: 7.46 KB

patch

obsolete

>From 3416a79b5155615ce4996add6c1619ab19569ee1 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 26 Mar 2014 08:20:46 +0000
>Subject: [PATCH] drm/i915: Replace size_t in GTT probing with u64
>
>Broadwell requires more than 32bits to describe its address space when
>probing. Currently the probe uses size_t to pass around the limits,
>which is insufficient on a 32-bit kernel. So make the size explicit, and
>also expand the other probed values in case they also continue to grow
>exponentially.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76619
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/char/agp/intel-gtt.c        |  6 ++++--
> drivers/gpu/drm/i915/i915_debugfs.c |  2 +-
> drivers/gpu/drm/i915/i915_gem_gtt.c | 36 ++++++++++++++++++------------------
> drivers/gpu/drm/i915/i915_gem_gtt.h | 16 +++++++++-------
> include/drm/intel-gtt.h             |  6 ++++--
> 5 files changed, 36 insertions(+), 30 deletions(-)
>
>diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
>index 59b8a5fa3f5e..6d38e421b3b7 100644
>--- a/drivers/char/agp/intel-gtt.c
>+++ b/drivers/char/agp/intel-gtt.c
>@@ -1420,8 +1420,10 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
> }
> EXPORT_SYMBOL(intel_gmch_probe);
> 
>-void intel_gtt_get(size_t *gtt_total, size_t *stolen_size,
>-		   phys_addr_t *mappable_base, unsigned long *mappable_end)
>+void intel_gtt_get(u64 *gtt_total,
>+		   u64 *stolen_size,
>+		   phys_addr_t *mappable_base,
>+		   u64 *mappable_end)
> {
> 	*gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;
> 	*stolen_size = intel_private.stolen_size;
>diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>index e9ce40c2b908..e0c991122dd2 100644
>--- a/drivers/gpu/drm/i915/i915_debugfs.c
>+++ b/drivers/gpu/drm/i915/i915_debugfs.c
>@@ -435,7 +435,7 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
> 	seq_printf(m, "%u fault mappable objects, %zu bytes\n",
> 		   count, size);
> 
>-	seq_printf(m, "%zu [%lu] gtt total\n",
>+	seq_printf(m, "%qu [%qu] gtt total\n",
> 		   dev_priv->gtt.base.total,
> 		   dev_priv->gtt.mappable_end - dev_priv->gtt.base.start);
> 
>diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>index 5d61de18ae55..926cb4f33687 100644
>--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>@@ -1734,7 +1734,7 @@ static inline unsigned int gen6_get_total_gtt_size(u16 snb_gmch_ctl)
> 	return snb_gmch_ctl << 20;
> }
> 
>-static inline unsigned int gen8_get_total_gtt_size(u16 bdw_gmch_ctl)
>+static inline u64 gen8_get_total_gtt_size(u64 bdw_gmch_ctl)
> {
> 	bdw_gmch_ctl >>= BDW_GMCH_GGMS_SHIFT;
> 	bdw_gmch_ctl &= BDW_GMCH_GGMS_MASK;
>@@ -1743,14 +1743,14 @@ static inline unsigned int gen8_get_total_gtt_size(u16 bdw_gmch_ctl)
> 	return bdw_gmch_ctl << 20;
> }
> 
>-static inline size_t gen6_get_stolen_size(u16 snb_gmch_ctl)
>+static inline u32 gen6_get_stolen_size(u32 snb_gmch_ctl)
> {
> 	snb_gmch_ctl >>= SNB_GMCH_GMS_SHIFT;
> 	snb_gmch_ctl &= SNB_GMCH_GMS_MASK;
>-	return snb_gmch_ctl << 25; /* 32 MB units */
>+	return (u32)snb_gmch_ctl << 25; /* 32 MB units */
> }
> 
>-static inline size_t gen8_get_stolen_size(u16 bdw_gmch_ctl)
>+static inline u32 gen8_get_stolen_size(u32 bdw_gmch_ctl)
> {
> 	bdw_gmch_ctl >>= BDW_GMCH_GMS_SHIFT;
> 	bdw_gmch_ctl &= BDW_GMCH_GMS_MASK;
>@@ -1807,13 +1807,13 @@ static void gen8_setup_private_ppat(struct drm_i915_private *dev_priv)
> }
> 
> static int gen8_gmch_probe(struct drm_device *dev,
>-			   size_t *gtt_total,
>-			   size_t *stolen,
>+			   u64 *gtt_total,
>+			   u64 *stolen,
> 			   phys_addr_t *mappable_base,
>-			   unsigned long *mappable_end)
>+			   u64 *mappable_end)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
>-	unsigned int gtt_size;
>+	u64 gtt_size;
> 	u16 snb_gmch_ctl;
> 	int ret;
> 
>@@ -1842,10 +1842,10 @@ static int gen8_gmch_probe(struct drm_device *dev,
> }
> 
> static int gen6_gmch_probe(struct drm_device *dev,
>-			   size_t *gtt_total,
>-			   size_t *stolen,
>+			   u64 *gtt_total,
>+			   u64 *stolen,
> 			   phys_addr_t *mappable_base,
>-			   unsigned long *mappable_end)
>+			   u64 *mappable_end)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	unsigned int gtt_size;
>@@ -1859,7 +1859,7 @@ static int gen6_gmch_probe(struct drm_device *dev,
> 	 * a coarse sanity check.
> 	 */
> 	if ((*mappable_end < (64<<20) || (*mappable_end > (512<<20)))) {
>-		DRM_ERROR("Unknown GMADR size (%lx)\n",
>+		DRM_ERROR("Unknown GMADR size (%qx)\n",
> 			  dev_priv->gtt.mappable_end);
> 		return -ENXIO;
> 	}
>@@ -1892,10 +1892,10 @@ static void gen6_gmch_remove(struct i915_address_space *vm)
> }
> 
> static int i915_gmch_probe(struct drm_device *dev,
>-			   size_t *gtt_total,
>-			   size_t *stolen,
>+			   u64 *gtt_total,
>+			   u64 *stolen,
> 			   phys_addr_t *mappable_base,
>-			   unsigned long *mappable_end)
>+			   u64 *mappable_end)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	int ret;
>@@ -1957,10 +1957,10 @@ int i915_gem_gtt_init(struct drm_device *dev)
> 	gtt->base.dev = dev;
> 
> 	/* GMADR is the PCI mmio aperture into the global GTT. */
>-	DRM_INFO("Memory usable by graphics device = %zdM\n",
>+	DRM_INFO("Memory usable by graphics device = %qdM\n",
> 		 gtt->base.total >> 20);
>-	DRM_DEBUG_DRIVER("GMADR size = %ldM\n", gtt->mappable_end >> 20);
>-	DRM_DEBUG_DRIVER("GTT stolen size = %zdM\n", gtt->stolen_size >> 20);
>+	DRM_DEBUG_DRIVER("GMADR size = %qdM\n", gtt->mappable_end >> 20);
>+	DRM_DEBUG_DRIVER("GTT stolen size = %qdM\n", gtt->stolen_size >> 20);
> 
> 	return 0;
> }
>diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
>index b5e8ac0f5ce4..0ddfca7fdaea 100644
>--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
>+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
>@@ -162,8 +162,8 @@ struct i915_address_space {
> 	struct drm_mm mm;
> 	struct drm_device *dev;
> 	struct list_head global_link;
>-	unsigned long start;		/* Start offset always 0 for dri2 */
>-	size_t total;		/* size addr space maps (ex. 2GB for ggtt) */
>+	u64 start;		/* Start offset always 0 for dri2 */
>+	u64 total;		/* size addr space maps (ex. 2GB for ggtt) */
> 
> 	struct {
> 		dma_addr_t addr;
>@@ -217,9 +217,9 @@ struct i915_address_space {
>  */
> struct i915_gtt {
> 	struct i915_address_space base;
>-	size_t stolen_size;		/* Total size of stolen memory */
>+	u64 stolen_size;		/* Total size of stolen memory */
> 
>-	unsigned long mappable_end;	/* End offset that we can CPU map */
>+	u64 mappable_end;	/* End offset that we can CPU map */
> 	struct io_mapping *mappable;	/* Mapping to our CPU mappable region */
> 	phys_addr_t mappable_base;	/* PA of our GMADR */
> 
>@@ -231,9 +231,11 @@ struct i915_gtt {
> 	int mtrr;
> 
> 	/* global gtt ops */
>-	int (*gtt_probe)(struct drm_device *dev, size_t *gtt_total,
>-			  size_t *stolen, phys_addr_t *mappable_base,
>-			  unsigned long *mappable_end);
>+	int (*gtt_probe)(struct drm_device *dev,
>+			 u64 *gtt_total,
>+			 u64 *stolen,
>+			 phys_addr_t *mappable_base,
>+			 u64 *mappable_end);
> };
> 
> struct i915_hw_ppgtt {
>diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
>index b08bdade6002..ea1d9bb22501 100644
>--- a/include/drm/intel-gtt.h
>+++ b/include/drm/intel-gtt.h
>@@ -3,8 +3,10 @@
> #ifndef _DRM_INTEL_GTT_H
> #define	_DRM_INTEL_GTT_H
> 
>-void intel_gtt_get(size_t *gtt_total, size_t *stolen_size,
>-		   phys_addr_t *mappable_base, unsigned long *mappable_end);
>+void intel_gtt_get(u64 *gtt_total,
>+		   u64 *stolen_size,
>+		   phys_addr_t *mappable_base,
>+		   u64 *mappable_end);
> 
> int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
> 		     struct agp_bridge_data *bridge);
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 76619: 96401 | 96403 | 96440 | 96472 | 96879 | 99051 | 99361 | 99366 | 99989 | 100018

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.