UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/kms/nv50-: convert wndw xlut_set() to new push macros 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
Ben Skeggs 2020-06-20 08:47:20 +10:00
parent cfb4120dae
commit 222439ebe6
6 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/dispnv50/base.h
View File

@ -13,7 +13,7 @@ void base507c_release(struct nv50_wndw *, struct nv50_wndw_atom *,
struct nv50_head_atom *);
int base507c_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);
int base507c_sema_clr(struct nv50_wndw *);
void base507c_xlut_set(struct nv50_wndw *, struct nv50_wndw_atom *);
int base507c_xlut_set(struct nv50_wndw *, struct nv50_wndw_atom *);
void base507c_xlut_clr(struct nv50_wndw *);
void base507c_image_clr(struct nv50_wndw *);
void base507c_update(struct nv50_wndw *, u32 *);

16
drivers/gpu/drm/nouveau/dispnv50/base507c.c
View File

@ -100,15 +100,17 @@ base507c_xlut_clr(struct nv50_wndw *wndw)
}
}
void
int
base507c_xlut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{
u32 *push;
if ((push = evo_wait(&wndw->wndw, 2))) {
evo_mthd(push, 0x00e0, 1);
evo_data(push, 0x40000000);
evo_kick(push, &wndw->wndw);
}
struct nvif_push *push = wndw->wndw.push;
int ret;
if ((ret = PUSH_WAIT(push, 2)))
return ret;
PUSH_NVSQ(push, NV507C, 0x00e0, 0x40000000);
return 0;
}
int

25
drivers/gpu/drm/nouveau/dispnv50/base907c.c
View File

@ -61,20 +61,21 @@ base907c_xlut_clr(struct nv50_wndw *wndw)
}
}
static void
static int
base907c_xlut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{
u32 *push;
if ((push = evo_wait(&wndw->wndw, 6))) {
evo_mthd(push, 0x00e0, 3);
evo_data(push, asyw->xlut.i.enable << 30 |
asyw->xlut.i.mode << 24);
evo_data(push, asyw->xlut.i.offset >> 8);
evo_data(push, 0x40000000);
evo_mthd(push, 0x00fc, 1);
evo_data(push, asyw->xlut.handle);
evo_kick(push, &wndw->wndw);
}
struct nvif_push *push = wndw->wndw.push;
int ret;
if ((ret = PUSH_WAIT(push, 6)))
return ret;
PUSH_NVSQ(push, NV907C, 0x00e0, asyw->xlut.i.enable << 30 |
asyw->xlut.i.mode << 24,
0x00e4, asyw->xlut.i.offset >> 8,
0x00e8, 0x40000000);
PUSH_NVSQ(push, NV907C, 0x00fc, asyw->xlut.handle);
return 0;
}
static bool

2
drivers/gpu/drm/nouveau/dispnv50/wndw.h
View File

@ -72,7 +72,7 @@ struct nv50_wndw_func {
bool ilut_identity;
int ilut_size;
bool olut_core;
void (*xlut_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
int (*xlut_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
void (*xlut_clr)(struct nv50_wndw *);
void (*image_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
void (*image_clr)(struct nv50_wndw *);

24
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
View File

@ -59,19 +59,21 @@ wndwc37e_ilut_clr(struct nv50_wndw *wndw)
}
}
static void
static int
wndwc37e_ilut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{
u32 *push;
if ((push = evo_wait(&wndw->wndw, 4))) {
evo_mthd(push, 0x02b0, 3);
evo_data(push, asyw->xlut.i.output_mode << 8 |
asyw->xlut.i.range << 4 |
asyw->xlut.i.size);
evo_data(push, asyw->xlut.i.offset >> 8);
evo_data(push, asyw->xlut.handle);
evo_kick(push, &wndw->wndw);
}
struct nvif_push *push = wndw->wndw.push;
int ret;
if ((ret = PUSH_WAIT(push, 4)))
return ret;
PUSH_NVSQ(push, NVC37E, 0x02b0, asyw->xlut.i.output_mode << 8 |
asyw->xlut.i.range << 4 |
asyw->xlut.i.size,
0x02b4, asyw->xlut.i.offset >> 8,
0x02b8, asyw->xlut.handle);
return 0;
}
static bool

24
drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
View File

@ -103,19 +103,21 @@ wndwc57e_ilut_clr(struct nv50_wndw *wndw)
}
}
static void
static int
wndwc57e_ilut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
{
u32 *push;
if ((push = evo_wait(&wndw->wndw, 4))) {
evo_mthd(push, 0x0440, 3);
evo_data(push, asyw->xlut.i.size << 8 |
asyw->xlut.i.mode << 2 |
asyw->xlut.i.output_mode);
evo_data(push, asyw->xlut.handle);
evo_data(push, asyw->xlut.i.offset >> 8);
evo_kick(push, &wndw->wndw);
}
struct nvif_push *push = wndw->wndw.push;
int ret;
if ((ret = PUSH_WAIT(push, 4)))
return ret;
PUSH_NVSQ(push, NVC57E, 0x0440, asyw->xlut.i.size << 8 |
asyw->xlut.i.mode << 2 |
asyw->xlut.i.output_mode,
0x0444, asyw->xlut.handle,
0x0448, asyw->xlut.i.offset >> 8);
return 0;
}
static u16