diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2018-05-08 20:39:47 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-05-18 15:01:28 +1000 |
| commit | 09e1b78aab5715eacab02e4047c7a47d72f6a1e9 (patch) | |
| tree | d889f7568557a7d0121c6138b223d5952bfb1e99 /drivers/gpu/drm/nouveau/dispnv50/pior507d.c | |
| parent | drm/nouveau/kms/nv50-: split each resource type into their own source files (diff) | |
| download | linux-dev-09e1b78aab5715eacab02e4047c7a47d72f6a1e9.tar.xz linux-dev-09e1b78aab5715eacab02e4047c7a47d72f6a1e9.zip | |
drm/nouveau/kms/nv50-: split core implementation by hardware class
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/dispnv50/pior507d.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/dispnv50/pior507d.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/gpu/drm/nouveau/dispnv50/pior507d.c b/drivers/gpu/drm/nouveau/dispnv50/pior507d.c index a99ba6a7216f..d2bac6a341dc 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/pior507d.c +++ b/drivers/gpu/drm/nouveau/dispnv50/pior507d.c @@ -21,23 +21,19 @@ */ #include "core.h" -#include <nvif/class.h> - static void pior507d_ctrl(struct nv50_core *core, int or, u32 ctrl, struct nv50_head_atom *asyh) { u32 *push; - if ((push = evo_wait(&core->chan, 8))) { - if (core->chan.base.user.oclass < GF110_DISP_CORE_CHANNEL_DMA) { - if (asyh) { - ctrl |= asyh->or.depth << 16; - ctrl |= asyh->or.nvsync << 13; - ctrl |= asyh->or.nhsync << 12; - } - evo_mthd(push, 0x0700 + (or * 0x040), 1); - evo_data(push, ctrl); + if ((push = evo_wait(&core->chan, 2))) { + if (asyh) { + ctrl |= asyh->or.depth << 16; + 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); } } |