The name mappable_end seems to suggest the end of the mappable region,
but is actually just the size, so make that obvious to the reader.

Signed-off-by: Matthew Auld <[email protected]>
Cc: Joonas Lahtinen <[email protected]>
Cc: Chris Wilson <[email protected]>
Cc: Paulo Zanoni <[email protected]>
---
 drivers/char/agp/intel-gtt.c                  |  4 ++--
 drivers/gpu/drm/i915/gvt/gvt.h                |  2 +-
 drivers/gpu/drm/i915/i915_debugfs.c           |  2 +-
 drivers/gpu/drm/i915/i915_drv.c               |  2 +-
 drivers/gpu/drm/i915/i915_gem.c               |  8 +++----
 drivers/gpu/drm/i915/i915_gem_execbuffer.c    |  2 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c           | 30 +++++++++++++--------------
 drivers/gpu/drm/i915/i915_gem_gtt.h           |  2 +-
 drivers/gpu/drm/i915/i915_vgpu.c              | 12 +++++------
 drivers/gpu/drm/i915/i915_vma.c               |  4 ++--
 drivers/gpu/drm/i915/intel_fbdev.c            |  2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |  2 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c     | 22 ++++++++++----------
 drivers/gpu/drm/i915/selftests/mock_gtt.c     |  2 +-
 include/drm/intel-gtt.h                       |  2 +-
 15 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 9b6b6023193b..2a321ee2943a 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1424,12 +1424,12 @@ EXPORT_SYMBOL(intel_gmch_probe);
 void intel_gtt_get(u64 *gtt_total,
                   u32 *stolen_size,
                   phys_addr_t *mappable_base,
-                  u64 *mappable_end)
+                  u64 *mappable_size)
 {
        *gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;
        *stolen_size = intel_private.stolen_size;
        *mappable_base = intel_private.gma_bus_addr;
-       *mappable_end = intel_private.gtt_mappable_entries << PAGE_SHIFT;
+       *mappable_size = intel_private.gtt_mappable_entries << PAGE_SHIFT;
 }
 EXPORT_SYMBOL(intel_gtt_get);
 
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 393066726993..028d00e61bad 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -335,7 +335,7 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt);
 #define HOST_FENCE 4
 
 /* Aperture/GM space definitions for GVT device */
-#define gvt_aperture_sz(gvt)     (gvt->dev_priv->ggtt.mappable_end)
+#define gvt_aperture_sz(gvt)     (gvt->dev_priv->ggtt.mappable_size)
 #define gvt_aperture_pa_base(gvt) (gvt->dev_priv->ggtt.mappable_base)
 
 #define gvt_ggtt_gm_sz(gvt)      (gvt->dev_priv->ggtt.base.total)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index 28294470ae31..a05e2b92c02c 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -523,7 +523,7 @@ static int i915_gem_object_info(struct seq_file *m, void 
*data)
                   dpy_count, dpy_size);
 
        seq_printf(m, "%llu [%llu] gtt total\n",
-                  ggtt->base.total, ggtt->mappable_end);
+                  ggtt->base.total, ggtt->mappable_size);
        seq_printf(m, "Supported page sizes: %s\n",
                   stringify_page_sizes(INTEL_INFO(dev_priv)->page_sizes,
                                        buf, sizeof(buf)));
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 0793a27e2b95..e1bb0c8822aa 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -729,7 +729,7 @@ static int i915_kick_out_firmware_fb(struct 
drm_i915_private *dev_priv)
                return -ENOMEM;
 
        ap->ranges[0].base = ggtt->mappable_base;
-       ap->ranges[0].size = ggtt->mappable_end;
+       ap->ranges[0].size = ggtt->mappable_size;
 
        primary =
                pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 21ca680e9e63..c054f47f6690 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -66,7 +66,7 @@ insert_mappable_node(struct i915_ggtt *ggtt,
        memset(node, 0, sizeof(*node));
        return drm_mm_insert_node_in_range(&ggtt->base.mm, node,
                                           size, 0, I915_COLOR_UNEVICTABLE,
-                                          0, ggtt->mappable_end,
+                                          0, ggtt->mappable_size,
                                           DRM_MM_INSERT_LOW);
 }
 
@@ -4158,7 +4158,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
                 * the object in and out of the Global GTT and
                 * waste a lot of cycles under the mutex.
                 */
-               if (obj->base.size > dev_priv->ggtt.mappable_end)
+               if (obj->base.size > dev_priv->ggtt.mappable_size)
                        return ERR_PTR(-E2BIG);
 
                /* If NONBLOCK is set the caller is optimistically
@@ -4177,7 +4177,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
                 * we could try to minimise harm to others.
                 */
                if (flags & PIN_NONBLOCK &&
-                   obj->base.size > dev_priv->ggtt.mappable_end / 2)
+                   obj->base.size > dev_priv->ggtt.mappable_size / 2)
                        return ERR_PTR(-ENOSPC);
        }
 
@@ -4191,7 +4191,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
                                return ERR_PTR(-ENOSPC);
 
                        if (flags & PIN_MAPPABLE &&
-                           vma->fence_size > dev_priv->ggtt.mappable_end / 2)
+                           vma->fence_size > dev_priv->ggtt.mappable_size / 2)
                                return ERR_PTR(-ENOSPC);
                }
 
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c 
b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 14d9e61a1e06..8224abbb0f2d 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -986,7 +986,7 @@ static void *reloc_iomap(struct drm_i915_gem_object *obj,
                        err = drm_mm_insert_node_in_range
                                (&ggtt->base.mm, &cache->node,
                                 PAGE_SIZE, 0, I915_COLOR_UNEVICTABLE,
-                                0, ggtt->mappable_end,
+                                0, ggtt->mappable_size,
                                 DRM_MM_INSERT_LOW);
                        if (err) /* no inactive aperture space, use cpu reloc */
                                return NULL;
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c 
b/drivers/gpu/drm/i915/i915_gem_gtt.c
index cccd0cb51e09..e47299fbdbc7 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2001,7 +2001,7 @@ static int gen6_ppgtt_allocate_page_directories(struct 
i915_hw_ppgtt *ppgtt)
        if (ret)
                goto err_out;
 
-       if (ppgtt->node.start < ggtt->mappable_end)
+       if (ppgtt->node.start < ggtt->mappable_size)
                DRM_DEBUG("Forced to use aperture for PDEs\n");
 
        ppgtt->pd.base.ggtt_offset =
@@ -2840,7 +2840,7 @@ int i915_gem_init_ggtt(struct drm_i915_private *dev_priv)
        /* Reserve a mappable slot for our lockless error capture */
        ret = drm_mm_insert_node_in_range(&ggtt->base.mm, &ggtt->error_capture,
                                          PAGE_SIZE, 0, I915_COLOR_UNEVICTABLE,
-                                         0, ggtt->mappable_end,
+                                         0, ggtt->mappable_size,
                                          DRM_MM_INSERT_LOW);
        if (ret)
                return ret;
@@ -3289,7 +3289,7 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)
 
        /* TODO: We're not aware of mappable constraints on gen8 yet */
        ggtt->mappable_base = pci_resource_start(pdev, 2);
-       ggtt->mappable_end = pci_resource_len(pdev, 2);
+       ggtt->mappable_size = pci_resource_len(pdev, 2);
 
        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(39));
        if (!err)
@@ -3346,13 +3346,13 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt)
        int err;
 
        ggtt->mappable_base = pci_resource_start(pdev, 2);
-       ggtt->mappable_end = pci_resource_len(pdev, 2);
+       ggtt->mappable_size = pci_resource_len(pdev, 2);
 
        /* 64/512MB is the current min/max we actually know of, but this is just
         * 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);
+       if (ggtt->mappable_size < (64<<20) || ggtt->mappable_size > (512<<20)) {
+               DRM_ERROR("Unknown GMADR size (%llx)\n", ggtt->mappable_size);
                return -ENXIO;
        }
 
@@ -3412,7 +3412,7 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt)
        intel_gtt_get(&ggtt->base.total,
                      &ggtt->stolen_size,
                      &ggtt->mappable_base,
-                     &ggtt->mappable_end);
+                     &ggtt->mappable_size);
 
        ggtt->do_idle_maps = needs_idle_maps(dev_priv);
        ggtt->base.insert_page = i915_ggtt_insert_page;
@@ -3460,7 +3460,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)
         */
        if (HAS_GUC(dev_priv) && i915_modparams.enable_guc_loading) {
                ggtt->base.total = min_t(u64, ggtt->base.total, GUC_GGTT_TOP);
-               ggtt->mappable_end = min(ggtt->mappable_end, ggtt->base.total);
+               ggtt->mappable_size = min(ggtt->mappable_size, 
ggtt->base.total);
        }
 
        if ((ggtt->base.total - 1) >> 32) {
@@ -3468,20 +3468,20 @@ 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_size = min(ggtt->mappable_size, 
ggtt->base.total);
        }
 
-       if (ggtt->mappable_end > ggtt->base.total) {
+       if (ggtt->mappable_size > ggtt->base.total) {
                DRM_ERROR("mappable aperture extends past end of GGTT,"
                          " aperture=%llx, total=%llx\n",
-                         ggtt->mappable_end, ggtt->base.total);
-               ggtt->mappable_end = ggtt->base.total;
+                         ggtt->mappable_size, ggtt->base.total);
+               ggtt->mappable_size = ggtt->base.total;
        }
 
        /* GMADR is the PCI mmio aperture into the global GTT. */
        DRM_INFO("Memory usable by graphics device = %lluM\n",
                 ggtt->base.total >> 20);
-       DRM_DEBUG_DRIVER("GMADR size = %lldM\n", ggtt->mappable_end >> 20);
+       DRM_DEBUG_DRIVER("GMADR size = %lldM\n", ggtt->mappable_size >> 20);
        DRM_DEBUG_DRIVER("GTT stolen size = %uM\n", ggtt->stolen_size >> 20);
        if (intel_vtd_active())
                DRM_INFO("VT-d active for gfx access\n");
@@ -3513,12 +3513,12 @@ int i915_ggtt_init_hw(struct drm_i915_private *dev_priv)
 
        if (!io_mapping_init_wc(&dev_priv->ggtt.mappable,
                                dev_priv->ggtt.mappable_base,
-                               dev_priv->ggtt.mappable_end)) {
+                               dev_priv->ggtt.mappable_size)) {
                ret = -EIO;
                goto out_gtt_cleanup;
        }
 
-       ggtt->mtrr = arch_phys_wc_add(ggtt->mappable_base, ggtt->mappable_end);
+       ggtt->mtrr = arch_phys_wc_add(ggtt->mappable_base, ggtt->mappable_size);
 
        /*
         * Initialise stolen early so that we may reserve preallocated
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h 
b/drivers/gpu/drm/i915/i915_gem_gtt.h
index 93211a96fdad..922d796983d5 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -371,7 +371,7 @@ struct i915_ggtt {
        struct io_mapping mappable;     /* Mapping to our CPU mappable region */
 
        phys_addr_t mappable_base;      /* PA of our GMADR */
-       u64 mappable_end;               /* End offset that we can CPU map */
+       u64 mappable_size;              /* Total mappable size that we can CPU 
map */
 
        /* Stolen memory is segmented in hardware with different portions
         * offlimits to certain functions.
diff --git a/drivers/gpu/drm/i915/i915_vgpu.c b/drivers/gpu/drm/i915/i915_vgpu.c
index 5fe9f3f39467..d1add5c4e312 100644
--- a/drivers/gpu/drm/i915/i915_vgpu.c
+++ b/drivers/gpu/drm/i915/i915_vgpu.c
@@ -220,17 +220,17 @@ int intel_vgt_balloon(struct drm_i915_private *dev_priv)
        DRM_INFO("Unmappable graphic memory: base 0x%lx size %ldKiB\n",
                 unmappable_base, unmappable_size / 1024);
 
-       if (mappable_end > ggtt->mappable_end ||
-           unmappable_base < ggtt->mappable_end ||
+       if (mappable_end > ggtt->mappable_size ||
+           unmappable_base < ggtt->mappable_size ||
            unmappable_end > ggtt_end) {
                DRM_ERROR("Invalid ballooning configuration!\n");
                return -EINVAL;
        }
 
        /* Unmappable graphic memory ballooning */
-       if (unmappable_base > ggtt->mappable_end) {
+       if (unmappable_base > ggtt->mappable_size) {
                ret = vgt_balloon_space(ggtt, &bl_info.space[2],
-                                       ggtt->mappable_end, unmappable_base);
+                                       ggtt->mappable_size, unmappable_base);
 
                if (ret)
                        goto err;
@@ -252,9 +252,9 @@ int intel_vgt_balloon(struct drm_i915_private *dev_priv)
                        goto err_upon_unmappable;
        }
 
-       if (mappable_end < ggtt->mappable_end) {
+       if (mappable_end < ggtt->mappable_size) {
                ret = vgt_balloon_space(ggtt, &bl_info.space[1],
-                                       mappable_end, ggtt->mappable_end);
+                                       mappable_end, ggtt->mappable_size);
 
                if (ret)
                        goto err_below_mappable;
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index bf6d8d1eaabe..a9413b601230 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -401,7 +401,7 @@ void __i915_vma_set_map_and_fenceable(struct i915_vma *vma)
        fenceable = (vma->node.size >= vma->fence_size &&
                     IS_ALIGNED(vma->node.start, vma->fence_alignment));
 
-       mappable = vma->node.start + vma->fence_size <= 
i915_vm_to_ggtt(vma->vm)->mappable_end;
+       mappable = vma->node.start + vma->fence_size <= 
i915_vm_to_ggtt(vma->vm)->mappable_size;
 
        if (mappable && fenceable)
                vma->flags |= I915_VMA_CAN_FENCE;
@@ -486,7 +486,7 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 
alignment, u64 flags)
 
        end = vma->vm->total;
        if (flags & PIN_MAPPABLE)
-               end = min_t(u64, end, dev_priv->ggtt.mappable_end);
+               end = min_t(u64, end, dev_priv->ggtt.mappable_size);
        if (flags & PIN_ZONE_4G)
                end = min_t(u64, end, (1ULL << 32) - I915_GTT_PAGE_SIZE);
        GEM_BUG_ON(!IS_ALIGNED(end, I915_GTT_PAGE_SIZE));
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c 
b/drivers/gpu/drm/i915/intel_fbdev.c
index b8af35187d22..e56262d1bc87 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -237,7 +237,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
 
        /* setup aperture base/size for vesafb takeover */
        info->apertures->ranges[0].base = dev->mode_config.fb_base;
-       info->apertures->ranges[0].size = ggtt->mappable_end;
+       info->apertures->ranges[0].size = ggtt->mappable_size;
 
        info->fix.smem_start = dev->mode_config.fb_base + i915_ggtt_offset(vma);
        info->fix.smem_len = vma->node.size;
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c 
b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index 6491cf0a4f46..e97ae4b4a684 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -1054,7 +1054,7 @@ static int igt_ggtt_page(void *arg)
        err = drm_mm_insert_node_in_range(&ggtt->base.mm, &tmp,
                                          1024 * PAGE_SIZE, 0,
                                          I915_COLOR_UNEVICTABLE,
-                                         0, ggtt->mappable_end,
+                                         0, ggtt->mappable_size,
                                          DRM_MM_INSERT_LOW);
        if (err)
                goto out_unpin;
diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c 
b/drivers/gpu/drm/i915/selftests/i915_vma.c
index eb89e301b602..f2e15bc1b82a 100644
--- a/drivers/gpu/drm/i915/selftests/i915_vma.c
+++ b/drivers/gpu/drm/i915/selftests/i915_vma.c
@@ -257,30 +257,30 @@ static int igt_vma_pin1(void *arg)
 
                VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | 4096),
                VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | 8192),
-               VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | 
(i915->ggtt.mappable_end - 4096)),
-               VALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | 
(i915->ggtt.mappable_end - 4096)),
+               VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | 
(i915->ggtt.mappable_size - 4096)),
+               VALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | 
(i915->ggtt.mappable_size - 4096)),
                VALID(0, PIN_GLOBAL | PIN_OFFSET_BIAS | (i915->ggtt.base.total 
- 4096)),
 
-               VALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | 
(i915->ggtt.mappable_end - 4096)),
-               INVALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | 
i915->ggtt.mappable_end),
+               VALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | 
(i915->ggtt.mappable_size - 4096)),
+               INVALID(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | 
i915->ggtt.mappable_size),
                VALID(0, PIN_GLOBAL | PIN_OFFSET_FIXED | (i915->ggtt.base.total 
- 4096)),
                INVALID(0, PIN_GLOBAL | PIN_OFFSET_FIXED | 
i915->ggtt.base.total),
                INVALID(0, PIN_GLOBAL | PIN_OFFSET_FIXED | round_down(U64_MAX, 
PAGE_SIZE)),
 
                VALID(4096, PIN_GLOBAL),
                VALID(8192, PIN_GLOBAL),
-               VALID(i915->ggtt.mappable_end - 4096, PIN_GLOBAL | 
PIN_MAPPABLE),
-               VALID(i915->ggtt.mappable_end, PIN_GLOBAL | PIN_MAPPABLE),
-               NOSPACE(i915->ggtt.mappable_end + 4096, PIN_GLOBAL | 
PIN_MAPPABLE),
+               VALID(i915->ggtt.mappable_size - 4096, PIN_GLOBAL | 
PIN_MAPPABLE),
+               VALID(i915->ggtt.mappable_size, PIN_GLOBAL | PIN_MAPPABLE),
+               NOSPACE(i915->ggtt.mappable_size + 4096, PIN_GLOBAL | 
PIN_MAPPABLE),
                VALID(i915->ggtt.base.total - 4096, PIN_GLOBAL),
                VALID(i915->ggtt.base.total, PIN_GLOBAL),
                NOSPACE(i915->ggtt.base.total + 4096, PIN_GLOBAL),
                NOSPACE(round_down(U64_MAX, PAGE_SIZE), PIN_GLOBAL),
-               INVALID(8192, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | 
(i915->ggtt.mappable_end - 4096)),
+               INVALID(8192, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_FIXED | 
(i915->ggtt.mappable_size - 4096)),
                INVALID(8192, PIN_GLOBAL | PIN_OFFSET_FIXED | 
(i915->ggtt.base.total - 4096)),
                INVALID(8192, PIN_GLOBAL | PIN_OFFSET_FIXED | 
(round_down(U64_MAX, PAGE_SIZE) - 4096)),
 
-               VALID(8192, PIN_GLOBAL | PIN_OFFSET_BIAS | 
(i915->ggtt.mappable_end - 4096)),
+               VALID(8192, PIN_GLOBAL | PIN_OFFSET_BIAS | 
(i915->ggtt.mappable_size - 4096)),
 
 #if !IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)
                /* Misusing BIAS is a programming error (it is not controllable
@@ -288,9 +288,9 @@ static int igt_vma_pin1(void *arg)
                 * However, the tests are still quite interesting for checking
                 * variable start, end and size.
                 */
-               NOSPACE(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | 
i915->ggtt.mappable_end),
+               NOSPACE(0, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | 
i915->ggtt.mappable_size),
                NOSPACE(0, PIN_GLOBAL | PIN_OFFSET_BIAS | 
i915->ggtt.base.total),
-               NOSPACE(8192, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | 
(i915->ggtt.mappable_end - 4096)),
+               NOSPACE(8192, PIN_GLOBAL | PIN_MAPPABLE | PIN_OFFSET_BIAS | 
(i915->ggtt.mappable_size - 4096)),
                NOSPACE(8192, PIN_GLOBAL | PIN_OFFSET_BIAS | 
(i915->ggtt.base.total - 4096)),
 #endif
                { },
diff --git a/drivers/gpu/drm/i915/selftests/mock_gtt.c 
b/drivers/gpu/drm/i915/selftests/mock_gtt.c
index 336e1afb250f..d3155f36de89 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gtt.c
@@ -111,7 +111,7 @@ void mock_init_ggtt(struct drm_i915_private *i915)
        ggtt->base.i915 = i915;
 
        ggtt->mappable_base = 0;
-       ggtt->mappable_end = 2048 * PAGE_SIZE;
+       ggtt->mappable_size = 2048 * PAGE_SIZE;
        ggtt->base.total = 4096 * PAGE_SIZE;
 
        ggtt->base.clear_range = nop_clear_range;
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
index c5db7975c640..e901de0b6dd8 100644
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
@@ -7,7 +7,7 @@
 void intel_gtt_get(u64 *gtt_total,
                   u32 *stolen_size,
                   phys_addr_t *mappable_base,
-                  u64 *mappable_end);
+                  u64 *mappable_size);
 
 int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
                     struct agp_bridge_data *bridge);
-- 
2.14.3

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to