XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-03-24 01:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

sna: Check types on querying RAM

Browse Source 
Turns out to be a false alarm as the machine I was looking at only had
4GiB. I thought I was looking at another one and started panicking about
where had all the memory gone...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2015-02-25 11:25:10 +00:00
parent 41e559f57e
commit 6bf6b4b750
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sna/kgem.c
View File

@@ -920,11 +920,11 @@ total_ram_size(void)
#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
struct sysinfo info;
if (sysinfo(&info) == 0)
return info.totalram * info.mem_unit;
return (size_t)info.totalram * info.mem_unit;
#endif
#ifdef _SC_PHYS_PAGES
return sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGE_SIZE);
return (size_t)sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGE_SIZE);
#endif
return 0;
@@ -1657,7 +1657,7 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
kgem->aperture_high /= 2;
kgem->aperture_low /= 2;
}
DBG(("%s: aperture low=%d [%d], high=%d [%d]\n", __FUNCTION__,
DBG(("%s: aperture low=%u [%u], high=%u [%u]\n", __FUNCTION__,
kgem->aperture_low, kgem->aperture_low / (1024*1024),
kgem->aperture_high, kgem->aperture_high / (1024*1024)));
@@ -1695,7 +1695,7 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, unsigned gen)
__FUNCTION__));
totalram = kgem->aperture_total;
}
DBG(("%s: total ram=%ld\n", __FUNCTION__, (long)totalram));
DBG(("%s: total ram=%lld\n", __FUNCTION__, (long long)totalram));
if (kgem->max_object_size > totalram / 2)
kgem->max_object_size = totalram / 2;
if (kgem->max_gpu_size > totalram / 4)