OSDN Git Service

i965/drm: Assume aperture size query will work.
authorKenneth Graunke <kenneth@whitecape.org>
Fri, 24 Mar 2017 04:34:23 +0000 (21:34 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Mon, 10 Apr 2017 21:31:32 +0000 (14:31 -0700)
This query has been available since 2.6.28.  We require 3.6.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
src/mesa/drivers/dri/i965/intel_bufmgr_gem.c

index 440ec16..339e203 100644 (file)
@@ -3024,21 +3024,8 @@ drm_bacon_bufmgr_gem_init(int fd, int batch_size)
        }
 
        memclear(aperture);
-       ret = drmIoctl(bufmgr->fd,
-                      DRM_IOCTL_I915_GEM_GET_APERTURE,
-                      &aperture);
-
-       if (ret == 0)
-               bufmgr->gtt_size = aperture.aper_available_size;
-       else {
-               fprintf(stderr, "DRM_IOCTL_I915_GEM_APERTURE failed: %s\n",
-                       strerror(errno));
-               bufmgr->gtt_size = 128 * 1024 * 1024;
-               fprintf(stderr, "Assuming %dkB available aperture size.\n"
-                       "May lead to reduced performance or incorrect "
-                       "rendering.\n",
-                       (int)bufmgr->gtt_size / 1024);
-       }
+       drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
+       bufmgr->gtt_size = aperture.aper_available_size;
 
        bufmgr->pci_device = get_pci_device_id(bufmgr);