diff --git a/src/freedreno/ci/freedreno-a307-fails.txt b/src/freedreno/ci/freedreno-a307-fails.txt
index 4ae02ca96f8..482025d0a4a 100644
--- a/src/freedreno/ci/freedreno-a307-fails.txt
+++ b/src/freedreno/ci/freedreno-a307-fails.txt
@@ -557,34 +557,6 @@ spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 512 42 8 8 3,Fai
 spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 512 42 8 8 4,Fail
 spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 512 42 8 8 7,Fail
 spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 512 42 8 8 8,Fail
-spec@arb_texture_buffer_object@formats (fs- arb),Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_ALPHA16,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_ALPHA16F_ARB,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_ALPHA32F_ARB,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_INTENSITY16,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_INTENSITY16F_ARB,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_INTENSITY32F_ARB,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_LUMINANCE16,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_LUMINANCE16F_ARB,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_LUMINANCE16_ALPHA16,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_LUMINANCE32F_ARB,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_LUMINANCE8_ALPHA8,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_LUMINANCE_ALPHA16F_ARB,Fail
-spec@arb_texture_buffer_object@formats (fs- arb)@GL_LUMINANCE_ALPHA32F_ARB,Fail
-spec@arb_texture_buffer_object@formats (vs- arb),Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_ALPHA16,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_ALPHA16F_ARB,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_ALPHA32F_ARB,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_INTENSITY16,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_INTENSITY16F_ARB,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_INTENSITY32F_ARB,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE16,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE16F_ARB,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE16_ALPHA16,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE32F_ARB,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE8_ALPHA8,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE_ALPHA16F_ARB,Fail
-spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE_ALPHA32F_ARB,Fail
 spec@arb_texture_buffer_object@minmax,Fail
 spec@arb_texture_float@fbo-alphatest-formats,Fail
 spec@arb_texture_float@fbo-alphatest-formats@GL_INTENSITY32F_ARB,Fail
diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_format.c b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
index c8708e0f40a..3ae494c1ef5 100644
--- a/src/gallium/drivers/freedreno/a3xx/fd3_format.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
@@ -96,12 +96,21 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
    V_(R16_SSCALED, 16_SINT,  NONE,     WZYX),
    VT(R16_FLOAT,   16_FLOAT, R16_FLOAT,WZYX),
 
+   _T(A16_UNORM,   16_UNORM, NONE,     WZYX),
+   _T(A16_SNORM,   16_SNORM, NONE,     WZYX),
    _T(A16_UINT,    16_UINT,  NONE,     WZYX),
    _T(A16_SINT,    16_SINT,  NONE,     WZYX),
+   _T(A16_FLOAT,   16_FLOAT, NONE,     WZYX),
+   _T(L16_UNORM,   16_UNORM, NONE,     WZYX),
+   _T(L16_SNORM,   16_SNORM, NONE,     WZYX),
    _T(L16_UINT,    16_UINT,  NONE,     WZYX),
    _T(L16_SINT,    16_SINT,  NONE,     WZYX),
+   _T(L16_FLOAT,   16_FLOAT, NONE,     WZYX),
+   _T(I16_UNORM,   16_UNORM, NONE,     WZYX),
+   _T(I16_SNORM,   16_SNORM, NONE,     WZYX),
    _T(I16_UINT,    16_UINT,  NONE,     WZYX),
    _T(I16_SINT,    16_SINT,  NONE,     WZYX),
+   _T(I16_FLOAT,   16_FLOAT, NONE,     WZYX),
 
    VT(R8G8_UNORM,   8_8_UNORM, R8G8_UNORM, WZYX),
    _T(R8G8_SRGB,    8_8_UNORM, R8G8_UNORM, WZYX),
@@ -111,6 +120,7 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
    V_(R8G8_USCALED, 8_8_UINT,  NONE,       WZYX),
    V_(R8G8_SSCALED, 8_8_SINT,  NONE,       WZYX),
 
+   _T(L8A8_UNORM,   8_8_UNORM, NONE,       WZYX),
    _T(L8A8_UINT,    8_8_UINT,  NONE,       WZYX),
    _T(L8A8_SINT,    8_8_SINT,  NONE,       WZYX),
 
@@ -138,10 +148,13 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
 
    _T(A32_UINT,    32_UINT,  NONE,     WZYX),
    _T(A32_SINT,    32_SINT,  NONE,     WZYX),
+   _T(A32_FLOAT,   32_FLOAT, NONE,     WZYX),
    _T(L32_UINT,    32_UINT,  NONE,     WZYX),
    _T(L32_SINT,    32_SINT,  NONE,     WZYX),
+   _T(L32_FLOAT,   32_FLOAT, NONE,     WZYX),
    _T(I32_UINT,    32_UINT,  NONE,     WZYX),
    _T(I32_SINT,    32_SINT,  NONE,     WZYX),
+   _T(I32_FLOAT,   32_FLOAT, NONE,     WZYX),
 
    VT(R16G16_UNORM,   16_16_UNORM, NONE,        WZYX),
    VT(R16G16_SNORM,   16_16_SNORM, NONE,        WZYX),
@@ -151,8 +164,11 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
    V_(R16G16_SSCALED, 16_16_SINT,  NONE,        WZYX),
    VT(R16G16_FLOAT,   16_16_FLOAT, R16G16_FLOAT,WZYX),
 
+   _T(L16A16_UNORM,   16_16_UNORM, NONE,        WZYX),
+   _T(L16A16_SNORM,   16_16_SNORM, NONE,        WZYX),
    _T(L16A16_UINT,    16_16_UINT,  NONE,        WZYX),
    _T(L16A16_SINT,    16_16_SINT,  NONE,        WZYX),
+   _T(L16A16_FLOAT,   16_16_FLOAT, NONE,        WZYX),
 
    VT(R8G8B8A8_UNORM,   8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
    _T(R8G8B8X8_UNORM,   8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
@@ -229,6 +245,7 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
 
    _T(L32A32_UINT,    32_32_UINT,  NONE,        WZYX),
    _T(L32A32_SINT,    32_32_SINT,  NONE,        WZYX),
+   _T(L32A32_FLOAT,   32_32_FLOAT, NONE,        WZYX),
 
    /* 96-bit */
    V_(R32G32B32_UINT,    32_32_32_UINT,  NONE, WZYX),