[Nouveau] [PATCH v3 2/2] nvc0: use NV_VRAM_DOMAIN() macro

[Alexandre Courbot]

On Fri, Jun 19, 2015 at 10:55 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> On Fri, Jun 19, 2015 at 6:02 AM, Alexandre Courbot <acourbot at nvidia.com> wrote:
>> Use the newly-introduced NV_VRAM_DOMAIN() macro to support alternative
>> VRAM domains for chips that do not have dedicated video memory.
>>
>> Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
>> ---
>>  src/gallium/drivers/nouveau/nouveau_buffer.c           |  6 ++----
>>  src/gallium/drivers/nouveau/nv50/nv50_miptree.c        |  2 +-
>>  src/gallium/drivers/nouveau/nvc0/nvc0_compute.c        |  2 +-
>>  src/gallium/drivers/nouveau/nvc0/nvc0_context.c        |  4 ++--
>>  src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c        |  2 +-
>>  src/gallium/drivers/nouveau/nvc0/nvc0_program.c        |  8 ++++----
>>  src/gallium/drivers/nouveau/nvc0/nvc0_screen.c         | 17 +++++++++++------
>>  src/gallium/drivers/nouveau/nvc0/nvc0_shader_state.c   |  2 +-
>>  src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c |  2 +-
>>  src/gallium/drivers/nouveau/nvc0/nvc0_tex.c            |  2 +-
>>  src/gallium/drivers/nouveau/nvc0/nve4_compute.c        |  2 +-
>>  11 files changed, 26 insertions(+), 23 deletions(-)
>>
>> diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c b/src/gallium/drivers/nouveau/nouveau_buffer.c
>> index 32fa65c8a51c..bb7676cffbc0 100644
>> --- a/src/gallium/drivers/nouveau/nouveau_buffer.c
>> +++ b/src/gallium/drivers/nouveau/nouveau_buffer.c
>> @@ -658,13 +658,11 @@ nouveau_buffer_create(struct pipe_screen *pscreen,
>>        switch (buffer->base.usage) {
>>        case PIPE_USAGE_DEFAULT:
>>        case PIPE_USAGE_IMMUTABLE:
>> -         buffer->domain = NOUVEAU_BO_VRAM;
>> -         break;
>>        case PIPE_USAGE_DYNAMIC:
>>           /* For most apps, we'd have to do staging transfers to avoid sync
>>            * with this usage, and GART -> GART copies would be suboptimal.
>>            */
>
> This comment only applies to USAGE_DYNAMIC. With the removal of the
> hunk above, that makes it seem like it applies to all 3. Just keep
> both hunks and update both of them.
>
> Other than that this patch seems straightforward enough, with the
> above fixed, the series is
>
> Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

Will fix that and resend. Thanks for the review!