diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 21e512e30a0..8ae980e9a77 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -332,7 +332,7 @@ panfrost_should_afbc(struct panfrost_device *dev,
         case PIPE_TEXTURE_3D:
                 /* 3D AFBC is only supported on Bifrost v7+. It's supposed to
                  * be supported on Midgard but it doesn't seem to work */
-                if (dev->arch < 7)
+                if (dev->arch != 7)
                         return false;
 
                 break;
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index b584c9f2257..d6265180906 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -856,12 +856,6 @@ panfrost_create_screen(int fd, struct renderonly *ro)
         if (dev->debug & PAN_DBG_NO_AFBC)
                 dev->has_afbc = false;
 
-        /* It's early days for Valhall support... disable AFBC for now to keep
-         * hardware bring-up simple
-         */
-        if (dev->arch >= 9)
-                dev->has_afbc = false;
-
         /* Bail early on unsupported hardware */
         if (dev->model == NULL) {
                 debug_printf("panfrost: Unsupported model %X", dev->gpu_id);