diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2015-07-01 16:32:24 +0300 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2015-07-16 13:48:20 +0300 |
| commit | af768922cafa3eb3e78a2fdfee90380a74c79460 (patch) | |
| tree | 712cdd566fbb06178e588b4093fa2d74bc2c1f8a /src/mesa/drivers/dri/i965/gen8_surface_state.c | |
| parent | 7e0180d57d330bd8d3047e841086712376b2a1cc (diff) | |
| download | external_mesa3d-af768922cafa3eb3e78a2fdfee90380a74c79460.zip external_mesa3d-af768922cafa3eb3e78a2fdfee90380a74c79460.tar.gz external_mesa3d-af768922cafa3eb3e78a2fdfee90380a74c79460.tar.bz2 | |
i965/gen9: Use custom MOCS entries set up by the kernel.
Instead of relying on hardware defaults the i915 kernel driver is
going program custom MOCS tables system-wide on Gen9 hardware. The
"WT" entry previously used for renderbuffers had a number of problems:
It disabled caching on eLLC, it used a reserved L3 cacheability
setting, and it used to override the PTE controls making renderbuffers
always WT on LLC regardless of the kernel's setting. Instead use an
entry from the new MOCS tables with parameters: TC=LLC/eLLC, LeCC=PTE,
L3CC=WB.
The "WB" entry previously used for anything other than renderbuffers
has moved to a different index in the new MOCS tables but it should
have the same caching semantics as the old entry.
Even though the corresponding kernel change ("drm/i915: Added
Programming of the MOCS") is in a way an ABI break it doesn't seem
necessary to check that the kernel is recent enough because the change
should only affect Gen9 which is still unreleased hardware.
v2: Update MOCS values for the new Android-incompatible tables
introduced in v7 of the kernel patch.
Cc: 10.6 <mesa-stable@lists.freedesktop.org>
Reference: http://lists.freedesktop.org/archives/intel-gfx/2015-July/071080.html
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen8_surface_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen8_surface_state.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/gen8_surface_state.c b/src/mesa/drivers/dri/i965/gen8_surface_state.c index bd3eb00..6c4d3e1 100644 --- a/src/mesa/drivers/dri/i965/gen8_surface_state.c +++ b/src/mesa/drivers/dri/i965/gen8_surface_state.c @@ -401,8 +401,7 @@ gen8_update_renderbuffer_surface(struct brw_context *brw, irb->mt_layer : (irb->mt_layer / MAX2(mt->num_samples, 1)); GLenum gl_target = rb->TexImage ? rb->TexImage->TexObject->Target : GL_TEXTURE_2D; - /* FINISHME: Use PTE MOCS on Skylake. */ - uint32_t mocs = brw->gen >= 9 ? SKL_MOCS_WT : BDW_MOCS_PTE; + const uint32_t mocs = brw->gen >= 9 ? SKL_MOCS_PTE : BDW_MOCS_PTE; intel_miptree_used_for_rendering(mt); |