From 7c2fdd9b8d281659a9aa1c64d80280973fef5d4d Mon Sep 17 00:00:00 2001 From: Dhinakaran Pandiyan Date: Mon, 4 Mar 2019 17:47:36 -0800 Subject: lib/rendercopy: Copy gen8 surface state definition to gen-9 header Create a gen9 specific struct so that the gen-9+ Yf/Ys tiling bits can be added there. Suggested-by: Katarzyna Dec Signed-off-by: Dhinakaran Pandiyan Reviewed-by: Katarzyna Dec --- lib/gen8_render.h | 1 - lib/gen9_render.h | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/rendercopy_gen9.c | 2 +- 3 files changed, 121 insertions(+), 2 deletions(-) diff --git a/lib/gen8_render.h b/lib/gen8_render.h index c62047d8..7e33bea2 100644 --- a/lib/gen8_render.h +++ b/lib/gen8_render.h @@ -10,7 +10,6 @@ #define GEN8_3DSTATE_HIER_DEPTH_BUFFER GEN4_3D(3, 0, 0x07) #define GEN8_3DSTATE_MULTISAMPLE GEN4_3D(3, 0, 0x0d) # define GEN8_3DSTATE_MULTISAMPLE_NUMSAMPLES_2 (1 << 1) -# define GEN9_3DSTATE_MULTISAMPLE_NUMSAMPLES_16 (4 << 1) #define GEN8_3DSTATE_WM_HZ_OP GEN4_3D(3, 0, 0x52) diff --git a/lib/gen9_render.h b/lib/gen9_render.h index 77f4966c..48945019 100644 --- a/lib/gen9_render.h +++ b/lib/gen9_render.h @@ -13,4 +13,124 @@ #define GEN9_PIPELINE_SELECTION_MASK (3 << 8) #define GEN9_PIPELINE_SELECT (GEN4_3D(1, 1, 4) | (3 << 8)) +#define GEN9_3DSTATE_MULTISAMPLE_NUMSAMPLES_16 (4 << 1) + +/* Shamelessly ripped from mesa */ +struct gen9_surface_state { + struct { + uint32_t cube_pos_z:1; + uint32_t cube_neg_z:1; + uint32_t cube_pos_y:1; + uint32_t cube_neg_y:1; + uint32_t cube_pos_x:1; + uint32_t cube_neg_x:1; + uint32_t media_boundary_pixel_mode:2; + uint32_t render_cache_read_write:1; + uint32_t smapler_l2_bypass:1; + uint32_t vert_line_stride_ofs:1; + uint32_t vert_line_stride:1; + uint32_t tiled_mode:2; + uint32_t horizontal_alignment:2; + uint32_t vertical_alignment:2; + uint32_t surface_format:9; /**< BRW_SURFACEFORMAT_x */ + uint32_t pad0:1; + uint32_t is_array:1; + uint32_t surface_type:3; /**< BRW_SURFACE_1D/2D/3D/CUBE */ + } ss0; + + struct { + uint32_t qpitch:15; + uint32_t pad1:4; + uint32_t base_mip_level:5; + uint32_t memory_object_control:7; + uint32_t pad0:1; + } ss1; + + struct { + uint32_t width:14; + uint32_t pad1:2; + uint32_t height:14; + uint32_t pad0:2; + } ss2; + + struct { + uint32_t pitch:18; + uint32_t pad:3; + uint32_t depth:11; + } ss3; + + struct { + uint32_t minimum_array_element:27; + uint32_t pad0:5; + } ss4; + + struct { + uint32_t mip_count:4; + uint32_t min_lod:4; + uint32_t pad3:6; + uint32_t coherency_type:1; + uint32_t pad2:5; + uint32_t ewa_disable_for_cube:1; + uint32_t y_offset:3; + uint32_t pad0:1; + uint32_t x_offset:7; + } ss5; + + struct { + 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 { + uint32_t resource_min_lod:12; + + /* Only on Haswell */ + uint32_t pad0:4; + uint32_t shader_chanel_select_a:3; + uint32_t shader_chanel_select_b:3; + uint32_t shader_chanel_select_g:3; + uint32_t shader_chanel_select_r:3; + + uint32_t alpha_clear_color:1; + uint32_t blue_clear_color:1; + uint32_t green_clear_color:1; + uint32_t red_clear_color:1; + } ss7; + + struct { + uint32_t base_addr; + } ss8; + + struct { + uint32_t base_addr_hi; + } ss9; + + struct { + uint32_t aux_base_addr; + } ss10; + + struct { + uint32_t aux_base_addr_hi; + } ss11; + + struct { + uint32_t hiz_depth_clear_value; + } ss12; + + struct { + uint32_t reserved; + } ss13; + + struct { + uint32_t reserved; + } ss14; + + struct { + uint32_t reserved; + } ss15; +}; + #endif diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c index e3d95a68..b21b43c0 100644 --- a/lib/rendercopy_gen9.c +++ b/lib/rendercopy_gen9.c @@ -176,7 +176,7 @@ gen6_render_flush(struct intel_batchbuffer *batch, static uint32_t gen8_bind_buf(struct intel_batchbuffer *batch, const struct igt_buf *buf, int is_dst) { - struct gen8_surface_state *ss; + struct gen9_surface_state *ss; uint32_t write_domain, read_domain, offset; int ret; -- cgit v1.2.3