mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 09:59:32 +00:00
drm/nouveau/fifo/gk110: expose KeplerChannelGpfifoB
This class supports a WFI method (0x0078) that's not present on the KeplerChannelGpfifoA class. The binary driver exposes both classes on these GPUs for some reason, though there doesn't appear to be any difference in the setup that's done for each (ie. even if you allocate GpfifoA, the WFI method will still work). We shall just expose GpfifoB, as I don't see a good reason to report the presence of both. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
b4c5fc4b85
commit
63f8c9b7f6
9 changed files with 89 additions and 2 deletions
|
@ -37,6 +37,7 @@
|
|||
#define G82_CHANNEL_GPFIFO /* cl826f.h */ 0x0000826f
|
||||
#define FERMI_CHANNEL_GPFIFO /* cl906f.h */ 0x0000906f
|
||||
#define KEPLER_CHANNEL_GPFIFO_A /* cla06f.h */ 0x0000a06f
|
||||
#define KEPLER_CHANNEL_GPFIFO_B /* cla06f.h */ 0x0000a16f
|
||||
#define MAXWELL_CHANNEL_GPFIFO_A /* cla06f.h */ 0x0000b06f
|
||||
|
||||
#define NV50_DISP /* cl5070.h */ 0x00005070
|
||||
|
|
|
@ -60,6 +60,7 @@ int nv50_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
|||
int g84_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gf100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gk104_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gk110_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gk208_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gk20a_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
int gm200_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);
|
||||
|
|
|
@ -192,6 +192,7 @@ nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device,
|
|||
u32 engine, struct nouveau_channel **pchan)
|
||||
{
|
||||
static const u16 oclasses[] = { MAXWELL_CHANNEL_GPFIFO_A,
|
||||
KEPLER_CHANNEL_GPFIFO_B,
|
||||
KEPLER_CHANNEL_GPFIFO_A,
|
||||
FERMI_CHANNEL_GPFIFO,
|
||||
G82_CHANNEL_GPFIFO,
|
||||
|
|
|
@ -198,6 +198,7 @@ nouveau_accel_init(struct nouveau_drm *drm)
|
|||
break;
|
||||
case FERMI_CHANNEL_GPFIFO:
|
||||
case KEPLER_CHANNEL_GPFIFO_A:
|
||||
case KEPLER_CHANNEL_GPFIFO_B:
|
||||
case MAXWELL_CHANNEL_GPFIFO_A:
|
||||
ret = nvc0_fence_create(drm);
|
||||
break;
|
||||
|
|
|
@ -1827,7 +1827,7 @@ nvf0_chipset = {
|
|||
.ce[2] = gk104_ce_new,
|
||||
.disp = gk110_disp_new,
|
||||
.dma = gf119_dma_new,
|
||||
.fifo = gk104_fifo_new,
|
||||
.fifo = gk110_fifo_new,
|
||||
.gr = gk110_gr_new,
|
||||
.mspdec = gk104_mspdec_new,
|
||||
.msppp = gf100_msppp_new,
|
||||
|
@ -1864,7 +1864,7 @@ nvf1_chipset = {
|
|||
.ce[2] = gk104_ce_new,
|
||||
.disp = gk110_disp_new,
|
||||
.dma = gf119_dma_new,
|
||||
.fifo = gk104_fifo_new,
|
||||
.fifo = gk110_fifo_new,
|
||||
.gr = gk110b_gr_new,
|
||||
.mspdec = gk104_mspdec_new,
|
||||
.msppp = gf100_msppp_new,
|
||||
|
|
|
@ -7,6 +7,7 @@ nvkm-y += nvkm/engine/fifo/nv50.o
|
|||
nvkm-y += nvkm/engine/fifo/g84.o
|
||||
nvkm-y += nvkm/engine/fifo/gf100.o
|
||||
nvkm-y += nvkm/engine/fifo/gk104.o
|
||||
nvkm-y += nvkm/engine/fifo/gk110.o
|
||||
nvkm-y += nvkm/engine/fifo/gk208.o
|
||||
nvkm-y += nvkm/engine/fifo/gk20a.o
|
||||
nvkm-y += nvkm/engine/fifo/gm200.o
|
||||
|
@ -27,4 +28,5 @@ nvkm-y += nvkm/engine/fifo/gpfifonv50.o
|
|||
nvkm-y += nvkm/engine/fifo/gpfifog84.o
|
||||
nvkm-y += nvkm/engine/fifo/gpfifogf100.o
|
||||
nvkm-y += nvkm/engine/fifo/gpfifogk104.o
|
||||
nvkm-y += nvkm/engine/fifo/gpfifogk110.o
|
||||
nvkm-y += nvkm/engine/fifo/gpfifogm200.o
|
||||
|
|
|
@ -25,5 +25,6 @@ int gk104_fifo_gpfifo_new(struct nvkm_fifo *, const struct nvkm_oclass *,
|
|||
void *data, u32 size, struct nvkm_object **);
|
||||
|
||||
extern const struct nvkm_fifo_chan_oclass gk104_fifo_gpfifo_oclass;
|
||||
extern const struct nvkm_fifo_chan_oclass gk110_fifo_gpfifo_oclass;
|
||||
extern const struct nvkm_fifo_chan_oclass gm200_fifo_gpfifo_oclass;
|
||||
#endif
|
||||
|
|
46
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c
Normal file
46
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c
Normal file
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
* Copyright 2016 Red Hat Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Authors: Ben Skeggs
|
||||
*/
|
||||
#include "gk104.h"
|
||||
#include "changk104.h"
|
||||
|
||||
static const struct nvkm_fifo_func
|
||||
gk110_fifo = {
|
||||
.dtor = gk104_fifo_dtor,
|
||||
.oneinit = gk104_fifo_oneinit,
|
||||
.init = gk104_fifo_init,
|
||||
.fini = gk104_fifo_fini,
|
||||
.intr = gk104_fifo_intr,
|
||||
.uevent_init = gk104_fifo_uevent_init,
|
||||
.uevent_fini = gk104_fifo_uevent_fini,
|
||||
.chan = {
|
||||
&gk110_fifo_gpfifo_oclass,
|
||||
NULL
|
||||
},
|
||||
};
|
||||
|
||||
int
|
||||
gk110_fifo_new(struct nvkm_device *device, int index, struct nvkm_fifo **pfifo)
|
||||
{
|
||||
return gk104_fifo_new_(&gk110_fifo, device, index, 4096, pfifo);
|
||||
}
|
34
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk110.c
Normal file
34
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk110.c
Normal file
|
@ -0,0 +1,34 @@
|
|||
/*
|
||||
* Copyright 2016 Red Hat Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Authors: Ben Skeggs
|
||||
*/
|
||||
#include "changk104.h"
|
||||
|
||||
#include <nvif/class.h>
|
||||
|
||||
const struct nvkm_fifo_chan_oclass
|
||||
gk110_fifo_gpfifo_oclass = {
|
||||
.base.oclass = KEPLER_CHANNEL_GPFIFO_B,
|
||||
.base.minver = 0,
|
||||
.base.maxver = 0,
|
||||
.ctor = gk104_fifo_gpfifo_new,
|
||||
};
|
Loading…
Reference in a new issue