diff options
| author | Rob Clark <[email protected]> | 2018-04-01 10:32:36 -0400 |
|---|---|---|
| committer | Juan A. Suarez Romero <[email protected]> | 2018-04-12 21:49:28 +0200 |
| commit | b582a4e910cec834944e71809d08e100e113aaf1 (patch) | |
| tree | 84c3ecc5a160c0eb9cc3dc2677b15aec04f4cb9e /src | |
| parent | ab520c95bd4fca8e4e79f301ceb4884058b636d6 (diff) | |
freedreno/a5xx: fix page faults on last level
We could alternatively fall back to using "old style" draw's for
mem<->gmem (ie. what <= a4xx do) when height is not aligned to 32,
but that is somewhat more work (and not really something that could
be applied to stable)
Cc: "18.0" <[email protected]>
Signed-off-by: Rob Clark <[email protected]>
(cherry picked from commit 1866f76f7bc3ec54b4e91eb7d329b2e6f7b6277c)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/freedreno/a5xx/fd5_resource.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_resource.c b/src/gallium/drivers/freedreno/a5xx/fd5_resource.c index 12ee6d76fc2..84fa64cec84 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_resource.c +++ b/src/gallium/drivers/freedreno/a5xx/fd5_resource.c @@ -73,6 +73,16 @@ setup_slices(struct fd_resource *rsc, uint32_t alignment, enum pipe_format forma aligned_height = align(aligned_height, heightalign); } else { pitchalign = 64; + + /* The blits used for mem<->gmem work at a granularity of + * 32x32, which can cause faults due to over-fetch on the + * last level. The simple solution is to over-allocate a + * bit the last level to ensure any over-fetch is harmless. + * The pitch is already sufficiently aligned, but height + * may not be: + */ + if (level == prsc->last_level) + aligned_height = align(aligned_height, 32); } if (layout == UTIL_FORMAT_LAYOUT_ASTC) |