[libdrm PATCH 1/3] nouveau: remove unused OUT_RELOC2 and OUT_RELOCr

[libdrm PATCH 1/3] nouveau: remove unused OUT_RELOC2 and OUT_RELOCr

[Marcin Slusarz]

---
 nouveau/nouveau_pushbuf.h |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/nouveau/nouveau_pushbuf.h b/nouveau/nouveau_pushbuf.h
index 2a98789..70d0f28 100644
--- a/nouveau/nouveau_pushbuf.h
+++ b/nouveau/nouveau_pushbuf.h
@@ -109,15 +109,6 @@ OUT_RELOC(struct nouveau_channel *chan, struct nouveau_bo *bo,
 					  data, 0, flags, vor, tor);
 }
 
-static __inline__ int
-OUT_RELOC2(struct nouveau_channel *chan, struct nouveau_bo *bo,
-	   unsigned data, unsigned data2, unsigned flags,
-	   unsigned vor, unsigned tor)
-{
-	return nouveau_pushbuf_emit_reloc(chan, chan->cur++, bo,
-					  data, data2, flags, vor, tor);
-}
-
 /* Raw data + flags depending on FB/TT buffer */
 static __inline__ int
 OUT_RELOCd(struct nouveau_channel *chan, struct nouveau_bo *bo,
@@ -143,14 +134,6 @@ OUT_RELOCl(struct nouveau_channel *chan, struct nouveau_bo *bo,
 	return OUT_RELOC(chan, bo, delta, flags | NOUVEAU_BO_LOW, 0, 0);
 }
 
-/* Low 32-bits of offset + GPU linear access range info */
-static __inline__ int
-OUT_RELOCr(struct nouveau_channel *chan, struct nouveau_bo *bo,
-	   unsigned delta, unsigned size, unsigned flags)
-{
-	return OUT_RELOC2(chan, bo, delta, size, flags | NOUVEAU_BO_LOW, 0, 0);
-}
-
 /* High 32-bits of offset */
 static __inline__ int
 OUT_RELOCh(struct nouveau_channel *chan, struct nouveau_bo *bo,
-- 
1.7.3.3

Re: [libdrm PATCH 1/3] nouveau: remove unused OUT_RELOC2 and OUT_RELOCr

[Francisco Jerez]

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

Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> writes:

> ---
>  nouveau/nouveau_pushbuf.h |   17 -----------------
>  1 files changed, 0 insertions(+), 17 deletions(-)
>
> diff --git a/nouveau/nouveau_pushbuf.h b/nouveau/nouveau_pushbuf.h
> index 2a98789..70d0f28 100644
> --- a/nouveau/nouveau_pushbuf.h
> +++ b/nouveau/nouveau_pushbuf.h
> @@ -109,15 +109,6 @@ OUT_RELOC(struct nouveau_channel *chan, struct nouveau_bo *bo,
>  					  data, 0, flags, vor, tor);
>  }
>  
> -static __inline__ int
> -OUT_RELOC2(struct nouveau_channel *chan, struct nouveau_bo *bo,
> -	   unsigned data, unsigned data2, unsigned flags,
> -	   unsigned vor, unsigned tor)
> -{
> -	return nouveau_pushbuf_emit_reloc(chan, chan->cur++, bo,
> -					  data, data2, flags, vor, tor);
> -}
> -
>  /* Raw data + flags depending on FB/TT buffer */
>  static __inline__ int
>  OUT_RELOCd(struct nouveau_channel *chan, struct nouveau_bo *bo,
> @@ -143,14 +134,6 @@ OUT_RELOCl(struct nouveau_channel *chan, struct nouveau_bo *bo,
>  	return OUT_RELOC(chan, bo, delta, flags | NOUVEAU_BO_LOW, 0, 0);
>  }
>  
> -/* Low 32-bits of offset + GPU linear access range info */
> -static __inline__ int
> -OUT_RELOCr(struct nouveau_channel *chan, struct nouveau_bo *bo,
> -	   unsigned delta, unsigned size, unsigned flags)
> -{
> -	return OUT_RELOC2(chan, bo, delta, size, flags | NOUVEAU_BO_LOW, 0, 0);
> -}
> -
>  /* High 32-bits of offset */
>  static __inline__ int
>  OUT_RELOCh(struct nouveau_channel *chan, struct nouveau_bo *bo,

This patch series looks like a good clean-up. Ben, do you have any
additional changes in mind for the libdrm API? (If you do they could go
in together to avoid annoying users more often than necessary)

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

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

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