X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fpanfrost%2Fpan_context.h;h=ac3e07defd403183240e056008fd70cbc0539695;hb=06d7648f116b031882ad7ec90c10a8d9ebc83f27;hp=57f32480e1f5e3cba01ce9eeab3c4fc08f514eef;hpb=464799932797e9605f14b8c955c5f581db68a016;p=mesa.git diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h index 57f32480e1f..ac3e07defd4 100644 --- a/src/gallium/drivers/panfrost/pan_context.h +++ b/src/gallium/drivers/panfrost/pan_context.h @@ -32,6 +32,8 @@ #include "pan_resource.h" #include "pan_job.h" #include "pan_blend.h" +#include "pan_encoder.h" +#include "pan_texture.h" #include "pipe/p_compiler.h" #include "pipe/p_config.h" @@ -51,17 +53,6 @@ struct prim_convert_context; #define MAX_VARYINGS 4096 -//#define PAN_DIRTY_CLEAR (1 << 0) -#define PAN_DIRTY_RASTERIZER (1 << 2) -#define PAN_DIRTY_FS (1 << 3) -#define PAN_DIRTY_FRAG_CORE (PAN_DIRTY_FS) /* Dirty writes are tied */ -#define PAN_DIRTY_VS (1 << 4) -#define PAN_DIRTY_VERTEX (1 << 5) -#define PAN_DIRTY_VERT_BUF (1 << 6) -//#define PAN_DIRTY_VIEWPORT (1 << 7) -#define PAN_DIRTY_SAMPLERS (1 << 8) -#define PAN_DIRTY_TEXTURES (1 << 9) - #define SET_BIT(lval, bit, cond) \ if (cond) \ lval |= (bit); \ @@ -79,68 +70,71 @@ struct panfrost_query { unsigned type; unsigned index; + /* For computed queries. 64-bit to prevent overflow */ + struct { + uint64_t start; + uint64_t end; + }; + /* Memory for the GPU to writeback the value of the query */ - struct panfrost_transfer transfer; + struct panfrost_bo *bo; }; struct panfrost_fence { struct pipe_reference reference; - int fd; + uint32_t syncobj; + bool signaled; +}; + +struct panfrost_streamout_target { + struct pipe_stream_output_target base; + uint32_t offset; +}; + +struct panfrost_streamout { + struct pipe_stream_output_target *targets[PIPE_MAX_SO_BUFFERS]; + unsigned num_targets; }; struct panfrost_context { /* Gallium context */ struct pipe_context base; - /* Compiler context */ - struct midgard_screen compiler; + /* Upload manager for small resident GPU-internal data structures, like + * sampler descriptors. We use an upload manager since the minimum BO + * size from the kernel is 4kb */ + struct u_upload_mgr *state_uploader; - /* Bound job and map of panfrost_job_key to jobs */ - struct panfrost_job *job; - struct hash_table *jobs; + /* Bound job batch and map of panfrost_batch_key to job batches */ + struct panfrost_batch *batch; + struct hash_table *batches; - /* panfrost_resource -> panfrost_job */ - struct hash_table *write_jobs; + /* panfrost_bo -> panfrost_bo_access */ + struct hash_table *accessed_bos; + + /* Within a launch_grid call.. */ + const struct pipe_grid_info *compute_grid; /* Bit mask for supported PIPE_DRAW for this hardware */ unsigned draw_modes; struct pipe_framebuffer_state pipe_framebuffer; + struct panfrost_streamout streamout; - struct panfrost_memory cmdstream_persistent; - struct panfrost_memory shaders; - struct panfrost_memory scratchpad; - struct panfrost_memory tiler_heap; - struct panfrost_memory tiler_polygon_list; - struct panfrost_memory tiler_dummy; - struct panfrost_memory depth_stencil_buffer; - + bool active_queries; + uint64_t prims_generated; + uint64_t tf_prims_generated; struct panfrost_query *occlusion_query; - /* Each draw has corresponding vertex and tiler payloads */ - struct midgard_payload_vertex_tiler payloads[PIPE_SHADER_TYPES]; - - /* The fragment shader binary itself is pointed here (for the tripipe) but - * also everything else in the shader core, including blending, the - * stencil/depth tests, etc. Refer to the presentations. */ - - struct mali_shader_meta fragment_shader_core; - - /* Per-draw Dirty flags are setup like any other driver */ - int dirty; - unsigned vertex_count; unsigned instance_count; + unsigned offset_start; + enum pipe_prim_type active_prim; /* If instancing is enabled, vertex count padded for instance; if * it is disabled, just equal to plain vertex count */ unsigned padded_count; - union mali_attr attributes[PIPE_MAX_ATTRIBS]; - - struct mali_single_framebuffer vt_framebuffer_sfbd; - struct bifrost_framebuffer vt_framebuffer_mfbd; - /* TODO: Multiple uniform buffers (index =/= 0), finer updates? */ struct panfrost_constant_buffer constant_buffer[PIPE_SHADER_TYPES]; @@ -171,63 +165,85 @@ struct panfrost_context { * errors due to unsupported reucrsion */ struct blitter_context *blitter_wallpaper; - struct panfrost_job *wallpaper_batch; + struct panfrost_batch *wallpaper_batch; struct panfrost_blend_state *blend; struct pipe_viewport_state pipe_viewport; struct pipe_scissor_state scissor; struct pipe_blend_color blend_color; - struct pipe_depth_stencil_alpha_state *depth_stencil; + struct panfrost_zsa_state *depth_stencil; struct pipe_stencil_ref stencil_ref; + unsigned sample_mask; + unsigned min_samples; - /* True for t6XX, false for t8xx. */ - bool is_t6xx; - - uint32_t out_sync; + struct panfrost_blend_state blit_blend; }; /* Corresponds to the CSO */ struct panfrost_rasterizer { struct pipe_rasterizer_state base; - - /* Bitmask of front face, etc */ - unsigned tiler_gl_enables; }; /* Variants bundle together to form the backing CSO, bundling multiple - * shaders with varying emulated features baked in (alpha test - * parameters, etc) */ -#define MAX_SHADER_VARIANTS 8 + * shaders with varying emulated features baked in */ /* A shader state corresponds to the actual, current variant of the shader */ struct panfrost_shader_state { /* Compiled, mapped descriptor, ready for the hardware */ bool compiled; - struct mali_shader_meta *tripipe; + + /* Uploaded shader descriptor (TODO: maybe stuff the packed unuploaded + * bits in a union to save some memory?) */ + + struct { + struct pipe_resource *rsrc; + uint32_t offset; + } upload; + + struct mali_shader_packed shader; + struct mali_midgard_properties_packed properties; + struct mali_preload_packed preload; /* Non-descript information */ - int uniform_count; + unsigned uniform_count; + unsigned work_reg_count; bool can_discard; bool writes_point_size; + bool writes_depth; + bool writes_stencil; bool reads_point_coord; bool reads_face; + bool reads_frag_coord; + bool writes_global; + unsigned stack_size; + unsigned shared_size; + + /* Does the fragment shader have side effects? In particular, if output + * is masked out, is it legal to skip shader execution? */ + bool fs_sidefx; - struct mali_attr_meta varyings[PIPE_MAX_ATTRIBS]; + /* For Bifrost - output type for each RT */ + enum bifrost_shader_type blend_types[BIFROST_MAX_RENDER_TARGET_COUNT]; + + unsigned attribute_count, varying_count, ubo_count; + enum mali_format varyings[PIPE_MAX_ATTRIBS]; gl_varying_slot varyings_loc[PIPE_MAX_ATTRIBS]; + struct pipe_stream_output_info stream_output; + uint64_t so_mask; unsigned sysval_count; unsigned sysval[MAX_SYSVAL_COUNT]; - /* Information on this particular shader variant */ - struct pipe_alpha_state alpha_state; - - uint16_t point_sprite_mask; - unsigned point_sprite_upper_left : 1; - /* Should we enable helper invocations */ bool helper_invocations; + + /* GPU-executable memory */ + struct panfrost_bo *bo; + + BITSET_WORD outputs_read; + enum pipe_format rt_formats[8]; }; /* A collection of varyings (the CSO) */ @@ -242,7 +258,9 @@ struct panfrost_shader_variants { struct pipe_compute_state cbase; }; - struct panfrost_shader_state variants[MAX_SHADER_VARIANTS]; + struct panfrost_shader_state *variants; + unsigned variant_space; + unsigned variant_count; /* The current active variant */ @@ -253,20 +271,32 @@ struct panfrost_vertex_state { unsigned num_elements; struct pipe_vertex_element pipe[PIPE_MAX_ATTRIBS]; - struct mali_attr_meta hw[PIPE_MAX_ATTRIBS]; + unsigned formats[PIPE_MAX_ATTRIBS]; +}; + +struct panfrost_zsa_state { + struct pipe_depth_stencil_alpha_state base; + + /* Precomputed stencil state */ + struct mali_stencil_packed stencil_front; + struct mali_stencil_packed stencil_back; + u8 stencil_mask_front; + u8 stencil_mask_back; }; struct panfrost_sampler_state { struct pipe_sampler_state base; - struct mali_sampler_descriptor hw; + struct mali_midgard_sampler_packed hw; }; /* Misnomer: Sampler view corresponds to textures, not samplers */ struct panfrost_sampler_view { struct pipe_sampler_view base; - struct mali_texture_descriptor hw; - bool manual_stride; + struct panfrost_bo *bo; + struct mali_bifrost_texture_packed bifrost_descriptor; + mali_ptr texture_bo; + uint64_t modifier; }; static inline struct panfrost_context * @@ -275,95 +305,76 @@ pan_context(struct pipe_context *pcontext) return (struct panfrost_context *) pcontext; } +static inline struct panfrost_streamout_target * +pan_so_target(struct pipe_stream_output_target *target) +{ + return (struct panfrost_streamout_target *)target; +} + +static inline struct panfrost_shader_state * +panfrost_get_shader_state(struct panfrost_context *ctx, + enum pipe_shader_type st) +{ + struct panfrost_shader_variants *all = ctx->shader[st]; + + if (!all) + return NULL; + + return &all->variants[all->active_variant]; +} + struct pipe_context * panfrost_create_context(struct pipe_screen *screen, void *priv, unsigned flags); -void -panfrost_emit_for_draw(struct panfrost_context *ctx, bool with_vertex_data); +bool +panfrost_writes_point_size(struct panfrost_context *ctx); struct panfrost_transfer panfrost_vertex_tiler_job(struct panfrost_context *ctx, bool is_tiler); -unsigned -panfrost_get_default_swizzle(unsigned components); - void panfrost_flush( struct pipe_context *pipe, struct pipe_fence_handle **fence, unsigned flags); -bool -panfrost_is_scanout(struct panfrost_context *ctx); +mali_ptr panfrost_sfbd_fragment(struct panfrost_batch *batch, bool has_draws); +mali_ptr panfrost_mfbd_fragment(struct panfrost_batch *batch, bool has_draws); -mali_ptr panfrost_sfbd_fragment(struct panfrost_context *ctx, bool has_draws); -mali_ptr panfrost_mfbd_fragment(struct panfrost_context *ctx, bool has_draws); +void +panfrost_attach_mfbd(struct panfrost_batch *batch, unsigned vertex_count); -struct bifrost_framebuffer -panfrost_emit_mfbd(struct panfrost_context *ctx, unsigned vertex_count); +void +panfrost_attach_sfbd(struct panfrost_batch *batch, unsigned vertex_count); -struct mali_single_framebuffer -panfrost_emit_sfbd(struct panfrost_context *ctx, unsigned vertex_count); +struct midgard_tiler_descriptor +panfrost_emit_midg_tiler(struct panfrost_batch *batch, unsigned vertex_count); mali_ptr -panfrost_fragment_job(struct panfrost_context *ctx, bool has_draws); +panfrost_fragment_job(struct panfrost_batch *batch, bool has_draws); void -panfrost_shader_compile( - struct panfrost_context *ctx, - struct mali_shader_meta *meta, - enum pipe_shader_ir ir_type, - const void *ir, - const char *src, - gl_shader_stage stage, - struct panfrost_shader_state *state); +panfrost_shader_compile(struct panfrost_context *ctx, + enum pipe_shader_ir ir_type, + const void *ir, + gl_shader_stage stage, + struct panfrost_shader_state *state, + uint64_t *outputs_written); void -panfrost_pack_work_groups_compute( - struct mali_vertex_tiler_prefix *out, - unsigned num_x, - unsigned num_y, - unsigned num_z, - unsigned size_x, - unsigned size_y, - unsigned size_z); - -void -panfrost_pack_work_groups_fused( - struct mali_vertex_tiler_prefix *vertex, - struct mali_vertex_tiler_prefix *tiler, - unsigned num_x, - unsigned num_y, - unsigned num_z, - unsigned size_x, - unsigned size_y, - unsigned size_z); +panfrost_create_sampler_view_bo(struct panfrost_sampler_view *so, + struct pipe_context *pctx, + struct pipe_resource *texture); /* Instancing */ mali_ptr panfrost_vertex_buffer_address(struct panfrost_context *ctx, unsigned i); -void -panfrost_emit_vertex_data(struct panfrost_job *batch); - -struct pan_shift_odd { - unsigned shift; - unsigned odd; -}; - -struct pan_shift_odd -panfrost_padded_vertex_count( - unsigned vertex_count, - bool primitive_pot); - - -unsigned -pan_expand_shift_odd(struct pan_shift_odd o); - /* Compute */ void panfrost_compute_context_init(struct pipe_context *pctx); + #endif