drm/nouveau/disp/gp100: initial support
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
cd0f407c58
commit
f9d5cbb388
|
@ -50,6 +50,7 @@
|
||||||
#define GK110_DISP /* cl5070.h */ 0x00009270
|
#define GK110_DISP /* cl5070.h */ 0x00009270
|
||||||
#define GM107_DISP /* cl5070.h */ 0x00009470
|
#define GM107_DISP /* cl5070.h */ 0x00009470
|
||||||
#define GM200_DISP /* cl5070.h */ 0x00009570
|
#define GM200_DISP /* cl5070.h */ 0x00009570
|
||||||
|
#define GP100_DISP /* cl5070.h */ 0x00009770
|
||||||
|
|
||||||
#define NV31_MPEG 0x00003174
|
#define NV31_MPEG 0x00003174
|
||||||
#define G82_MPEG 0x00008274
|
#define G82_MPEG 0x00008274
|
||||||
|
@ -86,6 +87,7 @@
|
||||||
#define GK110_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000927d
|
#define GK110_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000927d
|
||||||
#define GM107_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000947d
|
#define GM107_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000947d
|
||||||
#define GM200_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000957d
|
#define GM200_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000957d
|
||||||
|
#define GP100_DISP_CORE_CHANNEL_DMA /* cl507d.h */ 0x0000977d
|
||||||
|
|
||||||
#define NV50_DISP_OVERLAY_CHANNEL_DMA /* cl507e.h */ 0x0000507e
|
#define NV50_DISP_OVERLAY_CHANNEL_DMA /* cl507e.h */ 0x0000507e
|
||||||
#define G82_DISP_OVERLAY_CHANNEL_DMA /* cl507e.h */ 0x0000827e
|
#define G82_DISP_OVERLAY_CHANNEL_DMA /* cl507e.h */ 0x0000827e
|
||||||
|
|
|
@ -32,4 +32,5 @@ int gk104_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||||
int gk110_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
int gk110_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||||
int gm107_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
int gm107_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||||
int gm200_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
int gm200_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||||
|
int gp100_disp_new(struct nvkm_device *, int, struct nvkm_disp **);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -495,6 +495,7 @@ nouveau_display_create(struct drm_device *dev)
|
||||||
|
|
||||||
if (nouveau_modeset != 2 && drm->vbios.dcb.entries) {
|
if (nouveau_modeset != 2 && drm->vbios.dcb.entries) {
|
||||||
static const u16 oclass[] = {
|
static const u16 oclass[] = {
|
||||||
|
GP100_DISP,
|
||||||
GM200_DISP,
|
GM200_DISP,
|
||||||
GM107_DISP,
|
GM107_DISP,
|
||||||
GK110_DISP,
|
GK110_DISP,
|
||||||
|
|
|
@ -297,6 +297,7 @@ nv50_core_create(struct nvif_device *device, struct nvif_object *disp,
|
||||||
.pushbuf = 0xb0007d00,
|
.pushbuf = 0xb0007d00,
|
||||||
};
|
};
|
||||||
static const s32 oclass[] = {
|
static const s32 oclass[] = {
|
||||||
|
GP100_DISP_CORE_CHANNEL_DMA,
|
||||||
GM200_DISP_CORE_CHANNEL_DMA,
|
GM200_DISP_CORE_CHANNEL_DMA,
|
||||||
GM107_DISP_CORE_CHANNEL_DMA,
|
GM107_DISP_CORE_CHANNEL_DMA,
|
||||||
GK110_DISP_CORE_CHANNEL_DMA,
|
GK110_DISP_CORE_CHANNEL_DMA,
|
||||||
|
|
|
@ -2169,6 +2169,7 @@ nv130_chipset = {
|
||||||
.timer = gk20a_timer_new,
|
.timer = gk20a_timer_new,
|
||||||
.top = gk104_top_new,
|
.top = gk104_top_new,
|
||||||
.dma = gf119_dma_new,
|
.dma = gf119_dma_new,
|
||||||
|
.disp = gp100_disp_new,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
|
|
@ -10,6 +10,7 @@ nvkm-y += nvkm/engine/disp/gk104.o
|
||||||
nvkm-y += nvkm/engine/disp/gk110.o
|
nvkm-y += nvkm/engine/disp/gk110.o
|
||||||
nvkm-y += nvkm/engine/disp/gm107.o
|
nvkm-y += nvkm/engine/disp/gm107.o
|
||||||
nvkm-y += nvkm/engine/disp/gm200.o
|
nvkm-y += nvkm/engine/disp/gm200.o
|
||||||
|
nvkm-y += nvkm/engine/disp/gp100.o
|
||||||
|
|
||||||
nvkm-y += nvkm/engine/disp/outp.o
|
nvkm-y += nvkm/engine/disp/outp.o
|
||||||
nvkm-y += nvkm/engine/disp/outpdp.o
|
nvkm-y += nvkm/engine/disp/outpdp.o
|
||||||
|
@ -45,6 +46,7 @@ nvkm-y += nvkm/engine/disp/rootgk104.o
|
||||||
nvkm-y += nvkm/engine/disp/rootgk110.o
|
nvkm-y += nvkm/engine/disp/rootgk110.o
|
||||||
nvkm-y += nvkm/engine/disp/rootgm107.o
|
nvkm-y += nvkm/engine/disp/rootgm107.o
|
||||||
nvkm-y += nvkm/engine/disp/rootgm200.o
|
nvkm-y += nvkm/engine/disp/rootgm200.o
|
||||||
|
nvkm-y += nvkm/engine/disp/rootgp100.o
|
||||||
|
|
||||||
nvkm-y += nvkm/engine/disp/channv50.o
|
nvkm-y += nvkm/engine/disp/channv50.o
|
||||||
nvkm-y += nvkm/engine/disp/changf119.o
|
nvkm-y += nvkm/engine/disp/changf119.o
|
||||||
|
@ -70,6 +72,7 @@ nvkm-y += nvkm/engine/disp/coregk104.o
|
||||||
nvkm-y += nvkm/engine/disp/coregk110.o
|
nvkm-y += nvkm/engine/disp/coregk110.o
|
||||||
nvkm-y += nvkm/engine/disp/coregm107.o
|
nvkm-y += nvkm/engine/disp/coregm107.o
|
||||||
nvkm-y += nvkm/engine/disp/coregm200.o
|
nvkm-y += nvkm/engine/disp/coregm200.o
|
||||||
|
nvkm-y += nvkm/engine/disp/coregp100.o
|
||||||
|
|
||||||
nvkm-y += nvkm/engine/disp/ovlynv50.o
|
nvkm-y += nvkm/engine/disp/ovlynv50.o
|
||||||
nvkm-y += nvkm/engine/disp/ovlyg84.o
|
nvkm-y += nvkm/engine/disp/ovlyg84.o
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2015 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 <bskeggs@redhat.com>
|
||||||
|
*/
|
||||||
|
#include "dmacnv50.h"
|
||||||
|
#include "rootnv50.h"
|
||||||
|
|
||||||
|
#include <nvif/class.h>
|
||||||
|
|
||||||
|
const struct nv50_disp_dmac_oclass
|
||||||
|
gp100_disp_core_oclass = {
|
||||||
|
.base.oclass = GP100_DISP_CORE_CHANNEL_DMA,
|
||||||
|
.base.minver = 0,
|
||||||
|
.base.maxver = 0,
|
||||||
|
.ctor = nv50_disp_core_new,
|
||||||
|
.func = &gf119_disp_core_func,
|
||||||
|
.mthd = &gk104_disp_core_chan_mthd,
|
||||||
|
.chid = 0,
|
||||||
|
};
|
|
@ -88,4 +88,6 @@ extern const struct nv50_disp_dmac_oclass gk110_disp_base_oclass;
|
||||||
extern const struct nv50_disp_dmac_oclass gm107_disp_core_oclass;
|
extern const struct nv50_disp_dmac_oclass gm107_disp_core_oclass;
|
||||||
|
|
||||||
extern const struct nv50_disp_dmac_oclass gm200_disp_core_oclass;
|
extern const struct nv50_disp_dmac_oclass gm200_disp_core_oclass;
|
||||||
|
|
||||||
|
extern const struct nv50_disp_dmac_oclass gp100_disp_core_oclass;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -0,0 +1,54 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2015 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 <bskeggs@redhat.com>
|
||||||
|
*/
|
||||||
|
#include "nv50.h"
|
||||||
|
#include "rootnv50.h"
|
||||||
|
|
||||||
|
static const struct nv50_disp_func
|
||||||
|
gp100_disp = {
|
||||||
|
.intr = gf119_disp_intr,
|
||||||
|
.uevent = &gf119_disp_chan_uevent,
|
||||||
|
.super = gf119_disp_intr_supervisor,
|
||||||
|
.root = &gp100_disp_root_oclass,
|
||||||
|
.head.vblank_init = gf119_disp_vblank_init,
|
||||||
|
.head.vblank_fini = gf119_disp_vblank_fini,
|
||||||
|
.head.scanoutpos = gf119_disp_root_scanoutpos,
|
||||||
|
.outp.internal.crt = nv50_dac_output_new,
|
||||||
|
.outp.internal.tmds = nv50_sor_output_new,
|
||||||
|
.outp.internal.lvds = nv50_sor_output_new,
|
||||||
|
.outp.internal.dp = gm200_sor_dp_new,
|
||||||
|
.dac.nr = 3,
|
||||||
|
.dac.power = nv50_dac_power,
|
||||||
|
.dac.sense = nv50_dac_sense,
|
||||||
|
.sor.nr = 4,
|
||||||
|
.sor.power = nv50_sor_power,
|
||||||
|
.sor.hda_eld = gf119_hda_eld,
|
||||||
|
.sor.hdmi = gk104_hdmi_ctrl,
|
||||||
|
.sor.magic = gm200_sor_magic,
|
||||||
|
};
|
||||||
|
|
||||||
|
int
|
||||||
|
gp100_disp_new(struct nvkm_device *device, int index, struct nvkm_disp **pdisp)
|
||||||
|
{
|
||||||
|
return gf119_disp_new_(&gp100_disp, device, index, pdisp);
|
||||||
|
}
|
|
@ -0,0 +1,58 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2015 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 <bskeggs@redhat.com>
|
||||||
|
*/
|
||||||
|
#include "rootnv50.h"
|
||||||
|
#include "dmacnv50.h"
|
||||||
|
|
||||||
|
#include <nvif/class.h>
|
||||||
|
|
||||||
|
static const struct nv50_disp_root_func
|
||||||
|
gp100_disp_root = {
|
||||||
|
.init = gf119_disp_root_init,
|
||||||
|
.fini = gf119_disp_root_fini,
|
||||||
|
.dmac = {
|
||||||
|
&gp100_disp_core_oclass,
|
||||||
|
&gk110_disp_base_oclass,
|
||||||
|
&gk104_disp_ovly_oclass,
|
||||||
|
},
|
||||||
|
.pioc = {
|
||||||
|
&gk104_disp_oimm_oclass,
|
||||||
|
&gk104_disp_curs_oclass,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static int
|
||||||
|
gp100_disp_root_new(struct nvkm_disp *disp, const struct nvkm_oclass *oclass,
|
||||||
|
void *data, u32 size, struct nvkm_object **pobject)
|
||||||
|
{
|
||||||
|
return nv50_disp_root_new_(&gp100_disp_root, disp, oclass,
|
||||||
|
data, size, pobject);
|
||||||
|
}
|
||||||
|
|
||||||
|
const struct nvkm_disp_oclass
|
||||||
|
gp100_disp_root_oclass = {
|
||||||
|
.base.oclass = GP100_DISP,
|
||||||
|
.base.minver = -1,
|
||||||
|
.base.maxver = -1,
|
||||||
|
.ctor = gp100_disp_root_new,
|
||||||
|
};
|
|
@ -40,4 +40,5 @@ extern const struct nvkm_disp_oclass gk104_disp_root_oclass;
|
||||||
extern const struct nvkm_disp_oclass gk110_disp_root_oclass;
|
extern const struct nvkm_disp_oclass gk110_disp_root_oclass;
|
||||||
extern const struct nvkm_disp_oclass gm107_disp_root_oclass;
|
extern const struct nvkm_disp_oclass gm107_disp_root_oclass;
|
||||||
extern const struct nvkm_disp_oclass gm200_disp_root_oclass;
|
extern const struct nvkm_disp_oclass gm200_disp_root_oclass;
|
||||||
|
extern const struct nvkm_disp_oclass gp100_disp_root_oclass;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue