#include "xf86drm.h"
#define __user
-#include "vc4_drm.h"
+#include "drm-uapi/vc4_drm.h"
#include "vc4_bufmgr.h"
#include "vc4_resource.h"
#include "vc4_cl.h"
#include "vc4_qir.h"
+#ifndef DRM_VC4_PARAM_SUPPORTS_ETC1
+#define DRM_VC4_PARAM_SUPPORTS_ETC1 4
+#endif
+#ifndef DRM_VC4_PARAM_SUPPORTS_THREADED_FS
+#define DRM_VC4_PARAM_SUPPORTS_THREADED_FS 5
+#endif
+
#ifdef USE_VC4_SIMULATOR
#define using_vc4_simulator true
#else
#define VC4_DIRTY_CONSTBUF (1 << 13)
#define VC4_DIRTY_VTXSTATE (1 << 14)
#define VC4_DIRTY_VTXBUF (1 << 15)
-#define VC4_DIRTY_INDEXBUF (1 << 16)
+
#define VC4_DIRTY_SCISSOR (1 << 17)
#define VC4_DIRTY_FLAT_SHADE_FLAGS (1 << 18)
#define VC4_DIRTY_PRIM_MODE (1 << 19)
#define VC4_DIRTY_COMPILED_VS (1 << 24)
#define VC4_DIRTY_COMPILED_FS (1 << 25)
#define VC4_DIRTY_FS_INPUTS (1 << 26)
+#define VC4_DIRTY_UBO_1_SIZE (1 << 27)
struct vc4_sampler_view {
struct pipe_sampler_view base;
uint32_t texture_p0;
uint32_t texture_p1;
bool force_first_level;
+ /**
+ * Resource containing the actual texture that will be sampled.
+ *
+ * We may need to rebase the .base.texture resource to work around the
+ * lack of GL_TEXTURE_BASE_LEVEL, or to upload the texture as tiled.
+ */
+ struct pipe_resource *texture;
};
struct vc4_sampler_state {
struct pipe_shader_state base;
};
-struct vc4_ubo_range {
- /**
- * offset in bytes from the start of the ubo where this range is
- * uploaded.
- *
- * Only set once used is set.
- */
- uint32_t dst_offset;
-
- /**
- * offset in bytes from the start of the gallium uniforms where the
- * data comes from.
- */
- uint32_t src_offset;
-
- /** size in bytes of this ubo range */
- uint32_t size;
-};
-
struct vc4_fs_inputs {
/**
* Array of the meanings of the VPM inputs this shader needs.
struct vc4_shader_uniform_info uniforms;
- struct vc4_ubo_range *ubo_ranges;
- uint32_t num_ubo_ranges;
- uint32_t ubo_size;
/**
* VC4_DIRTY_* flags that, when set in vc4->dirty, mean that the
* uniforms have to be rewritten (and therefore the shader state
bool disable_early_z;
+ /* Set if the compile failed, likely due to register allocation
+ * failure. In this case, we have no shader to run and should not try
+ * to do any draws.
+ */
+ bool failed;
+
+ bool fs_threaded;
+
uint8_t num_inputs;
/* Byte offsets for the start of the vertex attributes 0-7, and the
struct pipe_surface *zsbuf;
};
+struct vc4_hwperfmon {
+ uint32_t id;
+ uint64_t last_seqno;
+ uint8_t events[DRM_VC4_MAX_PERF_COUNTERS];
+ uint64_t counters[DRM_VC4_MAX_PERF_COUNTERS];
+};
+
/**
* A complete bin/render job.
*
struct vc4_cl bo_handles;
struct vc4_cl bo_pointers;
uint32_t shader_rec_count;
+ /**
+ * Amount of memory used by the BOs in bo_pointers.
+ *
+ * Used for checking when we should flush the job early so we don't
+ * OOM.
+ */
+ uint32_t bo_space;
+
+ /* Last BO hindex referenced from VC4_PACKET_GEM_HANDLES. */
+ uint32_t last_gem_handle_hindex;
/** @{ Surfaces to submit rendering for. */
struct pipe_surface *color_read;
*/
uint32_t draw_calls_queued;
+ /** Any flags to be passed in drm_vc4_submit_cl.flags. */
+ uint32_t flags;
+
+ /* Performance monitor attached to this job. */
+ struct vc4_hwperfmon *perfmon;
+
struct vc4_job_key key;
};
uint64_t next_compiled_program_id;
struct ra_regs *regs;
- unsigned int reg_class_any;
- unsigned int reg_class_a_or_b_or_acc;
+ unsigned int reg_class_any[2];
+ unsigned int reg_class_a_or_b[2];
+ unsigned int reg_class_a_or_b_or_acc[2];
unsigned int reg_class_r0_r3;
- unsigned int reg_class_r4_or_a;
- unsigned int reg_class_a;
+ unsigned int reg_class_r4_or_a[2];
+ unsigned int reg_class_a[2];
uint8_t prim_mode;
struct u_upload_mgr *uploader;
+ struct pipe_shader_state *yuv_linear_blit_vs;
+ struct pipe_shader_state *yuv_linear_blit_fs_8bit;
+ struct pipe_shader_state *yuv_linear_blit_fs_16bit;
+
/** @{ Current pipeline state objects */
struct pipe_scissor_state scissor;
struct pipe_blend_state *blend;
struct pipe_viewport_state viewport;
struct vc4_constbuf_stateobj constbuf[PIPE_SHADER_TYPES];
struct vc4_vertexbuf_stateobj vertexbuf;
- struct pipe_index_buffer indexbuf;
+ struct pipe_debug_callback debug;
+
+ struct vc4_hwperfmon *perfmon;
/** @} */
+
+ /** Handle of syncobj containing the last submitted job fence. */
+ uint32_t job_syncobj;
+
+ int in_fence_fd;
+ /** Handle of the syncobj that holds in_fence_fd for submission. */
+ uint32_t in_syncobj;
};
struct vc4_rasterizer_state {
struct pipe_rasterizer_state base;
/* VC4_CONFIGURATION_BITS */
- uint8_t config_bits[3];
+ uint8_t config_bits[V3D21_CONFIGURATION_BITS_length];
- float point_size;
+ struct PACKED {
+ uint8_t depth_offset[V3D21_DEPTH_OFFSET_length];
+ uint8_t point_size[V3D21_POINT_SIZE_length];
+ uint8_t line_width[V3D21_LINE_WIDTH_length];
+ } packed;
- /**
- * Half-float (1/8/7 bits) value of polygon offset units for
- * VC4_PACKET_DEPTH_OFFSET
- */
- uint16_t offset_units;
- /**
- * Half-float (1/8/7 bits) value of polygon offset scale for
- * VC4_PACKET_DEPTH_OFFSET
- */
- uint16_t offset_factor;
+ /** Raster order flags to be passed in struct drm_vc4_submit_cl.flags. */
+ uint32_t tile_raster_order_flags;
};
struct vc4_depth_stencil_alpha_state {
struct pipe_depth_stencil_alpha_state base;
/* VC4_CONFIGURATION_BITS */
- uint8_t config_bits[3];
+ uint8_t config_bits[V3D21_CONFIGURATION_BITS_length];
/** Uniforms for stencil state.
*
#define perf_debug(...) do { \
if (unlikely(vc4_debug & VC4_DEBUG_PERF)) \
fprintf(stderr, __VA_ARGS__); \
+ if (unlikely(vc4->debug.debug_message)) \
+ pipe_debug_message(&vc4->debug, PERF_INFO, __VA_ARGS__); \
} while (0)
static inline struct vc4_context *
return (struct vc4_sampler_state *)psampler;
}
+int vc4_get_driver_query_group_info(struct pipe_screen *pscreen,
+ unsigned index,
+ struct pipe_driver_query_group_info *info);
+int vc4_get_driver_query_info(struct pipe_screen *pscreen, unsigned index,
+ struct pipe_driver_query_info *info);
+
struct pipe_context *vc4_context_create(struct pipe_screen *pscreen,
void *priv, unsigned flags);
void vc4_draw_init(struct pipe_context *pctx);
void vc4_query_init(struct pipe_context *pctx);
void vc4_simulator_init(struct vc4_screen *screen);
void vc4_simulator_destroy(struct vc4_screen *screen);
-int vc4_simulator_flush(struct vc4_context *vc4,
- struct drm_vc4_submit_cl *args,
- struct vc4_job *job);
int vc4_simulator_ioctl(int fd, unsigned long request, void *arg);
-void vc4_simulator_open_from_handle(int fd, uint32_t winsys_stride,
- int handle, uint32_t size);
+void vc4_simulator_open_from_handle(int fd, int handle, uint32_t size);
static inline int
vc4_ioctl(int fd, unsigned long request, void *arg)
struct vc4_texture_stateobj *texstate);
void vc4_flush(struct pipe_context *pctx);
-void vc4_job_init(struct vc4_context *vc4);
+int vc4_job_init(struct vc4_context *vc4);
+int vc4_fence_context_init(struct vc4_context *vc4);
struct vc4_job *vc4_get_job(struct vc4_context *vc4,
struct pipe_surface *cbuf,
struct pipe_surface *zsbuf);
void vc4_emit_state(struct pipe_context *pctx);
void vc4_generate_code(struct vc4_context *vc4, struct vc4_compile *c);
struct qpu_reg *vc4_register_allocate(struct vc4_context *vc4, struct vc4_compile *c);
-void vc4_update_compiled_shaders(struct vc4_context *vc4, uint8_t prim_mode);
+bool vc4_update_compiled_shaders(struct vc4_context *vc4, uint8_t prim_mode);
bool vc4_rt_format_supported(enum pipe_format f);
bool vc4_rt_format_is_565(enum pipe_format f);