These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / engine / disp / gt215.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
index 55f0d3a..9402628 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c
@@ -22,83 +22,36 @@
  * Authors: Ben Skeggs
  */
 #include "nv50.h"
-
-#include <nvif/class.h>
-
-/*******************************************************************************
- * Base display object
- ******************************************************************************/
-
-static struct nvkm_oclass
-gt215_disp_sclass[] = {
-       { GT214_DISP_CORE_CHANNEL_DMA, &nv50_disp_core_ofuncs.base },
-       { GT214_DISP_BASE_CHANNEL_DMA, &nv50_disp_base_ofuncs.base },
-       { GT214_DISP_OVERLAY_CHANNEL_DMA, &nv50_disp_ovly_ofuncs.base },
-       { GT214_DISP_OVERLAY, &nv50_disp_oimm_ofuncs.base },
-       { GT214_DISP_CURSOR, &nv50_disp_curs_ofuncs.base },
-       {}
-};
-
-static struct nvkm_oclass
-gt215_disp_main_oclass[] = {
-       { GT214_DISP, &nv50_disp_main_ofuncs },
-       {}
+#include "rootnv50.h"
+
+static const struct nv50_disp_func
+gt215_disp = {
+       .intr = nv50_disp_intr,
+       .uevent = &nv50_disp_chan_uevent,
+       .super = nv50_disp_intr_supervisor,
+       .root = &gt215_disp_root_oclass,
+       .head.vblank_init = nv50_disp_vblank_init,
+       .head.vblank_fini = nv50_disp_vblank_fini,
+       .head.scanoutpos = nv50_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 = g94_sor_dp_new,
+       .outp.external.tmds = nv50_pior_output_new,
+       .outp.external.dp = nv50_pior_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 = gt215_hda_eld,
+       .sor.hdmi = gt215_hdmi_ctrl,
+       .pior.nr = 3,
+       .pior.power = nv50_pior_power,
 };
 
-/*******************************************************************************
- * Display engine implementation
- ******************************************************************************/
-
-static int
-gt215_disp_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-               struct nvkm_oclass *oclass, void *data, u32 size,
-               struct nvkm_object **pobject)
+int
+gt215_disp_new(struct nvkm_device *device, int index, struct nvkm_disp **pdisp)
 {
-       struct nv50_disp_priv *priv;
-       int ret;
-
-       ret = nvkm_disp_create(parent, engine, oclass, 2, "PDISP",
-                              "display", &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       ret = nvkm_event_init(&nv50_disp_chan_uevent, 1, 9, &priv->uevent);
-       if (ret)
-               return ret;
-
-       nv_engine(priv)->sclass = gt215_disp_main_oclass;
-       nv_engine(priv)->cclass = &nv50_disp_cclass;
-       nv_subdev(priv)->intr = nv50_disp_intr;
-       INIT_WORK(&priv->supervisor, nv50_disp_intr_supervisor);
-       priv->sclass = gt215_disp_sclass;
-       priv->head.nr = 2;
-       priv->dac.nr = 3;
-       priv->sor.nr = 4;
-       priv->pior.nr = 3;
-       priv->dac.power = nv50_dac_power;
-       priv->dac.sense = nv50_dac_sense;
-       priv->sor.power = nv50_sor_power;
-       priv->sor.hda_eld = gt215_hda_eld;
-       priv->sor.hdmi = gt215_hdmi_ctrl;
-       priv->pior.power = nv50_pior_power;
-       return 0;
+       return nv50_disp_new_(&gt215_disp, device, index, 2, pdisp);
 }
-
-struct nvkm_oclass *
-gt215_disp_oclass = &(struct nv50_disp_impl) {
-       .base.base.handle = NV_ENGINE(DISP, 0x85),
-       .base.base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = gt215_disp_ctor,
-               .dtor = _nvkm_disp_dtor,
-               .init = _nvkm_disp_init,
-               .fini = _nvkm_disp_fini,
-       },
-       .base.vblank = &nv50_disp_vblank_func,
-       .base.outp =  g94_disp_outp_sclass,
-       .mthd.core = &g94_disp_core_mthd_chan,
-       .mthd.base = &g84_disp_base_mthd_chan,
-       .mthd.ovly = &g84_disp_ovly_mthd_chan,
-       .mthd.prev = 0x000004,
-       .head.scanoutpos = nv50_disp_main_scanoutpos,
-}.base.base;