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

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / ltc / gk104.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c
index d53959b..b4f6e00 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c
@@ -23,37 +23,34 @@
  */
 #include "priv.h"
 
-static int
-gk104_ltc_init(struct nvkm_object *object)
+static void
+gk104_ltc_init(struct nvkm_ltc *ltc)
 {
-       struct nvkm_ltc_priv *priv = (void *)object;
-       u32 lpg128 = !(nv_rd32(priv, 0x100c80) & 0x00000001);
-       int ret;
+       struct nvkm_device *device = ltc->subdev.device;
+       u32 lpg128 = !(nvkm_rd32(device, 0x100c80) & 0x00000001);
 
-       ret = nvkm_ltc_init(priv);
-       if (ret)
-               return ret;
-
-       nv_wr32(priv, 0x17e8d8, priv->ltc_nr);
-       nv_wr32(priv, 0x17e000, priv->ltc_nr);
-       nv_wr32(priv, 0x17e8d4, priv->tag_base);
-       nv_mask(priv, 0x17e8c0, 0x00000002, lpg128 ? 0x00000002 : 0x00000000);
-       return 0;
+       nvkm_wr32(device, 0x17e8d8, ltc->ltc_nr);
+       nvkm_wr32(device, 0x17e000, ltc->ltc_nr);
+       nvkm_wr32(device, 0x17e8d4, ltc->tag_base);
+       nvkm_mask(device, 0x17e8c0, 0x00000002, lpg128 ? 0x00000002 : 0x00000000);
 }
 
-struct nvkm_oclass *
-gk104_ltc_oclass = &(struct nvkm_ltc_impl) {
-       .base.handle = NV_SUBDEV(LTC, 0xe4),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = gf100_ltc_ctor,
-               .dtor = gf100_ltc_dtor,
-               .init = gk104_ltc_init,
-               .fini = _nvkm_ltc_fini,
-       },
+static const struct nvkm_ltc_func
+gk104_ltc = {
+       .oneinit = gf100_ltc_oneinit,
+       .init = gk104_ltc_init,
        .intr = gf100_ltc_intr,
        .cbc_clear = gf100_ltc_cbc_clear,
        .cbc_wait = gf100_ltc_cbc_wait,
        .zbc = 16,
        .zbc_clear_color = gf100_ltc_zbc_clear_color,
        .zbc_clear_depth = gf100_ltc_zbc_clear_depth,
-}.base;
+       .invalidate = gf100_ltc_invalidate,
+       .flush = gf100_ltc_flush,
+};
+
+int
+gk104_ltc_new(struct nvkm_device *device, int index, struct nvkm_ltc **pltc)
+{
+       return nvkm_ltc_new_(&gk104_ltc, device, index, pltc);
+}