diff --git a/.pick_status.json b/.pick_status.json index 8f707a6ad00..ec308db527f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -104,7 +104,7 @@ "description": "Revert \"upanfrost: make 128-bit opt-in with driconf on v4\"", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/panfrost/driinfo_panfrost.h b/src/gallium/drivers/panfrost/driinfo_panfrost.h index 28874f511c4..908aa319ebd 100644 --- a/src/gallium/drivers/panfrost/driinfo_panfrost.h +++ b/src/gallium/drivers/panfrost/driinfo_panfrost.h @@ -24,6 +24,5 @@ DRI_CONF_SECTION_END DRI_CONF_SECTION_MISCELLANEOUS DRI_CONF_PAN_COMPUTE_CORE_MASK(~0ull) DRI_CONF_PAN_FRAGMENT_CORE_MASK(~0ull) - DRI_CONF_OPT_B(pan_allow_128bit_rts_v4, false, "Allow using 128 bit render-targets on V4") DRI_CONF_OPT_B(pan_relax_afbc_yuv_imports, false, "Use relaxed import rules for AFBC(YUV)") DRI_CONF_SECTION_END diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index c7cd9c63451..ec4da3c9921 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -193,11 +193,6 @@ panfrost_is_format_supported(struct pipe_screen *screen, if (format == PIPE_FORMAT_Z16_UNORM && dev->arch <= 4) return false; - if (dev->arch <= 4 && util_format_get_blocksize(format) >= 16 && - !pan_screen(screen)->allow_128bit_rts_v4 && - (bind & PIPE_BIND_RENDER_TARGET)) - return false; - /* Check we support the format with the given bind */ unsigned pan_bind_flags = pipe_to_pan_bind_flags(bind); @@ -1032,9 +1027,6 @@ panfrost_create_screen(int fd, const struct pipe_screen_config *config, return NULL; } - screen->allow_128bit_rts_v4 = - driQueryOptionb(config->options, "pan_allow_128bit_rts_v4"); - screen->csf_tiler_heap.chunk_size = driQueryOptioni(config->options, "pan_csf_chunk_size"); screen->csf_tiler_heap.initial_chunks = driQueryOptioni(config->options, diff --git a/src/gallium/drivers/panfrost/pan_screen.h b/src/gallium/drivers/panfrost/pan_screen.h index ea1293a1145..e1c17c65f5e 100644 --- a/src/gallium/drivers/panfrost/pan_screen.h +++ b/src/gallium/drivers/panfrost/pan_screen.h @@ -139,7 +139,6 @@ struct panfrost_screen { /* Compute AFBC-P payload sizes on GPU */ bool afbcp_gpu_payload_sizes; - bool allow_128bit_rts_v4; int force_afrc_rate; uint64_t compute_core_mask; uint64_t fragment_core_mask;