Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 15:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/bo: convert move init() to new push macros

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
Ben Skeggs 2020-06-22 15:54:52 +10:00
parent 8b9d5d63a7
commit 01c43a66eb
4 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/nouveau/nouveau_bo0039.c
View File

@ -30,6 +30,8 @@
#include "nouveau_dma.h"
#include "nouveau_drv.h"
#include <nvif/push006c.h>
static inline uint32_t
nouveau_bo_mem_ctxdma(struct ttm_buffer_object *bo,
struct nouveau_channel *chan, struct ttm_mem_reg *reg)
@ -88,13 +90,14 @@ nv04_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
int
nv04_bo_move_init(struct nouveau_channel *chan, u32 handle)
{
int ret = RING_SPACE(chan, 4);
if (ret == 0) {
BEGIN_NV04(chan, NvSubCopy, 0x0000, 1);
OUT_RING (chan, handle);
BEGIN_NV04(chan, NvSubCopy, 0x0180, 1);
OUT_RING (chan, chan->drm->ntfy.handle);
}
struct nvif_push *push = chan->chan.push;
int ret;
return ret;
ret = PUSH_WAIT(push, 4);
if (ret)
return ret;
PUSH_NVSQ(push, NV039, 0x0000, handle);
PUSH_NVSQ(push, NV039, 0x0180, chan->drm->ntfy.handle);
return 0;
}

23
drivers/gpu/drm/nouveau/nouveau_bo5039.c
View File

@ -31,6 +31,8 @@
#include "nouveau_drv.h"
#include "nouveau_mem.h"
#include <nvif/push206e.h>
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)
@ -107,15 +109,16 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
int
nv50_bo_move_init(struct nouveau_channel *chan, u32 handle)
{
int ret = RING_SPACE(chan, 6);
if (ret == 0) {
BEGIN_NV04(chan, NvSubCopy, 0x0000, 1);
OUT_RING (chan, handle);
BEGIN_NV04(chan, NvSubCopy, 0x0180, 3);
OUT_RING (chan, chan->drm->ntfy.handle);
OUT_RING (chan, chan->vram.handle);
OUT_RING (chan, chan->vram.handle);
}
struct nvif_push *push = chan->chan.push;
int ret;
return ret;
ret = PUSH_WAIT(push, 6);
if (ret)
return ret;
PUSH_NVSQ(push, NV5039, 0x0000, handle);
PUSH_NVSQ(push, NV5039, 0x0180, chan->drm->ntfy.handle,
0x0184, chan->vram.handle,
0x0188, chan->vram.handle);
return 0;
}

17
drivers/gpu/drm/nouveau/nouveau_bo9039.c
View File

@ -30,6 +30,8 @@
#include "nouveau_dma.h"
#include "nouveau_mem.h"
#include <nvif/push906f.h>
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)
@ -72,10 +74,13 @@ nvc0_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
int
nvc0_bo_move_init(struct nouveau_channel *chan, u32 handle)
{
int ret = RING_SPACE(chan, 2);
if (ret == 0) {
BEGIN_NVC0(chan, NvSubCopy, 0x0000, 1);
OUT_RING (chan, handle);
}
return ret;
struct nvif_push *push = chan->chan.push;
int ret;
ret = PUSH_WAIT(push, 2);
if (ret)
return ret;
PUSH_NVSQ(push, NV9039, 0x0000, handle);
return 0;
}

18
drivers/gpu/drm/nouveau/nouveau_boa0b5.c
View File

@ -30,6 +30,8 @@
#include "nouveau_dma.h"
#include "nouveau_mem.h"
#include <nvif/push906f.h>
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)
@ -54,11 +56,13 @@ nve0_bo_move_copy(struct nouveau_channel *chan, struct ttm_buffer_object *bo,
int
nve0_bo_move_init(struct nouveau_channel *chan, u32 handle)
{
int ret = RING_SPACE(chan, 2);
if (ret == 0) {
BEGIN_NVC0(chan, NvSubCopy, 0x0000, 1);
OUT_RING (chan, handle & 0x0000ffff);
FIRE_RING (chan);
}
return ret;
struct nvif_push *push = chan->chan.push;
int ret;
ret = PUSH_WAIT(push, 2);
if (ret)
return ret;
PUSH_NVSQ(push, NVA0B5, 0x0000, handle & 0x0000ffff);
return 0;
}