AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-26 18:15:09 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/nouveau/kms/nv50-: convert core or_ctrl() 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-20 17:20:39 +10:00
parent b505935e56
commit 9ec5e82040
7 changed files with 84 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ struct nv50_core_func {
const struct nv50_crc_func *crc; const struct nv50_crc_func *crc;
#endif #endif
const struct nv50_outp_func { const struct nv50_outp_func {
void (*ctrl)(struct nv50_core *, int or, u32 ctrl, int (*ctrl)(struct nv50_core *, int or, u32 ctrl,
struct nv50_head_atom *); struct nv50_head_atom *);
/* XXX: Only used by SORs and PIORs for now */ /* XXX: Only used by SORs and PIORs for now */
void (*get_caps)(struct nv50_disp *, void (*get_caps)(struct nv50_disp *,

28
drivers/gpu/drm/nouveau/dispnv50/dac507d.c
View File

@ -21,21 +21,27 @@
*/ */
#include "core.h" #include "core.h"
static void #include <nvif/push507c.h>
static int
dac507d_ctrl(struct nv50_core *core, int or, u32 ctrl, dac507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
u32 *push, sync = 0; struct nvif_push *push = core->chan.push;
if ((push = evo_wait(&core->chan, 3))) { u32 sync = 0;
if (asyh) { int ret;
sync |= asyh->or.nvsync << 1;
sync |= asyh->or.nhsync; if (asyh) {
} sync |= asyh->or.nvsync << 1;
evo_mthd(push, 0x0400 + (or * 0x080), 2); sync |= asyh->or.nhsync;
evo_data(push, ctrl);
evo_data(push, sync);
evo_kick(push, &core->chan);
} }
if ((ret = PUSH_WAIT(push, 3)))
return ret;
PUSH_NVSQ(push, NV507D, 0x0400 + (or * 0x080), ctrl,
0x0404 + (or * 0x080), sync);
return 0;
} }
const struct nv50_outp_func const struct nv50_outp_func

18
drivers/gpu/drm/nouveau/dispnv50/dac907d.c
View File

@ -21,16 +21,20 @@
*/ */
#include "core.h" #include "core.h"
static void #include <nvif/push507c.h>
static int
dac907d_ctrl(struct nv50_core *core, int or, u32 ctrl, dac907d_ctrl(struct nv50_core *core, int or, u32 ctrl,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
u32 *push; struct nvif_push *push = core->chan.push;
if ((push = evo_wait(&core->chan, 2))) { int ret;
evo_mthd(push, 0x0180 + (or * 0x020), 1);
evo_data(push, ctrl); if ((ret = PUSH_WAIT(push, 2)))
evo_kick(push, &core->chan); return ret;
}
PUSH_NVSQ(push, NV907D, 0x0180 + (or * 0x020), ctrl);
return 0;
} }
const struct nv50_outp_func const struct nv50_outp_func

27
drivers/gpu/drm/nouveau/dispnv50/pior507d.c
View File

@ -21,21 +21,26 @@
*/ */
#include "core.h" #include "core.h"
static void #include <nvif/push507c.h>
static int
pior507d_ctrl(struct nv50_core *core, int or, u32 ctrl, pior507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
u32 *push; struct nvif_push *push = core->chan.push;
if ((push = evo_wait(&core->chan, 2))) { int ret;
if (asyh) {
ctrl |= asyh->or.depth << 16; if (asyh) {
ctrl |= asyh->or.nvsync << 13; ctrl |= asyh->or.depth << 16;
ctrl |= asyh->or.nhsync << 12; ctrl |= asyh->or.nvsync << 13;
} ctrl |= asyh->or.nhsync << 12;
evo_mthd(push, 0x0700 + (or * 0x040), 1);
evo_data(push, ctrl);
evo_kick(push, &core->chan);
} }
if ((ret = PUSH_WAIT(push, 2)))
return ret;
PUSH_NVSQ(push, NV507D, 0x0700 + (or * 0x040), ctrl);
return 0;
} }
static void static void

27
drivers/gpu/drm/nouveau/dispnv50/sor507d.c
View File

@ -21,21 +21,26 @@
*/ */
#include "core.h" #include "core.h"
static void #include <nvif/push507c.h>
static int
sor507d_ctrl(struct nv50_core *core, int or, u32 ctrl, sor507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
u32 *push; struct nvif_push *push = core->chan.push;
if ((push = evo_wait(&core->chan, 2))) { int ret;
if (asyh) {
ctrl |= asyh->or.depth << 16; if (asyh) {
ctrl |= asyh->or.nvsync << 13; ctrl |= asyh->or.depth << 16;
ctrl |= asyh->or.nhsync << 12; ctrl |= asyh->or.nvsync << 13;
} ctrl |= asyh->or.nhsync << 12;
evo_mthd(push, 0x0600 + (or * 0x40), 1);
evo_data(push, ctrl);
evo_kick(push, &core->chan);
} }
if ((ret = PUSH_WAIT(push, 2)))
return ret;
PUSH_NVSQ(push, NV507D, 0x0600 + (or * 0x40), ctrl);
return 0;
} }
static void static void

20
drivers/gpu/drm/nouveau/dispnv50/sor907d.c
View File

@ -21,19 +21,23 @@
*/ */
#include "core.h" #include "core.h"
#include <nouveau_bo.h>
#include <nvif/class.h> #include <nvif/class.h>
#include <nvif/push507c.h>
static void #include <nouveau_bo.h>
static int
sor907d_ctrl(struct nv50_core *core, int or, u32 ctrl, sor907d_ctrl(struct nv50_core *core, int or, u32 ctrl,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
u32 *push; struct nvif_push *push = core->chan.push;
if ((push = evo_wait(&core->chan, 2))) { int ret;
evo_mthd(push, 0x0200 + (or * 0x20), 1);
evo_data(push, ctrl); if ((ret = PUSH_WAIT(push, 2)))
evo_kick(push, &core->chan); return ret;
}
PUSH_NVSQ(push, NV907D, 0x0200 + (or * 0x20), ctrl);
return 0;
} }
static void static void

18
drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
View File

@ -21,16 +21,20 @@
*/ */
#include "core.h" #include "core.h"
static void #include <nvif/push507c.h>
static int
sorc37d_ctrl(struct nv50_core *core, int or, u32 ctrl, sorc37d_ctrl(struct nv50_core *core, int or, u32 ctrl,
struct nv50_head_atom *asyh) struct nv50_head_atom *asyh)
{ {
u32 *push; struct nvif_push *push = core->chan.push;
if ((push = evo_wait(&core->chan, 2))) { int ret;
evo_mthd(push, 0x0300 + (or * 0x20), 1);
evo_data(push, ctrl); if ((ret = PUSH_WAIT(push, 2)))
evo_kick(push, &core->chan); return ret;
}
PUSH_NVSQ(push, NVC37D, 0x0300 + (or * 0x20), ctrl);
return 0;
} }
static void static void