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

drm/nouveau/kms/nv50-: use NVIDIA's headers for core head_core_set()

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-21 11:59:09 +10:00
parent a66a096d78
commit 1302634f79
3 changed files with 76 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/gpu/drm/nouveau/dispnv50/head507d.c
View File

@ -194,16 +194,30 @@ head507d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
if ((ret = PUSH_WAIT(push, 9))) if ((ret = PUSH_WAIT(push, 9)))
return ret; return ret;
PUSH_NVSQ(push, NV507D, 0x0860 + (i * 0x400), asyh->core.offset >> 8); PUSH_MTHD(push, NV507D, HEAD_SET_OFFSET(i, 0),
PUSH_NVSQ(push, NV507D, 0x0868 + (i * 0x400), asyh->core.h << 16 | asyh->core.w, NVVAL(NV507D, HEAD_SET_OFFSET, ORIGIN, asyh->core.offset >> 8));
0x086c + (i * 0x400), asyh->core.layout << 20 |
(asyh->core.pitch >> 8) << 8 | PUSH_MTHD(push, NV507D, HEAD_SET_SIZE(i),
asyh->core.blocks << 8 | NVVAL(NV507D, HEAD_SET_SIZE, WIDTH, asyh->core.w) |
asyh->core.blockh, NVVAL(NV507D, HEAD_SET_SIZE, HEIGHT, asyh->core.h),
0x0870 + (i * 0x400), asyh->core.kind << 16 |
asyh->core.format << 8, HEAD_SET_STORAGE(i),
0x0874 + (i * 0x400), asyh->core.handle); NVVAL(NV507D, HEAD_SET_STORAGE, BLOCK_HEIGHT, asyh->core.blockh) |
PUSH_NVSQ(push, NV507D, 0x08c0 + (i * 0x400), asyh->core.y << 16 | asyh->core.x); NVVAL(NV507D, HEAD_SET_STORAGE, PITCH, asyh->core.pitch >> 8) |
NVVAL(NV507D, HEAD_SET_STORAGE, PITCH, asyh->core.blocks) |
NVVAL(NV507D, HEAD_SET_STORAGE, MEMORY_LAYOUT, asyh->core.layout),
HEAD_SET_PARAMS(i),
NVVAL(NV507D, HEAD_SET_PARAMS, FORMAT, asyh->core.format) |
NVVAL(NV507D, HEAD_SET_PARAMS, KIND, asyh->core.kind) |
NVDEF(NV507D, HEAD_SET_PARAMS, PART_STRIDE, PARTSTRIDE_256),
HEAD_SET_CONTEXT_DMA_ISO(i),
NVVAL(NV507D, HEAD_SET_CONTEXT_DMA_ISO, HANDLE, asyh->core.handle));
PUSH_MTHD(push, NV507D, HEAD_SET_VIEWPORT_POINT_IN(i, 0),
NVVAL(NV507D, HEAD_SET_VIEWPORT_POINT_IN, X, asyh->core.x) |
NVVAL(NV507D, HEAD_SET_VIEWPORT_POINT_IN, Y, asyh->core.y));
/* EVO will complain with INVALID_STATE if we have an /* EVO will complain with INVALID_STATE if we have an
* active cursor and (re)specify HeadSetContextDmaIso * active cursor and (re)specify HeadSetContextDmaIso
@ -238,10 +252,10 @@ head507d_core_calc(struct nv50_head *head, struct nv50_head_atom *asyh)
} }
asyh->core.handle = disp->core->chan.vram.handle; asyh->core.handle = disp->core->chan.vram.handle;
asyh->core.offset = 0; asyh->core.offset = 0;
asyh->core.format = 0xcf; asyh->core.format = NV507D_HEAD_SET_PARAMS_FORMAT_A8R8G8B8;
asyh->core.kind = 0; asyh->core.kind = NV507D_HEAD_SET_PARAMS_KIND_KIND_PITCH;
asyh->core.layout = 1; asyh->core.layout = NV507D_HEAD_SET_STORAGE_MEMORY_LAYOUT_PITCH;
asyh->core.blockh = 0; asyh->core.blockh = NV507D_HEAD_SET_STORAGE_BLOCK_HEIGHT_ONE_GOB;
asyh->core.blocks = 0; asyh->core.blocks = 0;
asyh->core.pitch = ALIGN(asyh->core.w, 64) * 4; asyh->core.pitch = ALIGN(asyh->core.w, 64) * 4;
} }

33
drivers/gpu/drm/nouveau/dispnv50/head827d.c
View File

@ -69,15 +69,30 @@ head827d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
if ((ret = PUSH_WAIT(push, 9))) if ((ret = PUSH_WAIT(push, 9)))
return ret; return ret;
PUSH_NVSQ(push, NV827D, 0x0860 + (i * 0x400), asyh->core.offset >> 8); PUSH_MTHD(push, NV827D, HEAD_SET_OFFSET(i, 0),
PUSH_NVSQ(push, NV827D, 0x0868 + (i * 0x400), asyh->core.h << 16 | asyh->core.w, NVVAL(NV827D, HEAD_SET_OFFSET, ORIGIN, asyh->core.offset >> 8));
0x086c + (i * 0x400), asyh->core.layout << 20 |
(asyh->core.pitch >> 8) << 8 | PUSH_MTHD(push, NV827D, HEAD_SET_SIZE(i),
asyh->core.blocks << 8 | NVVAL(NV827D, HEAD_SET_SIZE, WIDTH, asyh->core.w) |
asyh->core.blockh, NVVAL(NV827D, HEAD_SET_SIZE, HEIGHT, asyh->core.h),
0x0870 + (i * 0x400), asyh->core.format << 8,
0x0874 + (i * 0x400), asyh->core.handle); HEAD_SET_STORAGE(i),
PUSH_NVSQ(push, NV827D, 0x08c0 + (i * 0x400), asyh->core.y << 16 | asyh->core.x); NVVAL(NV827D, HEAD_SET_STORAGE, BLOCK_HEIGHT, asyh->core.blockh) |
NVVAL(NV827D, HEAD_SET_STORAGE, PITCH, asyh->core.pitch >> 8) |
NVVAL(NV827D, HEAD_SET_STORAGE, PITCH, asyh->core.blocks) |
NVVAL(NV827D, HEAD_SET_STORAGE, MEMORY_LAYOUT, asyh->core.layout),
HEAD_SET_PARAMS(i),
NVVAL(NV827D, HEAD_SET_PARAMS, FORMAT, asyh->core.format) |
NVDEF(NV827D, HEAD_SET_PARAMS, SUPER_SAMPLE, X1_AA) |
NVDEF(NV827D, HEAD_SET_PARAMS, GAMMA, LINEAR),
HEAD_SET_CONTEXT_DMAS_ISO(i, 0),
NVVAL(NV827D, HEAD_SET_CONTEXT_DMAS_ISO, HANDLE, asyh->core.handle));
PUSH_MTHD(push, NV827D, HEAD_SET_VIEWPORT_POINT_IN(i, 0),
NVVAL(NV827D, HEAD_SET_VIEWPORT_POINT_IN, X, asyh->core.x) |
NVVAL(NV827D, HEAD_SET_VIEWPORT_POINT_IN, Y, asyh->core.y));
return 0; return 0;
} }

33
drivers/gpu/drm/nouveau/dispnv50/head907d.c
View File

@ -198,15 +198,30 @@ head907d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
if ((ret = PUSH_WAIT(push, 9))) if ((ret = PUSH_WAIT(push, 9)))
return ret; return ret;
PUSH_NVSQ(push, NV907D, 0x0460 + (i * 0x300), asyh->core.offset >> 8); PUSH_MTHD(push, NV907D, HEAD_SET_OFFSET(i),
PUSH_NVSQ(push, NV907D, 0x0468 + (i * 0x300), asyh->core.h << 16 | asyh->core.w, NVVAL(NV907D, HEAD_SET_OFFSET, ORIGIN, asyh->core.offset >> 8));
0x046c + (i * 0x300), asyh->core.layout << 24 |
(asyh->core.pitch >> 8) << 8 | PUSH_MTHD(push, NV907D, HEAD_SET_SIZE(i),
asyh->core.blocks << 8 | NVVAL(NV907D, HEAD_SET_SIZE, WIDTH, asyh->core.w) |
asyh->core.blockh, NVVAL(NV907D, HEAD_SET_SIZE, HEIGHT, asyh->core.h),
0x0470 + (i * 0x300), asyh->core.format << 8,
0x0474 + (i * 0x300), asyh->core.handle); HEAD_SET_STORAGE(i),
PUSH_NVSQ(push, NV907D, 0x04b0 + (i * 0x300), asyh->core.y << 16 | asyh->core.x); NVVAL(NV907D, HEAD_SET_STORAGE, BLOCK_HEIGHT, asyh->core.blockh) |
NVVAL(NV907D, HEAD_SET_STORAGE, PITCH, asyh->core.pitch >> 8) |
NVVAL(NV907D, HEAD_SET_STORAGE, PITCH, asyh->core.blocks) |
NVVAL(NV907D, HEAD_SET_STORAGE, MEMORY_LAYOUT, asyh->core.layout),
HEAD_SET_PARAMS(i),
NVVAL(NV907D, HEAD_SET_PARAMS, FORMAT, asyh->core.format) |
NVDEF(NV907D, HEAD_SET_PARAMS, SUPER_SAMPLE, X1_AA) |
NVDEF(NV907D, HEAD_SET_PARAMS, GAMMA, LINEAR),
HEAD_SET_CONTEXT_DMAS_ISO(i),
NVVAL(NV907D, HEAD_SET_CONTEXT_DMAS_ISO, HANDLE, asyh->core.handle));
PUSH_MTHD(push, NV907D, HEAD_SET_VIEWPORT_POINT_IN(i),
NVVAL(NV907D, HEAD_SET_VIEWPORT_POINT_IN, X, asyh->core.x) |
NVVAL(NV907D, HEAD_SET_VIEWPORT_POINT_IN, Y, asyh->core.y));
return 0; return 0;
} }