ilo: track if a ilo_view_surface is a scanout

Scanouts require a different cache type.

diff --git a/src/gallium/drivers/ilo/ilo_state.h b/src/gallium/drivers/ilo/ilo_state.h
index 015559542035c7cfd572fa46cae6b69ba45776ec..5374d51806669619d3d5eb6083b82eb10d8cdc99 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_state.h
+++ b/src/gallium/drivers/ilo/ilo_state.h
@@ -302,6 +302,8 @@ struct ilo_view_surface {
    /* SURFACE_STATE */
    uint32_t payload[13];
    struct intel_bo *bo;
+
+   uint32_t scanout;
 };
 
 struct ilo_view_cso {

diff --git a/src/gallium/drivers/ilo/ilo_state_3d_top.c b/src/gallium/drivers/ilo/ilo_state_3d_top.c
index ffa9ed822bc41dc82269ce008a32d43c6aaee43b..067e735c022cbfefbc645107307dc8bbb9e62ec7 100644 (file)
--- a/src/gallium/drivers/ilo/ilo_state_3d_top.c
+++ b/src/gallium/drivers/ilo/ilo_state_3d_top.c
@@ -462,8 +462,6 @@ view_init_null_gen6(const struct ilo_dev_info *dev,
 
    dw[4] = 0;
    dw[5] = 0;
-
-   surf->bo = NULL;
 }
 
 static void
@@ -555,9 +553,6 @@ view_init_for_buffer_gen6(const struct ilo_dev_info *dev,
 
    dw[4] = 0;
    dw[5] = 0;
-
-   /* do not increment reference count */
-   surf->bo = buf->bo;
 }
 
 static void
@@ -722,9 +717,6 @@ view_init_for_texture_gen6(const struct ilo_dev_info *dev,
    assert(tex->layout.align_j == 2 || tex->layout.align_j == 4);
    if (tex->layout.align_j == 4)
       dw[5] |= GEN6_SURFACE_DW5_VALIGN_4;
-
-   /* do not increment reference count */
-   surf->bo = tex->bo;
 }
 
 static void
@@ -796,8 +788,6 @@ view_init_null_gen7(const struct ilo_dev_info *dev,
 
    if (ilo_dev_gen(dev) >= ILO_GEN(8))
       memset(&dw[8], 0, sizeof(*dw) * (13 - 8));
-
-   surf->bo = NULL;
 }
 
 static void
@@ -925,9 +915,6 @@ view_init_for_buffer_gen7(const struct ilo_dev_info *dev,
                GEN_SHIFT32(GEN75_SCS_BLUE,  GEN75_SURFACE_DW7_SCS_B) |
                GEN_SHIFT32(GEN75_SCS_ALPHA, GEN75_SURFACE_DW7_SCS_A);
    }
-
-   /* do not increment reference count */
-   surf->bo = buf->bo;
 }
 
 static void
@@ -1195,9 +1182,6 @@ view_init_for_texture_gen7(const struct ilo_dev_info *dev,
 
    if (ilo_dev_gen(dev) >= ILO_GEN(8))
       memset(&dw[8], 0, sizeof(*dw) * (13 - 8));
-
-   /* do not increment reference count */
-   surf->bo = tex->bo;
 }
 
 void
@@ -1213,6 +1197,9 @@ ilo_gpe_init_view_surface_null(const struct ilo_dev_info *dev,
       view_init_null_gen6(dev,
             width, height, depth, level, surf);
    }
+
+   surf->bo = NULL;
+   surf->scanout = false;
 }
 
 void
@@ -1231,6 +1218,10 @@ ilo_gpe_init_view_surface_for_buffer(const struct ilo_dev_info *dev,
       view_init_for_buffer_gen6(dev, buf, offset, size,
             struct_size, elem_format, is_rt, render_cache_rw, surf);
    }
+
+   /* do not increment reference count */
+   surf->bo = buf->bo;
+   surf->scanout = false;
 }
 
 void
@@ -1253,6 +1244,13 @@ ilo_gpe_init_view_surface_for_texture(const struct ilo_dev_info *dev,
             first_level, num_levels, first_layer, num_layers,
             is_rt, surf);
    }
+
+   /* do not increment reference count */
+   surf->bo = tex->bo;
+
+   /* assume imported RTs are scanouts */
+   surf->scanout = ((tex->base.bind & PIPE_BIND_SCANOUT) ||
+         (tex->imported && (tex->base.bind &  PIPE_BIND_RENDER_TARGET)));
 }
 
 static void