From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 11 Nov 2013 18:55:34 +0000 (-0800)
Subject: i915: Use drm_intel_get_aperture_sizes instead of drmAgpSize
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9fe108db0942ebf41cd1cce0ca6a6444901fbb0a;p=mesa.git

i915: Use drm_intel_get_aperture_sizes instead of drmAgpSize

Send the zombie back to the grave before it infects the townsfolk.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "10.0" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index a10331cea0b..1ef36207e6f 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -723,9 +723,13 @@ i915_query_renderer_integer(__DRIscreen *psp, int param, int *value)
        * assume that there's some fragmentation, and we start doing extra
        * flushing, etc.  That's the big cliff apps will care about.
        */
-      const unsigned long agp_bytes = drmAgpSize(psp->fd);
+      size_t aper_size;
+      size_t mappable_size;
+
+      drm_intel_get_aperture_sizes(psp->fd, &mappable_size, &aper_size);
+
       const unsigned gpu_mappable_megabytes =
-         (agp_bytes / (1024 * 1024)) * 3 / 4;
+         (aper_size / (1024 * 1024)) * 3 / 4;
 
       const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
       const long system_page_size = sysconf(_SC_PAGE_SIZE);