From 92e8c52340d38054494e5de25a73470f0d8de110 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 22 Feb 2014 03:04:02 +0000 Subject: [PATCH] dri/i9*5: correctly calculate the amount of system memory The variable name states megabytes, while we calculate the amount in kilobytes. Correct this by dividing with the correct amount. Signed-off-by: Emil Velikov Cc: "10.0 10.1" Reviewed-by: Ian Romanick (cherry picked from commit fc25956badb8e1932cc19d8c97b4be16e92dfc65) --- src/mesa/drivers/dri/i915/intel_screen.c | 2 +- src/mesa/drivers/dri/i965/intel_screen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 296df16507e..884fdb5b719 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -744,7 +744,7 @@ i915_query_renderer_integer(__DRIscreen *psp, int param, unsigned int *value) * (uint64_t) system_page_size; const unsigned system_memory_megabytes = - (unsigned) (system_memory_bytes / 1024); + (unsigned) (system_memory_bytes / (1024 * 1024)); value[0] = MIN2(system_memory_megabytes, gpu_mappable_megabytes); return 0; diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 6ab3609c4ed..736e8faed84 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -846,7 +846,7 @@ brw_query_renderer_integer(__DRIscreen *psp, int param, unsigned int *value) * (uint64_t) system_page_size; const unsigned system_memory_megabytes = - (unsigned) (system_memory_bytes / 1024); + (unsigned) (system_memory_bytes / (1024 * 1024)); value[0] = MIN2(system_memory_megabytes, gpu_mappable_megabytes); return 0;