diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-03-14 18:54:05 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-07-06 16:00:47 +0300 |
| commit | 6cc21d7caded2800810a4e11d4c00aaa1cf47aa4 (patch) | |
| tree | 4ef203801c8d30c9efd9f1b3c4da5bd3155de16d | |
| parent | a4393c3951ec6eb20901b4883c6549ea36affc33 (diff) | |
lib/rendercopy: Add enough surface state for AUX_CCS_E
Populate the gen8+ SURFACE_STATE aux bits correctly.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | lib/gen8_render.h | 12 | ||||
| -rw-r--r-- | lib/rendercopy_gen9.c | 14 |
2 files changed, 21 insertions, 5 deletions
diff --git a/lib/gen8_render.h b/lib/gen8_render.h index 048e667c..470dca0f 100644 --- a/lib/gen8_render.h +++ b/lib/gen8_render.h @@ -131,7 +131,11 @@ struct gen8_surface_state } ss5; struct { - uint32_t pad; /* Multisample Control Surface stuff */ + uint32_t aux_mode:3; + uint32_t aux_pitch:9; + uint32_t pad0:4; + uint32_t aux_qpitch:15; + uint32_t pad1:1; } ss6; struct { @@ -159,13 +163,11 @@ struct gen8_surface_state } ss9; struct { - uint32_t pad0:12; - uint32_t aux_base_addr:20; + uint32_t aux_base_addr; } ss10; struct { - uint32_t aux_base_addr_hi:16; - uint32_t pad:16; + uint32_t aux_base_addr_hi; } ss11; struct { diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c index db59c9f4..d9e7eaf9 100644 --- a/lib/rendercopy_gen9.c +++ b/lib/rendercopy_gen9.c @@ -189,6 +189,20 @@ gen8_bind_buf(struct intel_batchbuffer *batch, const struct igt_buf *buf, ss->ss7.shader_chanel_select_b = 6; ss->ss7.shader_chanel_select_a = 7; + if (buf->aux.stride) { + ss->ss6.aux_mode = 0x5; /* AUX_CCS_E */ + ss->ss6.aux_pitch = (buf->aux.stride / 128) - 1; + + ss->ss10.aux_base_addr = buf->bo->offset64 + buf->aux.offset; + ss->ss11.aux_base_addr_hi = (buf->bo->offset64 + buf->aux.offset) >> 32; + + ret = drm_intel_bo_emit_reloc(batch->bo, + intel_batchbuffer_subdata_offset(batch, &ss->ss10), + buf->bo, buf->aux.offset, + read_domain, write_domain); + assert(ret == 0); + } + return offset; } |