Re: [PATCH] nouveau: make sure initial kalloc for user bo ends up in the right place

From: Francisco Jerez <currojerez-sGOZH3hwPm2sTnJN9+BGXg@public.gmane.org>
To: Maarten Maathuis <madman2003-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: Re: [PATCH] nouveau: make sure initial kalloc for user bo ends up in the right place
Date: Mon, 01 Mar 2010 22:26:24 +0100	[thread overview]
Message-ID: <87fx4jka2n.fsf@riseup.net> (raw)
In-Reply-To: <1267468776-6652-1-git-send-email-madman2003-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> (Maarten Maathuis's message of "Mon, 1 Mar 2010 19:39:36 +0100")

[-- Attachment #1.1.1: Type: text/plain, Size: 1166 bytes --]

Maarten Maathuis <madman2003-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:

> - Currently reloc'ing a user bo to gart will first cause an allocation in vram,
> which is then cpu written to, then the bo gets moved to gart.
>
> Signed-off-by: Maarten Maathuis <madman2003-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  nouveau/nouveau_reloc.c |    6 ++++++
>  1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/nouveau/nouveau_reloc.c b/nouveau/nouveau_reloc.c
> index 301482b..332dfa0 100644
> --- a/nouveau/nouveau_reloc.c
> +++ b/nouveau/nouveau_reloc.c
> @@ -73,6 +73,12 @@ nouveau_reloc_emit(struct nouveau_channel *chan, struct nouveau_bo *reloc_bo,
>  		return -EINVAL;
>  	}
>  
> +	/* We're about to reloc a user buffer, better make sure we don't cause
> +	 * a double migration.
> +	 */
> +	if (!(nvbo->flags & (NOUVEAU_BO_GART | NOUVEAU_BO_VRAM)))
> +		nvbo->flags |= (flags & (NOUVEAU_BO_GART | NOUVEAU_BO_VRAM));
> +
>  	rpbbo = nouveau_bo_emit_buffer(chan, reloc_bo);
>  	if (!rpbbo)
>  		return -ENOMEM;

Looks good to me:
Acked-by: Francisco Jerez <currojerez-sGOZH3hwPm2sTnJN9+BGXg@public.gmane.org>

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 181 bytes --]

_______________________________________________
Nouveau mailing list
Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
http://lists.freedesktop.org/mailman/listinfo/nouveau