On Tue, May 12, 2015 at 10:35:09AM +0300, Mika Kuoppala wrote:
> We can have exactly 4GB sized ppgtt with 32bit system.
> size_t is inadequate for this.
>
> Signed-off-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx>
A quick grep shows that there's still lots of size_t in gem code
(i915_gem.c, i915_gem_gtt.c and parts of i915_debugfs.c). I think we need
to convert them all to avoid overflow issues.
-Daniel
> ---
> drivers/char/agp/intel-gtt.c | 2 +-
> drivers/gpu/drm/i915/i915_debugfs.c | 4 ++--
> drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++++----
> drivers/gpu/drm/i915/i915_gem_gtt.h | 6 +++---
> include/drm/intel-gtt.h | 2 +-
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
> index 0b4188b..2f0396c 100644
> --- a/drivers/char/agp/intel-gtt.c
> +++ b/drivers/char/agp/intel-gtt.c
> @@ -1408,7 +1408,7 @@ 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,
> +void intel_gtt_get(u64 *gtt_total, size_t *stolen_size,
> phys_addr_t *mappable_base, unsigned long *mappable_end)
> {
> *gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index adbbdda..44175f6 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -474,9 +474,9 @@ 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, "%llu [%llu] gtt total\n",
> dev_priv->gtt.base.total,
> - dev_priv->gtt.mappable_end - dev_priv->gtt.base.start);
> + (u64)dev_priv->gtt.mappable_end - dev_priv->gtt.base.start);
>
> seq_putc(m, '\n');
> print_batch_pool_stats(m, dev_priv);
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 17b7df0..525d154 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -2347,7 +2347,7 @@ static void chv_setup_private_ppat(struct drm_i915_private *dev_priv)
> }
>
> static int gen8_gmch_probe(struct drm_device *dev,
> - size_t *gtt_total,
> + u64 *gtt_total,
> size_t *stolen,
> phys_addr_t *mappable_base,
> unsigned long *mappable_end)
> @@ -2395,7 +2395,7 @@ static int gen8_gmch_probe(struct drm_device *dev,
> }
>
> static int gen6_gmch_probe(struct drm_device *dev,
> - size_t *gtt_total,
> + u64 *gtt_total,
> size_t *stolen,
> phys_addr_t *mappable_base,
> unsigned long *mappable_end)
> @@ -2446,7 +2446,7 @@ static void gen6_gmch_remove(struct i915_address_space *vm)
> }
>
> static int i915_gmch_probe(struct drm_device *dev,
> - size_t *gtt_total,
> + u64 *gtt_total,
> size_t *stolen,
> phys_addr_t *mappable_base,
> unsigned long *mappable_end)
> @@ -2514,7 +2514,7 @@ 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 = %lluM\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);
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
> index 0d46dd2..5786c7d 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -233,8 +233,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;
> @@ -314,7 +314,7 @@ struct i915_gtt {
> int mtrr;
>
> /* global gtt ops */
> - int (*gtt_probe)(struct drm_device *dev, size_t *gtt_total,
> + int (*gtt_probe)(struct drm_device *dev, u64 *gtt_total,
> size_t *stolen, phys_addr_t *mappable_base,
> unsigned long *mappable_end);
> };
> diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
> index b08bdad..dbf4105 100644
> --- a/include/drm/intel-gtt.h
> +++ b/include/drm/intel-gtt.h
> @@ -3,7 +3,7 @@
> #ifndef _DRM_INTEL_GTT_H
> #define _DRM_INTEL_GTT_H
>
> -void intel_gtt_get(size_t *gtt_total, size_t *stolen_size,
> +void intel_gtt_get(u64 *gtt_total, size_t *stolen_size,
> phys_addr_t *mappable_base, unsigned long *mappable_end);
>
> int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
