[Mesa-dev] [PATCH 1/2] i965: Use DIV_ROUND_UP() in gen7_urb.c code.

[Kristian Høgsberg]

Kenneth Graunke <kenneth at whitecape.org> writes:

> This is a newer convention, which we prefer over ALIGN(x, n) / n.
>
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>

> ---
>  src/mesa/drivers/dri/i965/gen7_urb.c | 17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c
> index 99a9d3c..421512b 100644
> --- a/src/mesa/drivers/dri/i965/gen7_urb.c
> +++ b/src/mesa/drivers/dri/i965/gen7_urb.c
> @@ -193,11 +193,11 @@ gen7_upload_urb(struct brw_context *brw)
>  
>     /* VS has a lower limit on the number of URB entries */
>     unsigned vs_chunks =
> -      ALIGN(brw->urb.min_vs_entries * vs_entry_size_bytes, chunk_size_bytes) /
> -      chunk_size_bytes;
> +      DIV_ROUND_UP(brw->urb.min_vs_entries * vs_entry_size_bytes,
> +                   chunk_size_bytes);
>     unsigned vs_wants =
> -      ALIGN(brw->urb.max_vs_entries * vs_entry_size_bytes,
> -            chunk_size_bytes) / chunk_size_bytes - vs_chunks;
> +      DIV_ROUND_UP(brw->urb.max_vs_entries * vs_entry_size_bytes,
> +                   chunk_size_bytes) - vs_chunks;
>  
>     unsigned gs_chunks = 0;
>     unsigned gs_wants = 0;
> @@ -210,11 +210,10 @@ gen7_upload_urb(struct brw_context *brw)
>         *
>         * (2) We can't allocate less than nr_gs_entries_granularity.
>         */
> -      gs_chunks = ALIGN(MAX2(gs_granularity, 2) * gs_entry_size_bytes,
> -                        chunk_size_bytes) / chunk_size_bytes;
> -      gs_wants =
> -         ALIGN(brw->urb.max_gs_entries * gs_entry_size_bytes,
> -               chunk_size_bytes) / chunk_size_bytes - gs_chunks;
> +      gs_chunks = DIV_ROUND_UP(MAX2(gs_granularity, 2) * gs_entry_size_bytes,
> +                               chunk_size_bytes);
> +      gs_wants = DIV_ROUND_UP(brw->urb.max_gs_entries * gs_entry_size_bytes,
> +                              chunk_size_bytes) - gs_chunks;
>     }
>  
>     /* There should always be enough URB space to satisfy the minimum
> -- 
> 2.6.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev