panfrost: Identify additional SFBD flags
[mesa.git] / src / gallium / drivers / panfrost / pan_cmdstream.c
index 46aeed0595919f7b607311012b68846adf280ac0..1a170f6ee3b0d939437f89345ddf1f4de729f094 100644 (file)
@@ -322,10 +322,23 @@ panfrost_emit_compute_shader(struct panfrost_context *ctx,
         meta->sampler_count = ctx->sampler_count[st];
 
         if (dev->quirks & IS_BIFROST) {
-                meta->bifrost1.unk1 = 0x800000;
-                meta->bifrost2.preload_regs = 0xC0;
-                meta->bifrost2.uniform_count = ss->uniform_count;
-                meta->bifrost1.uniform_buffer_count = panfrost_ubo_count(ctx, st);
+                struct mali_bifrost_properties_packed prop;
+                struct mali_preload_vertex_packed preload;
+
+                pan_pack(&prop, BIFROST_PROPERTIES, cfg) {
+                        cfg.unknown = 0x800000; /* XXX */
+                        cfg.uniform_buffer_count = panfrost_ubo_count(ctx, st);
+                }
+
+                /* TODO: True compute shaders */
+                pan_pack(&preload, PRELOAD_VERTEX, cfg) {
+                        cfg.uniform_count = ss->uniform_count;
+                        cfg.vertex_id = true;
+                        cfg.instance_id = true;
+                }
+
+                memcpy(&meta->bifrost_props, &prop, sizeof(prop));
+                memcpy(&meta->bifrost_preload, &preload, sizeof(preload));
         } else {
                 struct mali_midgard_properties_packed prop;
 
@@ -337,7 +350,7 @@ panfrost_emit_compute_shader(struct panfrost_context *ctx,
                         cfg.suppress_inf_nan = true; /* XXX */
                 }
 
-                memcpy(&meta->midgard1, &prop, sizeof(prop));
+                memcpy(&meta->midgard_props, &prop, sizeof(prop));
         }
 }
 
@@ -553,6 +566,7 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
 
         struct pipe_rasterizer_state *rast = &ctx->rasterizer->base;
         const struct panfrost_zsa_state *zsa = ctx->depth_stencil;
+        unsigned rt_count = ctx->pipe_framebuffer.nr_cbufs;
 
         memset(fragmeta, 0, sizeof(*fragmeta));
 
@@ -563,15 +577,27 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
         fragmeta->sampler_count = ctx->sampler_count[PIPE_SHADER_FRAGMENT];
 
         if (dev->quirks & IS_BIFROST) {
-                /* First clause ATEST |= 0x4000000.
-                 * Lefs than 32 regs |= 0x200 */
-                fragmeta->bifrost1.unk1 = 0x950020;
+                struct mali_bifrost_properties_packed prop;
+                struct mali_preload_fragment_packed preload;
+
+                bool no_blend = true;
+
+                for (unsigned i = 0; i < rt_count; ++i)
+                        no_blend &= (!blend[i].load_dest | blend[i].no_colour);
 
-                fragmeta->bifrost1.uniform_buffer_count = panfrost_ubo_count(ctx, PIPE_SHADER_FRAGMENT);
-                fragmeta->bifrost2.preload_regs = 0x1;
-                SET_BIT(fragmeta->bifrost2.preload_regs, 0x10, fs->reads_frag_coord);
+                pan_pack(&prop, BIFROST_PROPERTIES, cfg) {
+                        cfg.unknown = 0x950020; /* XXX */
+                        cfg.uniform_buffer_count = panfrost_ubo_count(ctx, PIPE_SHADER_FRAGMENT);
+                        cfg.early_z_enable = !fs->can_discard && !fs->writes_depth && no_blend;
+                }
 
-                fragmeta->bifrost2.uniform_count = fs->uniform_count;
+                pan_pack(&preload, PRELOAD_FRAGMENT, cfg) {
+                        cfg.uniform_count = fs->uniform_count;
+                        cfg.fragment_position = fs->reads_frag_coord;
+                }
+
+                memcpy(&fragmeta->bifrost_props, &prop, sizeof(prop));
+                memcpy(&fragmeta->bifrost_preload, &preload, sizeof(preload));
         } else {
                 struct mali_midgard_properties_packed prop;
 
@@ -587,6 +613,11 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
                         (zsa->base.depth.enabled && zsa->base.depth.func != PIPE_FUNC_ALWAYS) ||
                         zsa->base.stencil[0].enabled;
 
+                bool has_blend_shader = false;
+
+                for (unsigned c = 0; c < rt_count; ++c)
+                        has_blend_shader |= blend[c].is_shader;
+
                 pan_pack(&prop, MIDGARD_PROPERTIES, cfg) {
                         cfg.uniform_buffer_count = panfrost_ubo_count(ctx, PIPE_SHADER_FRAGMENT);
                         cfg.uniform_count = fs->uniform_count;
@@ -594,6 +625,10 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
                         cfg.writes_globals = fs->writes_global;
                         cfg.suppress_inf_nan = true; /* XXX */
 
+                        /* TODO: Reduce this limit? */
+                        if (has_blend_shader)
+                                cfg.work_register_count = MAX2(cfg.work_register_count, 8);
+
                         cfg.stencil_from_shader = fs->writes_stencil;
                         cfg.helper_invocation_enable = fs->helper_invocations;
                         cfg.depth_source = fs->writes_depth ?
@@ -606,7 +641,7 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
                         cfg.reads_depth_stencil = zs_enabled && fs->can_discard;
                 }
 
-                memcpy(&fragmeta->midgard1, &prop, sizeof(prop));
+                memcpy(&fragmeta->midgard_props, &prop, sizeof(prop));
         }
 
         bool msaa = rast->multisample;
@@ -658,18 +693,9 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
         fragmeta->unknown2_3 |= MALI_DEPTH_FUNC(panfrost_translate_compare_func(
                 zsa->base.depth.enabled ? zsa->base.depth.func : PIPE_FUNC_ALWAYS));
 
-        SET_BIT(fragmeta->unknown2_4, MALI_NO_DITHER,
-                (dev->quirks & MIDGARD_SFBD) && ctx->blend &&
-                !ctx->blend->base.dither);
-
-        SET_BIT(fragmeta->unknown2_4, 0x10, dev->quirks & MIDGARD_SFBD);
-
         SET_BIT(fragmeta->unknown2_4, MALI_ALPHA_TO_COVERAGE,
                         ctx->blend->base.alpha_to_coverage);
 
-        /* Get blending setup */
-        unsigned rt_count = ctx->pipe_framebuffer.nr_cbufs;
-
         /* Disable shader execution if we can */
         if (dev->quirks & MIDGARD_SHADERLESS
                         && !panfrost_fs_required(fs, blend, rt_count)) {
@@ -680,21 +706,15 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
                 fragmeta->sampler_count = 0;
 
                 /* This feature is not known to work on Bifrost */
-                fragmeta->midgard1.work_count = 1;
-                fragmeta->midgard1.uniform_count = 0;
-                fragmeta->midgard1.uniform_buffer_count = 0;
-        }
-
-         /* If there is a blend shader, work registers are shared. We impose 8
-          * work registers as a limit for blend shaders. Should be lower XXX */
+                struct mali_midgard_properties_packed prop;
 
-        if (!(dev->quirks & IS_BIFROST)) {
-                for (unsigned c = 0; c < rt_count; ++c) {
-                        if (blend[c].is_shader) {
-                                fragmeta->midgard1.work_count =
-                                        MAX2(fragmeta->midgard1.work_count, 8);
-                        }
+                pan_pack(&prop, MIDGARD_PROPERTIES, cfg) {
+                        cfg.work_register_count = 1;
+                        cfg.depth_source = MALI_DEPTH_SOURCE_FIXED_FUNCTION;
+                        cfg.early_z_enable = true;
                 }
+
+                memcpy(&fragmeta->midgard_props, &prop, sizeof(prop));
         }
 
         if (dev->quirks & MIDGARD_SFBD) {
@@ -703,6 +723,14 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
                  * need to signal CAN_DISCARD for nontrivial blend modes (so
                  * we're able to read back the destination buffer) */
 
+                if (blend[0].no_colour)
+                        return;
+
+                fragmeta->unknown2_4 |= MALI_SFBD_ENABLE;
+
+                SET_BIT(fragmeta->unknown2_4, MALI_SFBD_SRGB,
+                                util_format_is_srgb(ctx->pipe_framebuffer.cbufs[0]->format));
+
                 SET_BIT(fragmeta->unknown2_3, MALI_HAS_BLEND_SHADER,
                         blend[0].is_shader);
 
@@ -716,6 +744,8 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
 
                 SET_BIT(fragmeta->unknown2_3, MALI_CAN_DISCARD,
                         blend[0].load_dest);
+
+                SET_BIT(fragmeta->unknown2_4, MALI_NO_DITHER, !ctx->blend->base.dither);
         } else if (!(dev->quirks & IS_BIFROST)) {
                 /* Bug where MRT-capable hw apparently reads the last blend
                  * shader from here instead of the usual location? */
@@ -729,16 +759,6 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
                         break;
                 }
         }
-
-        if (dev->quirks & IS_BIFROST) {
-                bool no_blend = true;
-
-                for (unsigned i = 0; i < rt_count; ++i)
-                        no_blend &= (!blend[i].load_dest | blend[i].no_colour);
-
-                SET_BIT(fragmeta->bifrost1.unk1, MALI_BIFROST_EARLY_Z,
-                        !fs->can_discard && !fs->writes_depth && no_blend);
-        }
 }
 
 void