diff --git a/docs/features.txt b/docs/features.txt
index f3ae33fda26..d88485c554c 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -767,7 +767,7 @@ Rusticl OpenCL 2.0 -- all DONE:
   Pipes                                                 not started
   Extended 2D images creation                           in progress
   - CL_ABGR                                             DONE
-  - cl_khr_image2d_from_buffer                          DONE (iris, llvmpipe)
+  - cl_khr_image2d_from_buffer                          DONE (freedreno, iris, llvmpipe)
   - cl_khr_depth_images                                 DONE
   - from sRGB images                                    in progress
   clCreateSamplerWithProperties                         DONE
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_image.cc b/src/gallium/drivers/freedreno/a6xx/fd6_image.cc
index eab2a60d3e1..70172591264 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_image.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_image.cc
@@ -46,7 +46,36 @@ static void
 fd6_image_descriptor(struct fd_context *ctx, const struct pipe_image_view *buf,
                      uint32_t *descriptor)
 {
-   if (buf->resource->target == PIPE_BUFFER) {
+   if (buf->access & PIPE_IMAGE_ACCESS_TEX2D_FROM_BUFFER) {
+      struct fdl_view_args args = {
+         .chip = ctx->screen->gen,
+
+         .iova = rsc_iova(buf->resource, 0),
+         .base_miplevel = 0,
+         .level_count = 1,
+         .base_array_layer = 0,
+         .layer_count = 1,
+         .swiz = {PIPE_SWIZZLE_X, PIPE_SWIZZLE_Y, PIPE_SWIZZLE_Z,
+                  PIPE_SWIZZLE_W},
+         .format = buf->format,
+
+         .type = FDL_VIEW_TYPE_2D,
+         .chroma_offsets = {FDL_CHROMA_LOCATION_COSITED_EVEN,
+                            FDL_CHROMA_LOCATION_COSITED_EVEN},
+      };
+
+      struct fdl_layout layout;
+      const struct fdl_layout *layouts = &layout;
+
+      fd6_layout_tex2d_from_buf(&layout, ctx->screen->info, buf->format,
+                                &buf->u.tex2d_from_buf);
+
+      struct fdl6_view view;
+      fdl6_view_init(&view, &layouts, &args,
+                     ctx->screen->info->a6xx.has_z24uint_s8uint);
+
+      memcpy(descriptor, view.storage_descriptor, sizeof(view.storage_descriptor));
+   } else if (buf->resource->target == PIPE_BUFFER) {
       uint32_t size = fd_clamp_buffer_size(buf->format, buf->u.buf.size,
                                            A4XX_MAX_TEXEL_BUFFER_ELEMENTS_UINT);
 
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc b/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
index 38766e2f099..ccc119f0ffa 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_texture.cc
@@ -442,7 +442,37 @@ fd6_sampler_view_update(struct fd_context *ctx,
 
    so->ptr1 = rsc;
 
-   if (cso->target == PIPE_BUFFER) {
+   if (cso->is_tex2d_from_buf) {
+      struct fdl_view_args args = {
+         .chip = ctx->screen->gen,
+
+         /* Using relocs for addresses still */
+         .iova = 0,
+         .base_miplevel = 0,
+         .level_count = 1,
+         .base_array_layer = 0,
+         .layer_count = 1,
+         .swiz = {cso->swizzle_r, cso->swizzle_g, cso->swizzle_b,
+                  cso->swizzle_a},
+         .format = format,
+
+         .type = FDL_VIEW_TYPE_2D,
+         .chroma_offsets = {FDL_CHROMA_LOCATION_COSITED_EVEN,
+                            FDL_CHROMA_LOCATION_COSITED_EVEN},
+      };
+
+      struct fdl_layout layout;
+      const struct fdl_layout *layouts = &layout;
+
+      fd6_layout_tex2d_from_buf(&layout, ctx->screen->info, format,
+                                &cso->u.tex2d_from_buf);
+
+      struct fdl6_view view;
+      fdl6_view_init(&view, &layouts, &args,
+                     ctx->screen->info->a6xx.has_z24uint_s8uint);
+
+      memcpy(so->descriptor, view.descriptor, sizeof(so->descriptor));
+   } else if (cso->target == PIPE_BUFFER) {
       uint8_t swiz[4] = {cso->swizzle_r, cso->swizzle_g, cso->swizzle_b,
                          cso->swizzle_a};
 
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_texture.h b/src/gallium/drivers/freedreno/a6xx/fd6_texture.h
index 1ebfe4e44f7..764ab00f43a 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_texture.h
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_texture.h
@@ -112,6 +112,34 @@ struct fd6_texture_state {
 struct fd6_texture_state *
 fd6_texture_state(struct fd_context *ctx, enum pipe_shader_type type) assert_dt;
 
+
+static inline void
+fd6_layout_tex2d_from_buf(struct fdl_layout *layout,
+                          const struct fd_dev_info *info,
+                          enum pipe_format format,
+                          const struct pipe_tex2d_from_buf *tex2d_from_buf)
+{
+   unsigned block_size = util_format_get_blocksize(format);
+
+   struct fdl_explicit_layout explicit_layout = {
+      .offset = tex2d_from_buf->offset * block_size,
+      .pitch = tex2d_from_buf->row_stride * block_size,
+   };
+
+   *layout = (struct fdl_layout) {
+      .ubwc = false,
+      .tile_all = false,
+      .tile_mode = TILE6_LINEAR,
+   };
+
+   ASSERTED bool ret = fdl6_layout(layout, info, format, 1,
+                                   tex2d_from_buf->width,
+                                   tex2d_from_buf->height,
+                                   1, 1, 1, false, false,
+                                   false, &explicit_layout);
+   assert(ret);
+}
+
 ENDC;
 
 #endif /* FD6_TEXTURE_H_ */
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index 1f92e723666..818cf075550 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -512,6 +512,11 @@ fd_init_screen_caps(struct fd_screen *screen)
    caps->shader_buffer_offset_alignment =
       is_a6xx(screen) ? 64 : (is_a5xx(screen) || is_a4xx(screen) ? 4 : 0);
 
+   if (is_a6xx(screen)) {
+      caps->linear_image_pitch_alignment = 64;
+      caps->linear_image_base_address_alignment = 64;
+   }
+
    caps->max_texture_gather_components =
       is_a4xx(screen) || is_a5xx(screen) || is_a6xx(screen) ? 4 : 0;