X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fpanfrost%2Fpan_screen.c;h=b24bdffc2da7e1d054e3f3bb8ec5311550b265bf;hb=74ab80b92da9390a3ca7e718537e035bd5af0b22;hp=0e7455839401e46b59ed7b3e595114da3837ea98;hpb=61d3ae6e0bde93c5601278d1a60c44be655a7cb5;p=mesa.git diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index 0e745583940..b24bdffc2da 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -28,10 +28,12 @@ **************************************************************************/ +#include "util/u_debug.h" #include "util/u_memory.h" #include "util/u_format.h" #include "util/u_format_s3tc.h" #include "util/u_video.h" +#include "util/u_screen.h" #include "util/os_time.h" #include "pipe/p_defines.h" #include "pipe/p_screen.h" @@ -40,13 +42,28 @@ #include -#include "drm_fourcc.h" +#include "drm-uapi/drm_fourcc.h" #include "pan_screen.h" #include "pan_resource.h" #include "pan_public.h" +#include "pan_util.h" #include "pan_context.h" +#include "midgard/midgard_compile.h" + +static const struct debug_named_value debug_options[] = { + {"msgs", PAN_DBG_MSGS, "Print debug messages"}, + DEBUG_NAMED_VALUE_END +}; + +DEBUG_GET_ONCE_FLAGS_OPTION(pan_debug, "PAN_MESA_DEBUG", debug_options, 0) + +int pan_debug = 0; + +struct panfrost_driver *panfrost_create_drm_driver(int fd); + +const char *pan_counters_base = NULL; static const char * panfrost_get_name(struct pipe_screen *screen) @@ -76,14 +93,10 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) return 1; case PIPE_CAP_SM3: - return 1; - case PIPE_CAP_POINT_SPRITE: return 1; case PIPE_CAP_MAX_RENDER_TARGETS: - return PIPE_MAX_COLOR_BUFS; - case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: return 1; @@ -93,15 +106,19 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) return 1; /* TODO: Queries */ case PIPE_CAP_TEXTURE_MIRROR_CLAMP: - return 1; - case PIPE_CAP_TEXTURE_SWIZZLE: return 1; - case PIPE_CAP_TEXTURE_BORDER_COLOR_QUIRK: - return 0; + /* TODO: ES3. We expose these caps so we can access higher dEQP + * tests; in actuality they are nonfunctional */ + case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: + return 4; + case PIPE_CAP_TGSI_INSTANCEID: + case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR: + return 1; - case PIPE_CAP_MAX_TEXTURE_2D_LEVELS: + case PIPE_CAP_MAX_TEXTURE_2D_SIZE: + return 4096; case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS: return 13; @@ -124,9 +141,6 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_DEPTH_CLIP_DISABLE: return 1; - case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: - return 0; /* no streamout */ - case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS: case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS: return 16 * 4; @@ -138,17 +152,9 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_MAX_VERTEX_STREAMS: return 1; - case PIPE_CAP_PRIMITIVE_RESTART: - return 0; /* We don't understand this yet */ - case PIPE_CAP_SHADER_STENCIL_EXPORT: return 1; - case PIPE_CAP_TGSI_INSTANCEID: - case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR: - case PIPE_CAP_START_INSTANCE: - return 0; /* TODO: Instances */ - case PIPE_CAP_SEAMLESS_CUBE_MAP: case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE: return 1; @@ -156,42 +162,21 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS: return 256; /* for GL3 */ - case PIPE_CAP_MIN_TEXEL_OFFSET: - return -8; - - case PIPE_CAP_MAX_TEXEL_OFFSET: - return 7; - case PIPE_CAP_CONDITIONAL_RENDER: return 1; - case PIPE_CAP_TEXTURE_BARRIER: - return 0; - case PIPE_CAP_FRAGMENT_COLOR_CLAMPED: - case PIPE_CAP_VERTEX_COLOR_UNCLAMPED: /* draw module */ - case PIPE_CAP_VERTEX_COLOR_CLAMPED: /* draw module */ + case PIPE_CAP_VERTEX_COLOR_UNCLAMPED: + case PIPE_CAP_VERTEX_COLOR_CLAMPED: return 1; - case PIPE_CAP_MIXED_COLORBUFFER_FORMATS: - return 0; - case PIPE_CAP_GLSL_FEATURE_LEVEL: return 330; - case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION: - case PIPE_CAP_TGSI_TEX_TXF_LZ: - return 0; - - case PIPE_CAP_COMPUTE: - return 0; - - case PIPE_CAP_USER_VERTEX_BUFFERS: /* XXX XXX */ + case PIPE_CAP_USER_VERTEX_BUFFERS: /* TODO */ case PIPE_CAP_RESOURCE_FROM_USER_MEMORY: return 0; - case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME: - case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS: case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT: case PIPE_CAP_DOUBLES: case PIPE_CAP_INT64: @@ -201,19 +186,9 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT: return 16; - case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS: - case PIPE_CAP_VERTEX_BUFFER_OFFSET_4BYTE_ALIGNED_ONLY: - case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY: - case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY: - case PIPE_CAP_TEXTURE_MULTISAMPLE: - return 0; - case PIPE_CAP_MAX_VERTEX_ELEMENT_SRC_OFFSET: return 0xffff; - case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT: - return 64; - case PIPE_CAP_QUERY_TIMESTAMP: case PIPE_CAP_CUBE_MAP_ARRAY: return 1; @@ -221,18 +196,12 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_TEXTURE_BUFFER_OBJECTS: return 1; - case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: - return 0; - case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE: return 65536; case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT: return 0; - case PIPE_CAP_TGSI_TEXCOORD: - return 1; /* XXX: What should this me exactly? */ - case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER: return 0; @@ -247,22 +216,8 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_TEXTURE_GATHER_SM5: case PIPE_CAP_TEXTURE_QUERY_LOD: - return 1; - - case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT: - case PIPE_CAP_SAMPLE_SHADING: - case PIPE_CAP_TEXTURE_GATHER_OFFSETS: - return 0; - case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION: - return 1; - - case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE: - return 0; - case PIPE_CAP_SAMPLER_VIEW_TARGET: - return 1; - case PIPE_CAP_FAKE_SW_MSAA: return 1; @@ -288,111 +243,36 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) return 1; case PIPE_CAP_VIDEO_MEMORY: { - /* XXX: Do we want to return the full amount fo system memory ? */ uint64_t system_memory; if (!os_get_total_physical_memory(&system_memory)) return 0; - if (sizeof(void *) == 4) - /* Cap to 2 GB on 32 bits system. We do this because panfrost does - * eat application memory, which is quite limited on 32 bits. App - * shouldn't expect too much available memory. */ - system_memory = MIN2(system_memory, 2048 << 20); - return (int)(system_memory >> 20); } case PIPE_CAP_UMA: - return 0; - - case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: return 1; + case PIPE_CAP_CONDITIONAL_RENDER_INVERTED: case PIPE_CAP_CLIP_HALFZ: case PIPE_CAP_TEXTURE_FLOAT_LINEAR: case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR: - return 1; - case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT: case PIPE_CAP_CULL_DISTANCE: - return 1; - - case PIPE_CAP_VERTEXID_NOBASE: - return 0; - - case PIPE_CAP_POLYGON_OFFSET_CLAMP: - return 0; - case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: case PIPE_CAP_TGSI_ARRAY_COMPONENTS: - return 1; - case PIPE_CAP_CLEAR_TEXTURE: return 1; - case PIPE_CAP_ANISOTROPIC_FILTER: - case PIPE_CAP_MULTISAMPLE_Z_RESOLVE: - case PIPE_CAP_DEVICE_RESET_STATUS_QUERY: - case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: - case PIPE_CAP_DEPTH_BOUNDS_TEST: - case PIPE_CAP_TGSI_TXQS: - case PIPE_CAP_FORCE_PERSAMPLE_INTERP: - case PIPE_CAP_SHAREABLE_SHADERS: - case PIPE_CAP_DRAW_PARAMETERS: - case PIPE_CAP_TGSI_PACK_HALF_FLOAT: - case PIPE_CAP_MULTI_DRAW_INDIRECT: - case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS: - case PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL: - case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL: - case PIPE_CAP_INVALIDATE_BUFFER: - case PIPE_CAP_GENERATE_MIPMAP: - case PIPE_CAP_STRING_MARKER: - case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: - case PIPE_CAP_QUERY_BUFFER_OBJECT: - case PIPE_CAP_QUERY_MEMORY_INFO: - case PIPE_CAP_PCI_GROUP: - case PIPE_CAP_PCI_BUS: - case PIPE_CAP_PCI_DEVICE: - case PIPE_CAP_PCI_FUNCTION: - case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR: - case PIPE_CAP_PRIMITIVE_RESTART_FOR_PATCHES: - case PIPE_CAP_TGSI_VOTE: - case PIPE_CAP_MAX_WINDOW_RECTANGLES: - case PIPE_CAP_POLYGON_OFFSET_UNITS_UNSCALED: - case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS: - case PIPE_CAP_TGSI_CAN_READ_OUTPUTS: - case PIPE_CAP_NATIVE_FENCE_FD: - case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY: - case PIPE_CAP_TGSI_FS_FBFETCH: - case PIPE_CAP_TGSI_MUL_ZERO_WINS: - case PIPE_CAP_TGSI_CLOCK: - case PIPE_CAP_POLYGON_MODE_FILL_RECTANGLE: - case PIPE_CAP_SPARSE_BUFFER_PAGE_SIZE: - case PIPE_CAP_TGSI_BALLOT: - case PIPE_CAP_TGSI_TES_LAYER_VIEWPORT: - case PIPE_CAP_CAN_BIND_CONST_BUFFER_AS_VERTEX: - case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION: - case PIPE_CAP_POST_DEPTH_COVERAGE: - case PIPE_CAP_BINDLESS_TEXTURE: - case PIPE_CAP_NIR_SAMPLERS_AS_DEREF: - case PIPE_CAP_MEMOBJ: - case PIPE_CAP_LOAD_CONSTBUF: - case PIPE_CAP_TGSI_ANY_REG_AS_ADDRESS: - case PIPE_CAP_TILE_RASTER_ORDER: - case PIPE_CAP_MAX_COMBINED_SHADER_OUTPUT_RESOURCES: - case PIPE_CAP_SIGNED_VERTEX_BUFFER_OFFSET: - case PIPE_CAP_CONTEXT_PRIORITY_MASK: - case PIPE_CAP_FENCE_SIGNAL: - case PIPE_CAP_CONSTBUF0_FLAGS: - return 0; - case PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT: return 4; + case PIPE_CAP_MAX_VARYINGS: + return 16; + default: - debug_printf("Unexpected PIPE_CAP %d query\n", param); - return 0; + return u_pipe_screen_get_param_defaults(screen, param); } } @@ -412,6 +292,7 @@ panfrost_get_shader_param(struct pipe_screen *screen, return 0; case PIPE_SHADER_CAP_MAX_INSTRUCTIONS: + return 0; case PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS: case PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS: case PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS: @@ -433,13 +314,16 @@ panfrost_get_shader_param(struct pipe_screen *screen, return 16 * 1024 * sizeof(float); case PIPE_SHADER_CAP_MAX_CONST_BUFFERS: - return 1; + return 4; case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED: return 0; case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR: + return 1; case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR: + return 0; + case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR: return 0; @@ -515,6 +399,11 @@ panfrost_get_paramf(struct pipe_screen *screen, enum pipe_capf param) case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS: return 16.0; /* arbitrary */ + case PIPE_CAPF_MIN_CONSERVATIVE_RASTER_DILATE: + case PIPE_CAPF_MAX_CONSERVATIVE_RASTER_DILATE: + case PIPE_CAPF_CONSERVATIVE_RASTER_DILATE_GRANULARITY: + return 0.0f; + default: debug_printf("Unexpected PIPE_CAPF %d query\n", param); return 0.0; @@ -558,12 +447,15 @@ panfrost_is_format_supported( struct pipe_screen *screen, if (format == PIPE_FORMAT_Z24X8_UNORM || format == PIPE_FORMAT_X8Z24_UNORM) return FALSE; + if (format == PIPE_FORMAT_A1B5G5R5_UNORM || format == PIPE_FORMAT_X1B5G5R5_UNORM) + return FALSE; + if (bind & PIPE_BIND_RENDER_TARGET) { - /* We don't support rendering into anything but RGBA8 yet. We - * need more formats for spec compliance, but for now, honesty - * is the best policy <3 */ + /* TODO: Support all the formats! :) */ + bool supported = util_format_is_rgba8_variant(format_desc); + supported |= format == PIPE_FORMAT_B5G6R5_UNORM; - if (!util_format_is_rgba8_variant(format_desc)) + if (!supported) return FALSE; if (format_desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS) @@ -585,7 +477,8 @@ panfrost_is_format_supported( struct pipe_screen *screen, } if (format_desc->layout == UTIL_FORMAT_LAYOUT_BPTC || - format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC) { + format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC || + format_desc->layout == UTIL_FORMAT_LAYOUT_ETC) { /* Compressed formats not yet hooked up. */ return FALSE; } @@ -636,21 +529,22 @@ panfrost_get_timestamp(struct pipe_screen *_screen) } static void -panfrost_fence_reference(struct pipe_screen *screen, +panfrost_fence_reference(struct pipe_screen *pscreen, struct pipe_fence_handle **ptr, struct pipe_fence_handle *fence) { - *ptr = fence; + struct panfrost_screen *screen = pan_screen(pscreen); + screen->driver->fence_reference(pscreen, ptr, fence); } static boolean -panfrost_fence_finish(struct pipe_screen *screen, +panfrost_fence_finish(struct pipe_screen *pscreen, struct pipe_context *ctx, struct pipe_fence_handle *fence, uint64_t timeout) { - assert(fence); - return TRUE; + struct panfrost_screen *screen = pan_screen(pscreen); + return screen->driver->fence_finish(pscreen, ctx, fence, timeout); } static const void * @@ -658,14 +552,16 @@ panfrost_screen_get_compiler_options(struct pipe_screen *pscreen, enum pipe_shader_ir ir, enum pipe_shader_type shader) { - return NULL; + return &midgard_nir_options; } struct pipe_screen * -panfrost_create_screen(int fd, struct renderonly *ro, bool is_drm) +panfrost_create_screen(int fd, struct renderonly *ro) { struct panfrost_screen *screen = CALLOC_STRUCT(panfrost_screen); + pan_debug = debug_get_option_pan_debug(); + if (!screen) return NULL; @@ -678,6 +574,21 @@ panfrost_create_screen(int fd, struct renderonly *ro, bool is_drm) } } + screen->driver = panfrost_create_drm_driver(fd); + + /* Dump memory and/or performance counters iff asked for in the environment */ + const char *pantrace_base = getenv("PANTRACE_BASE"); + pan_counters_base = getenv("PANCOUNTERS_BASE"); + + if (pantrace_base) { + pantrace_initialize(pantrace_base); + } + + if (pan_counters_base) { + screen->driver->allocate_slab(screen, &screen->perf_counters, 64, true, 0, 0, 0); + screen->driver->enable_counters(screen); + } + screen->base.destroy = panfrost_destroy_screen; screen->base.get_name = panfrost_get_name; @@ -688,15 +599,16 @@ panfrost_create_screen(int fd, struct renderonly *ro, bool is_drm) screen->base.get_paramf = panfrost_get_paramf; screen->base.get_timestamp = panfrost_get_timestamp; screen->base.is_format_supported = panfrost_is_format_supported; - //screen->base.context_create = panfrost_create_context; + screen->base.context_create = panfrost_create_context; screen->base.flush_frontbuffer = panfrost_flush_frontbuffer; screen->base.get_compiler_options = panfrost_screen_get_compiler_options; screen->base.fence_reference = panfrost_fence_reference; screen->base.fence_finish = panfrost_fence_finish; - screen->last_fragment_id = -1; screen->last_fragment_flushed = true; + screen->last_job = NULL; + + panfrost_resource_screen_init(screen); - fprintf(stderr, "stub: Upstream panfrost (use downstream fork)\n"); - return NULL; + return &screen->base; }