diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-02 10:42:00 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-02 10:42:00 +0000 |
| commit | 735219cd59e6184a6622d3d429a704ca3f58b9cd (patch) | |
| tree | 3bd8b3a707e43bd627cc12fb938c3fb590f206ab | |
| parent | f6c82c73b673ec3c9cce432fe38d5e0076234efd (diff) | |
uxa: Ensure that we can fallback with all of (src, mask, dst) as GTT mappings
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/intel_memory.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/intel_memory.c b/src/intel_memory.c index 7e0a6dd0..bfc0e8ca 100644 --- a/src/intel_memory.c +++ b/src/intel_memory.c @@ -182,13 +182,17 @@ static void intel_set_gem_max_sizes(ScrnInfoPtr scrn) size_t agp_size = agp_aperture_size(intel->PciInfo, INTEL_INFO(intel)->gen); - /* The chances of being able to mmap an object larger than this - * are slim, so don't try. */ - intel->max_gtt_map_size = agp_size / 2; + /* The chances of being able to mmap an object larger than + * agp_size/2 are slim. Moreover, we may be forced to fallback + * using a gtt mapping as both the source and a mask, as well + * as a destination and all need to fit into the aperture. + */ + intel->max_gtt_map_size = agp_size / 4; /* Let objects be tiled up to the size where only 4 would fit in - * the aperture, presuming best case alignment. */ - intel->max_tiling_size = agp_size / 4; + * the aperture, presuming best case alignment. Also if we + * cannot mmap it using the GTT we will be stuck. */ + intel->max_tiling_size = intel->max_gtt_map_size; /* Large BOs will tend to hit SW fallbacks frequently, and also will * tend to fail to successfully map when doing SW fallbacks because we |