diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-19 10:02:35 +0100 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2014-08-19 17:45:00 +0800 |
| commit | f921131a5cebc233749a86cdd44b409c0cecc4ef (patch) | |
| tree | ac4bf9fca78a9f87bdab70e86b263680f70038e6 /src/gallium/drivers/ilo | |
| parent | a4359bcaa599291ef1588376a419a0bcfbd02396 (diff) | |
ilo: fold drm_intel_get_aperture_sizes() within probe_winsys()
... and store the value in intel_winsys_info/ilo_dev_info.
Suggested-by: Chia-I Wu <olvaffe@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
olv: check for errors and report raw values
Diffstat (limited to 'src/gallium/drivers/ilo')
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_common.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_screen.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/ilo/ilo_common.h b/src/gallium/drivers/ilo/ilo_common.h index dd31f749bbf..e4f28b38122 100644 --- a/src/gallium/drivers/ilo/ilo_common.h +++ b/src/gallium/drivers/ilo/ilo_common.h @@ -68,6 +68,8 @@ enum ilo_debug { struct ilo_dev_info { /* these mirror intel_winsys_info */ int devid; + size_t aperture_total; + size_t aperture_mappable; int max_batch_size; bool has_llc; bool has_address_swizzling; diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c index ad59d6dfb94..72d66acf131 100644 --- a/src/gallium/drivers/ilo/ilo_screen.c +++ b/src/gallium/drivers/ilo/ilo_screen.c @@ -448,8 +448,7 @@ ilo_get_param(struct pipe_screen *screen, enum pipe_cap param) * assume that there's some fragmentation, and we start doing extra * flushing, etc. That's the big cliff apps will care about. */ - const int gpu_mappable_megabytes = - intel_winsys_get_aperture_size(is->winsys) * 3 / 4; + const uint64_t gpu_mappable_megabytes = is->dev.aperture_total * 3 / 4; uint64_t system_memory; if (!os_get_total_physical_memory(&system_memory)) @@ -638,6 +637,8 @@ static bool init_dev(struct ilo_dev_info *dev, const struct intel_winsys_info *info) { dev->devid = info->devid; + dev->aperture_total = info->aperture_total; + dev->aperture_mappable = info->aperture_mappable; dev->max_batch_size = info->max_batch_size; dev->has_llc = info->has_llc; dev->has_address_swizzling = info->has_address_swizzling; |