thr3ads.net - Nouveau - [Nouveau] [PATCH] drm/nouveau: missing cases of rename ttm_mem_reg to ttm

If this information is useful, please help other people find it:
Share via:

Rodrigo Vivi

2020-Aug-07 01:15 UTC

[Nouveau] [PATCH] drm/nouveau: missing cases of rename ttm_mem_reg to ttm_resource.

From: Rodrigo Vivi <rodrigo.vivi at gmail.com>

These are missed cases that I just identified with allyesconfig build.

Fixes: 2966141ad2dd ("drm/ttm: rename ttm_mem_reg to ttm_resource.")
Cc: Dave Airlie <airlied at redhat.com>
Cc: Ben Skeggs <bskeggs at redhat.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at gmail.com>
---
 drivers/gpu/drm/nouveau/nouveau_bo.h     | 14 +++++++-------
 drivers/gpu/drm/nouveau/nouveau_bo0039.c |  4 ++--
 drivers/gpu/drm/nouveau/nouveau_bo5039.c |  2 +-
 drivers/gpu/drm/nouveau/nouveau_bo74c1.c |  2 +-
 drivers/gpu/drm/nouveau/nouveau_bo85b5.c |  2 +-
 drivers/gpu/drm/nouveau/nouveau_bo9039.c |  2 +-
 drivers/gpu/drm/nouveau/nouveau_bo90b5.c |  2 +-
 drivers/gpu/drm/nouveau/nouveau_boa0b5.c |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.h
b/drivers/gpu/drm/nouveau/nouveau_bo.h
index 52489ce7d029c..aecb7481df0da 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.h
@@ -139,28 +139,28 @@ nouveau_bo_new_pin_map(struct nouveau_cli *cli, u64 size,
int align, u32 flags,
 
 int nv04_bo_move_init(struct nouveau_channel *, u32);
 int nv04_bo_move_m2mf(struct nouveau_channel *, struct ttm_buffer_object *,
-		      struct ttm_mem_reg *, struct ttm_mem_reg *);
+		      struct ttm_resource *, struct ttm_resource *);
 
 int nv50_bo_move_init(struct nouveau_channel *, u32);
 int nv50_bo_move_m2mf(struct nouveau_channel *, struct ttm_buffer_object *,
-		      struct ttm_mem_reg *, struct ttm_mem_reg *);
+		      struct ttm_resource *, struct ttm_resource *);
 
 int nv84_bo_move_exec(struct nouveau_channel *, struct ttm_buffer_object *,
-		      struct ttm_mem_reg *, struct ttm_mem_reg *);
+		      struct ttm_resource *, struct ttm_resource *);
 
 int nva3_bo_move_copy(struct nouveau_channel *, struct ttm_buffer_object *,
-		      struct ttm_mem_reg *, struct ttm_mem_reg *);
+		      struct ttm_resource *, struct ttm_resource *);
 
 int nvc0_bo_move_init(struct nouveau_channel *, u32);
 int nvc0_bo_move_m2mf(struct nouveau_channel *, struct ttm_buffer_object *,
-		      struct ttm_mem_reg *, struct ttm_mem_reg *);
+		      struct ttm_resource *, struct ttm_resource *);
 
 int nvc0_bo_move_copy(struct nouveau_channel *, struct ttm_buffer_object *,
-		      struct ttm_mem_reg *, struct ttm_mem_reg *);
+		      struct ttm_resource *, struct ttm_resource *);
 
 int nve0_bo_move_init(struct nouveau_channel *, u32);
 int nve0_bo_move_copy(struct nouveau_channel *, struct ttm_buffer_object *,
-		      struct ttm_mem_reg *, struct ttm_mem_reg *);
+		      struct ttm_resource *, struct ttm_resource *);
 
 #define NVBO_WR32_(b,o,dr,f) nouveau_bo_wr32((b), (o)/4 + (dr), (f))
 #define NVBO_RD32_(b,o,dr)   nouveau_bo_rd32((b), (o)/4 + (dr))
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo0039.c
b/drivers/gpu/drm/nouveau/nouveau_bo0039.c
index bf7ae2cecaf68..7390132129fe7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo0039.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo0039.c
@@ -36,7 +36,7 @@
 
 static inline uint32_t
 nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,
-		      struct nouveau_channel *chan, struct ttm_mem_reg *reg)
+		      struct nouveau_channel *chan, struct ttm_resource *reg)
 {
 	if (reg->mem_type == TTM_PL_TT)
 		return NvDmaTT;
@@ -45,7 +45,7 @@ nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,
 
 int
 nv04_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
-		  struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
+		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)
 {
 	struct nvif_push *push = chan->chan.push;
 	u32 src_ctxdma = nouveau_bo_mem_ctxdma(bo, chan, old_reg);
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo5039.c
b/drivers/gpu/drm/nouveau/nouveau_bo5039.c
index f9b9b85abe444..4c75c7b3804ca 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo5039.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo5039.c
@@ -37,7 +37,7 @@
 
 int
 nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
-		  struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
+		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)
 {
 	struct nouveau_mem *mem = nouveau_mem(old_reg);
 	struct nvif_push *push = chan->chan.push;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo74c1.c
b/drivers/gpu/drm/nouveau/nouveau_bo74c1.c
index 1b5fd78ddcba9..ed6c09d678407 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo74c1.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo74c1.c
@@ -34,7 +34,7 @@
 
 int
 nv84_bo_move_exec(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
-		  struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
+		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)
 {
 	struct nouveau_mem *mem = nouveau_mem(old_reg);
 	struct nvif_push *push = chan->chan.push;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo85b5.c
b/drivers/gpu/drm/nouveau/nouveau_bo85b5.c
index f0df172b029e0..dec29b2d8bb22 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo85b5.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo85b5.c
@@ -38,7 +38,7 @@
 
 int
 nva3_bo_move_copy(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
-		  struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
+		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)
 {
 	struct nouveau_mem *mem = nouveau_mem(old_reg);
 	struct nvif_push *push = chan->chan.push;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo9039.c
b/drivers/gpu/drm/nouveau/nouveau_bo9039.c
index 52fefb37064c8..776b04976cdfa 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo9039.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo9039.c
@@ -36,7 +36,7 @@
 
 int
 nvc0_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
-		  struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
+		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)
 {
 	struct nvif_push *push = chan->chan.push;
 	struct nouveau_mem *mem = nouveau_mem(old_reg);
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo90b5.c
b/drivers/gpu/drm/nouveau/nouveau_bo90b5.c
index 34b79d561c7f4..8499f58213e3c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo90b5.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo90b5.c
@@ -31,7 +31,7 @@
 
 int
 nvc0_bo_move_copy(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
-		  struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
+		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)
 {
 	struct nouveau_mem *mem = nouveau_mem(old_reg);
 	struct nvif_push *push = chan->chan.push;
diff --git a/drivers/gpu/drm/nouveau/nouveau_boa0b5.c
b/drivers/gpu/drm/nouveau/nouveau_boa0b5.c
index 394e29012e504..575212472e7a8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_boa0b5.c
+++ b/drivers/gpu/drm/nouveau/nouveau_boa0b5.c
@@ -36,7 +36,7 @@
 
 int
 nve0_bo_move_copy(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
-		  struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
+		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)
 {
 	struct nouveau_mem *mem = nouveau_mem(old_reg);
 	struct nvif_push *push = chan->chan.push;
-- 
2.26.2

Dave Airlie

2020-Aug-07 04:03 UTC

head link

[Nouveau] [PATCH] drm/nouveau: missing cases of rename ttm_mem_reg to ttm_resource.

On Fri, 7 Aug 2020 at 11:13, Rodrigo Vivi <rodrigo.vivi at intel.com>
wrote:>
> From: Rodrigo Vivi <rodrigo.vivi at gmail.com>
>
> These are missed cases that I just identified with allyesconfig build.
>
Is this against drm-tip? it's a merge problem, that I thought I'd
already addressed, but tip seems to have lost it.

Dave.
> Fixes: 2966141ad2dd ("drm/ttm: rename ttm_mem_reg to
ttm_resource.")
> Cc: Dave Airlie <airlied at redhat.com>
> Cc: Ben Skeggs <bskeggs at redhat.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at gmail.com>
> ---
>  drivers/gpu/drm/nouveau/nouveau_bo.h     | 14 +++++++-------
>  drivers/gpu/drm/nouveau/nouveau_bo0039.c |  4 ++--
>  drivers/gpu/drm/nouveau/nouveau_bo5039.c |  2 +-
>  drivers/gpu/drm/nouveau/nouveau_bo74c1.c |  2 +-
>  drivers/gpu/drm/nouveau/nouveau_bo85b5.c |  2 +-
>  drivers/gpu/drm/nouveau/nouveau_bo9039.c |  2 +-
>  drivers/gpu/drm/nouveau/nouveau_bo90b5.c |  2 +-
>  drivers/gpu/drm/nouveau/nouveau_boa0b5.c |  2 +-
>  8 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.h
b/drivers/gpu/drm/nouveau/nouveau_bo.h
> index 52489ce7d029c..aecb7481df0da 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.h
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.h
> @@ -139,28 +139,28 @@ nouveau_bo_new_pin_map(struct nouveau_cli *cli, u64
size, int align, u32 flags,
>
>  int nv04_bo_move_init(struct nouveau_channel *, u32);
>  int nv04_bo_move_m2mf(struct nouveau_channel *, struct ttm_buffer_object
*,
> -                     struct ttm_mem_reg *, struct ttm_mem_reg *);
> +                     struct ttm_resource *, struct ttm_resource *);
>
>  int nv50_bo_move_init(struct nouveau_channel *, u32);
>  int nv50_bo_move_m2mf(struct nouveau_channel *, struct ttm_buffer_object
*,
> -                     struct ttm_mem_reg *, struct ttm_mem_reg *);
> +                     struct ttm_resource *, struct ttm_resource *);
>
>  int nv84_bo_move_exec(struct nouveau_channel *, struct ttm_buffer_object
*,
> -                     struct ttm_mem_reg *, struct ttm_mem_reg *);
> +                     struct ttm_resource *, struct ttm_resource *);
>
>  int nva3_bo_move_copy(struct nouveau_channel *, struct ttm_buffer_object
*,
> -                     struct ttm_mem_reg *, struct ttm_mem_reg *);
> +                     struct ttm_resource *, struct ttm_resource *);
>
>  int nvc0_bo_move_init(struct nouveau_channel *, u32);
>  int nvc0_bo_move_m2mf(struct nouveau_channel *, struct ttm_buffer_object
*,
> -                     struct ttm_mem_reg *, struct ttm_mem_reg *);
> +                     struct ttm_resource *, struct ttm_resource *);
>
>  int nvc0_bo_move_copy(struct nouveau_channel *, struct ttm_buffer_object
*,
> -                     struct ttm_mem_reg *, struct ttm_mem_reg *);
> +                     struct ttm_resource *, struct ttm_resource *);
>
>  int nve0_bo_move_init(struct nouveau_channel *, u32);
>  int nve0_bo_move_copy(struct nouveau_channel *, struct ttm_buffer_object
*,
> -                     struct ttm_mem_reg *, struct ttm_mem_reg *);
> +                     struct ttm_resource *, struct ttm_resource *);
>
>  #define NVBO_WR32_(b,o,dr,f) nouveau_bo_wr32((b), (o)/4 + (dr), (f))
>  #define NVBO_RD32_(b,o,dr)   nouveau_bo_rd32((b), (o)/4 + (dr))
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo0039.c
b/drivers/gpu/drm/nouveau/nouveau_bo0039.c
> index bf7ae2cecaf68..7390132129fe7 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo0039.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo0039.c
> @@ -36,7 +36,7 @@
>
>  static inline uint32_t
>  nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,
> -                     struct nouveau_channel *chan, struct ttm_mem_reg
*reg)
> +                     struct nouveau_channel *chan, struct ttm_resource
*reg)
>  {
>         if (reg->mem_type == TTM_PL_TT)
>                 return NvDmaTT;
> @@ -45,7 +45,7 @@ nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,
>
>  int
>  nv04_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object
*bo,
> -                 struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
> +                 struct ttm_resource *old_reg, struct ttm_resource
*new_reg)
>  {
>         struct nvif_push *push = chan->chan.push;
>         u32 src_ctxdma = nouveau_bo_mem_ctxdma(bo, chan, old_reg);
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo5039.c
b/drivers/gpu/drm/nouveau/nouveau_bo5039.c
> index f9b9b85abe444..4c75c7b3804ca 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo5039.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo5039.c
> @@ -37,7 +37,7 @@
>
>  int
>  nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object
*bo,
> -                 struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
> +                 struct ttm_resource *old_reg, struct ttm_resource
*new_reg)
>  {
>         struct nouveau_mem *mem = nouveau_mem(old_reg);
>         struct nvif_push *push = chan->chan.push;
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo74c1.c
b/drivers/gpu/drm/nouveau/nouveau_bo74c1.c
> index 1b5fd78ddcba9..ed6c09d678407 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo74c1.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo74c1.c
> @@ -34,7 +34,7 @@
>
>  int
>  nv84_bo_move_exec(struct nouveau_channel *chan, struct ttm_buffer_object
*bo,
> -                 struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
> +                 struct ttm_resource *old_reg, struct ttm_resource
*new_reg)
>  {
>         struct nouveau_mem *mem = nouveau_mem(old_reg);
>         struct nvif_push *push = chan->chan.push;
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo85b5.c
b/drivers/gpu/drm/nouveau/nouveau_bo85b5.c
> index f0df172b029e0..dec29b2d8bb22 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo85b5.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo85b5.c
> @@ -38,7 +38,7 @@
>
>  int
>  nva3_bo_move_copy(struct nouveau_channel *chan, struct ttm_buffer_object
*bo,
> -                 struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
> +                 struct ttm_resource *old_reg, struct ttm_resource
*new_reg)
>  {
>         struct nouveau_mem *mem = nouveau_mem(old_reg);
>         struct nvif_push *push = chan->chan.push;
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo9039.c
b/drivers/gpu/drm/nouveau/nouveau_bo9039.c
> index 52fefb37064c8..776b04976cdfa 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo9039.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo9039.c
> @@ -36,7 +36,7 @@
>
>  int
>  nvc0_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object
*bo,
> -                 struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
> +                 struct ttm_resource *old_reg, struct ttm_resource
*new_reg)
>  {
>         struct nvif_push *push = chan->chan.push;
>         struct nouveau_mem *mem = nouveau_mem(old_reg);
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo90b5.c
b/drivers/gpu/drm/nouveau/nouveau_bo90b5.c
> index 34b79d561c7f4..8499f58213e3c 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo90b5.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo90b5.c
> @@ -31,7 +31,7 @@
>
>  int
>  nvc0_bo_move_copy(struct nouveau_channel *chan, struct ttm_buffer_object
*bo,
> -                 struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
> +                 struct ttm_resource *old_reg, struct ttm_resource
*new_reg)
>  {
>         struct nouveau_mem *mem = nouveau_mem(old_reg);
>         struct nvif_push *push = chan->chan.push;
> diff --git a/drivers/gpu/drm/nouveau/nouveau_boa0b5.c
b/drivers/gpu/drm/nouveau/nouveau_boa0b5.c
> index 394e29012e504..575212472e7a8 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_boa0b5.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_boa0b5.c
> @@ -36,7 +36,7 @@
>
>  int
>  nve0_bo_move_copy(struct nouveau_channel *chan, struct ttm_buffer_object
*bo,
> -                 struct ttm_mem_reg *old_reg, struct ttm_mem_reg *new_reg)
> +                 struct ttm_resource *old_reg, struct ttm_resource
*new_reg)
>  {
>         struct nouveau_mem *mem = nouveau_mem(old_reg);
>         struct nvif_push *push = chan->chan.push;
> --
> 2.26.2
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau

Dave Airlie

2020-Aug-07 04:30 UTC

head link

[Nouveau] [PATCH] drm/nouveau: missing cases of rename ttm_mem_reg to ttm_resource.

On Fri, 7 Aug 2020 at 14:03, Dave Airlie <airlied at gmail.com>
wrote:>
> On Fri, 7 Aug 2020 at 11:13, Rodrigo Vivi <rodrigo.vivi at intel.com>
wrote:
> >
> > From: Rodrigo Vivi <rodrigo.vivi at gmail.com>
> >
> > These are missed cases that I just identified with allyesconfig build.
> >
>
> Is this against drm-tip? it's a merge problem, that I thought I'd
> already addressed, but tip seems to have lost it.
I think I've fixed drm-tip rebuilds now.

Dave.

Reasonably Related Threads

Search for more apparently analagous threads

Nouveau - Aug 2020 - [PATCH] drm/nouveau: missing cases of rename ttm_mem_reg to ttm_resource.

[Nouveau] [PATCH] drm/nouveau: missing cases of rename ttm_mem_reg to ttm_resource.

[Nouveau] [PATCH] drm/nouveau: missing cases of rename ttm_mem_reg to ttm_resource.

[Nouveau] [PATCH] drm/nouveau: missing cases of rename ttm_mem_reg to ttm_resource.

Reasonably Related Threads