Skip to content

L
linux
Commit ed0b86a9 authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

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

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent dbb23f54
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 27 deletions
drivers/gpu/drm/nouveau/dispnv50/head507d.c
View file @ ed0b86a9
...@@ -137,10 +137,16 @@ head507d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh) ...@@ -137,10 +137,16 @@ head507d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
if ((ret = PUSH_WAIT(push, 3))) if ((ret = PUSH_WAIT(push, 3)))
return ret; return ret;
PUSH_NVSQ(push, NV507D, 0x0880 + (i * 0x400), 0x80000000 | PUSH_MTHD(push, NV507D, HEAD_SET_CONTROL_CURSOR(i),
asyh->curs.layout << 26 | NVDEF(NV507D, HEAD_SET_CONTROL_CURSOR, ENABLE, ENABLE) |
asyh->curs.format << 24, NVVAL(NV507D, HEAD_SET_CONTROL_CURSOR, FORMAT, asyh->curs.format) |
0x0884 + (i * 0x400), asyh->curs.offset >> 8); NVVAL(NV507D, HEAD_SET_CONTROL_CURSOR, SIZE, asyh->curs.layout) |
NVVAL(NV507D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_X, 0) |
NVVAL(NV507D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_Y, 0) |
NVDEF(NV507D, HEAD_SET_CONTROL_CURSOR, COMPOSITION, ALPHA_BLEND) |
NVDEF(NV507D, HEAD_SET_CONTROL_CURSOR, SUB_OWNER, NONE),
HEAD_SET_OFFSET_CURSOR(i), asyh->curs.offset >> 8);
return 0; return 0;
} }
...@@ -149,7 +155,7 @@ head507d_curs_format(struct nv50_head *head, struct nv50_wndw_atom *asyw, ...@@ -149,7 +155,7 @@ head507d_curs_format(struct nv50_head *head, struct nv50_wndw_atom *asyw,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
switch (asyw->image.format) { switch (asyw->image.format) {
case 0xcf: asyh->curs.format = 1; break; case 0xcf: asyh->curs.format = NV507D_HEAD_SET_CONTROL_CURSOR_FORMAT_A8R8G8B8; break;
default: default:
WARN_ON(1); WARN_ON(1);
return -EINVAL; return -EINVAL;
...@@ -162,8 +168,8 @@ head507d_curs_layout(struct nv50_head *head, struct nv50_wndw_atom *asyw, ...@@ -162,8 +168,8 @@ head507d_curs_layout(struct nv50_head *head, struct nv50_wndw_atom *asyw,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
switch (asyw->image.w) { switch (asyw->image.w) {
case 32: asyh->curs.layout = 0; break; case 32: asyh->curs.layout = NV507D_HEAD_SET_CONTROL_CURSOR_SIZE_W32_H32; break;
case 64: asyh->curs.layout = 1; break; case 64: asyh->curs.layout = NV507D_HEAD_SET_CONTROL_CURSOR_SIZE_W64_H64; break;
default: default:
return -EINVAL; return -EINVAL;
} }
......
drivers/gpu/drm/nouveau/dispnv50/head827d.c
View file @ ed0b86a9
...@@ -51,11 +51,18 @@ head827d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh) ...@@ -51,11 +51,18 @@ head827d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
if ((ret = PUSH_WAIT(push, 5))) if ((ret = PUSH_WAIT(push, 5)))
return ret; return ret;
PUSH_NVSQ(push, NV827D, 0x0880 + (i * 0x400), 0x80000000 | PUSH_MTHD(push, NV827D, HEAD_SET_CONTROL_CURSOR(i),
asyh->curs.layout << 26 | NVDEF(NV827D, HEAD_SET_CONTROL_CURSOR, ENABLE, ENABLE) |
asyh->curs.format << 24, NVVAL(NV827D, HEAD_SET_CONTROL_CURSOR, FORMAT, asyh->curs.format) |
0x0884 + (i * 0x400), asyh->curs.offset >> 8); NVVAL(NV827D, HEAD_SET_CONTROL_CURSOR, SIZE, asyh->curs.layout) |
PUSH_NVSQ(push, NV827D, 0x089c + (i * 0x400), asyh->curs.handle); NVVAL(NV827D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_X, 0) |
NVVAL(NV827D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_Y, 0) |
NVDEF(NV827D, HEAD_SET_CONTROL_CURSOR, COMPOSITION, ALPHA_BLEND) |
NVDEF(NV827D, HEAD_SET_CONTROL_CURSOR, SUB_OWNER, NONE),
HEAD_SET_OFFSET_CURSOR(i), asyh->curs.offset >> 8);
PUSH_MTHD(push, NV827D, HEAD_SET_CONTEXT_DMA_CURSOR(i), asyh->curs.handle);
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/dispnv50/head907d.c
View file @ ed0b86a9
...@@ -166,11 +166,17 @@ head907d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh) ...@@ -166,11 +166,17 @@ head907d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
if ((ret = PUSH_WAIT(push, 5))) if ((ret = PUSH_WAIT(push, 5)))
return ret; return ret;
PUSH_NVSQ(push, NV907D, 0x0480 + (i * 0x300), 0x80000000 | PUSH_MTHD(push, NV907D, HEAD_SET_CONTROL_CURSOR(i),
asyh->curs.layout << 26 | NVDEF(NV907D, HEAD_SET_CONTROL_CURSOR, ENABLE, ENABLE) |
asyh->curs.format << 24, NVVAL(NV907D, HEAD_SET_CONTROL_CURSOR, FORMAT, asyh->curs.format) |
0x0484 + (i * 0x300), asyh->curs.offset >> 8); NVVAL(NV907D, HEAD_SET_CONTROL_CURSOR, SIZE, asyh->curs.layout) |
PUSH_NVSQ(push, NV907D, 0x048c + (i * 0x300), asyh->curs.handle); NVVAL(NV907D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_X, 0) |
NVVAL(NV907D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_Y, 0) |
NVDEF(NV907D, HEAD_SET_CONTROL_CURSOR, COMPOSITION, ALPHA_BLEND),
HEAD_SET_OFFSET_CURSOR(i), asyh->curs.offset >> 8);
PUSH_MTHD(push, NV907D, HEAD_SET_CONTEXT_DMA_CURSOR(i), asyh->curs.handle);
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/dispnv50/head917d.c
View file @ ed0b86a9
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include <nvif/push507c.h> #include <nvif/push507c.h>
#include <nvhw/class/cl917d.h>
static int static int
head917d_dither(struct nv50_head *head, struct nv50_head_atom *asyh) head917d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
{ {
...@@ -73,10 +75,10 @@ head917d_curs_layout(struct nv50_head *head, struct nv50_wndw_atom *asyw, ...@@ -73,10 +75,10 @@ head917d_curs_layout(struct nv50_head *head, struct nv50_wndw_atom *asyw,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
switch (asyw->state.fb->width) { switch (asyw->state.fb->width) {
case 32: asyh->curs.layout = 0; break; case 32: asyh->curs.layout = NV917D_HEAD_SET_CONTROL_CURSOR_SIZE_W32_H32; break;
case 64: asyh->curs.layout = 1; break; case 64: asyh->curs.layout = NV917D_HEAD_SET_CONTROL_CURSOR_SIZE_W64_H64; break;
case 128: asyh->curs.layout = 2; break; case 128: asyh->curs.layout = NV917D_HEAD_SET_CONTROL_CURSOR_SIZE_W128_H128; break;
case 256: asyh->curs.layout = 3; break; case 256: asyh->curs.layout = NV917D_HEAD_SET_CONTROL_CURSOR_SIZE_W256_H256; break;
default: default:
return -EINVAL; return -EINVAL;
} }
......
drivers/gpu/drm/nouveau/dispnv50/headc37d.c
View file @ ed0b86a9
...@@ -116,12 +116,24 @@ headc37d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh) ...@@ -116,12 +116,24 @@ headc37d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
if ((ret = PUSH_WAIT(push, 7))) if ((ret = PUSH_WAIT(push, 7)))
return ret; return ret;
PUSH_NVSQ(push, NVC37D, 0x209c + (i * 0x400), 0x80000000 | PUSH_MTHD(push, NVC37D, HEAD_SET_CONTROL_CURSOR(i),
asyh->curs.layout << 8 | NVDEF(NVC37D, HEAD_SET_CONTROL_CURSOR, ENABLE, ENABLE) |
asyh->curs.format << 0, NVVAL(NVC37D, HEAD_SET_CONTROL_CURSOR, FORMAT, asyh->curs.format) |
0x20a0 + (i * 0x400), 0x000072ff); NVVAL(NVC37D, HEAD_SET_CONTROL_CURSOR, SIZE, asyh->curs.layout) |
PUSH_NVSQ(push, NVC37D, 0x2088 + (i * 0x400), asyh->curs.handle); NVVAL(NVC37D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_X, 0) |
PUSH_NVSQ(push, NVC37D, 0x2090 + (i * 0x400), asyh->curs.offset >> 8); NVVAL(NVC37D, HEAD_SET_CONTROL_CURSOR, HOT_SPOT_Y, 0) |
NVDEF(NVC37D, HEAD_SET_CONTROL_CURSOR, DE_GAMMA, NONE),
HEAD_SET_CONTROL_CURSOR_COMPOSITION(i),
NVVAL(NVC37D, HEAD_SET_CONTROL_CURSOR_COMPOSITION, K1, 0xff) |
NVDEF(NVC37D, HEAD_SET_CONTROL_CURSOR_COMPOSITION, CURSOR_COLOR_FACTOR_SELECT,
K1) |
NVDEF(NVC37D, HEAD_SET_CONTROL_CURSOR_COMPOSITION, VIEWPORT_COLOR_FACTOR_SELECT,
NEG_K1_TIMES_SRC) |
NVDEF(NVC37D, HEAD_SET_CONTROL_CURSOR_COMPOSITION, MODE, BLEND));
PUSH_MTHD(push, NVC37D, HEAD_SET_CONTEXT_DMA_CURSOR(i, 0), asyh->curs.handle);
PUSH_MTHD(push, NVC37D, HEAD_SET_OFFSET_CURSOR(i, 0), asyh->curs.offset >> 8);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7