Re: [Mesa-dev] [PATCH 09/10] radeonsi: remove CE offset alignment restriction

2017-05-18 Thread Nicolai Hähnle

On 17.05.2017 21:38, Marek Olšák wrote:

From: Marek Olšák 

This was only needed by LOAD_CONST_RAM, which is now only used to load
whole CE.
---
 src/gallium/drivers/radeonsi/si_descriptors.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c 
b/src/gallium/drivers/radeonsi/si_descriptors.c
index a2f40a8..af174d5 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -107,21 +107,21 @@ static void si_init_descriptors(struct si_descriptors 
*desc,
desc->element_dw_size = element_dw_size;
desc->num_elements = num_elements;
desc->dirty_mask = u_bit_consecutive64(0, num_elements);
desc->shader_userdata_offset = shader_userdata_index * 4;

if (ce_offset) {
desc->uses_ce = true;
desc->ce_offset = *ce_offset;

/* make sure that ce_offset stays 32 byte aligned */
-   *ce_offset += align(element_dw_size * num_elements * 4, 32);
+   *ce_offset += element_dw_size * num_elements * 4;


The comment should be removed. With that fixed, patches 7 & 9:

Reviewed-by: Nicolai Hähnle 



}
 }

 static void si_release_descriptors(struct si_descriptors *desc)
 {
r600_resource_reference(>buffer, NULL);
FREE(desc->list);
 }

 static bool si_ce_upload(struct si_context *sctx, unsigned ce_offset, unsigned 
size,




--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 09/10] radeonsi: remove CE offset alignment restriction

2017-05-17 Thread Marek Olšák
From: Marek Olšák 

This was only needed by LOAD_CONST_RAM, which is now only used to load
whole CE.
---
 src/gallium/drivers/radeonsi/si_descriptors.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c 
b/src/gallium/drivers/radeonsi/si_descriptors.c
index a2f40a8..af174d5 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -107,21 +107,21 @@ static void si_init_descriptors(struct si_descriptors 
*desc,
desc->element_dw_size = element_dw_size;
desc->num_elements = num_elements;
desc->dirty_mask = u_bit_consecutive64(0, num_elements);
desc->shader_userdata_offset = shader_userdata_index * 4;
 
if (ce_offset) {
desc->uses_ce = true;
desc->ce_offset = *ce_offset;
 
/* make sure that ce_offset stays 32 byte aligned */
-   *ce_offset += align(element_dw_size * num_elements * 4, 32);
+   *ce_offset += element_dw_size * num_elements * 4;
}
 }
 
 static void si_release_descriptors(struct si_descriptors *desc)
 {
r600_resource_reference(>buffer, NULL);
FREE(desc->list);
 }
 
 static bool si_ce_upload(struct si_context *sctx, unsigned ce_offset, unsigned 
size,
-- 
2.7.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev