drm/nouveau/gr/gf100-: call FECS HALT_PIPE method before RC reset

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c
index 61759f54406e40a328cea3a05fdaa71a02f68af6..71b824e6da9d695577263d5365cc2aff0aae8278 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c
@@ -135,6 +135,17 @@ nvkm_gr_oneinit(struct nvkm_engine *engine)
        return 0;
 }
 
+static int
+nvkm_gr_reset(struct nvkm_engine *engine)
+{
+       struct nvkm_gr *gr = nvkm_gr(engine);
+
+       if (gr->func->reset)
+               return gr->func->reset(gr);
+
+       return -ENOSYS;
+}
+
 static int
 nvkm_gr_init(struct nvkm_engine *engine)
 {
@@ -166,6 +177,7 @@ nvkm_gr = {
        .oneinit = nvkm_gr_oneinit,
        .init = nvkm_gr_init,
        .fini = nvkm_gr_fini,
+       .reset = nvkm_gr_reset,
        .intr = nvkm_gr_intr,
        .tile = nvkm_gr_tile,
        .chsw_load = nvkm_gr_chsw_load,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 22f360df1b3a247c2151f739f59e0c88e9dd3a76..ffdb5c38afee4152b0b55ffedec6c646c8a3145a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -796,6 +796,20 @@ gf100_gr_fecs_stop_ctxsw(struct nvkm_gr *base)
        return ret;
 }
 
+static int
+gf100_gr_fecs_halt_pipeline(struct gf100_gr *gr)
+{
+       int ret = 0;
+
+       if (gr->firmware) {
+               mutex_lock(&gr->fecs.mutex);
+               ret = gf100_gr_fecs_ctrl_ctxsw(gr, 0x04);
+               mutex_unlock(&gr->fecs.mutex);
+       }
+
+       return ret;
+}
+
 int
 gf100_gr_fecs_wfi_golden_save(struct gf100_gr *gr, u32 inst)
 {
@@ -2247,6 +2261,24 @@ gf100_gr_init_vsc_stream_master(struct gf100_gr *gr)
        nvkm_mask(device, TPC_UNIT(0, 0, 0x05c), 0x00000001, 0x00000001);
 }
 
+static int
+gf100_gr_reset(struct nvkm_gr *base)
+{
+       struct nvkm_subdev *subdev = &base->engine.subdev;
+       struct nvkm_device *device = subdev->device;
+       struct gf100_gr *gr = gf100_gr(base);
+
+       nvkm_mask(device, 0x400500, 0x00000001, 0x00000000);
+
+       WARN_ON(gf100_gr_fecs_halt_pipeline(gr));
+
+       subdev->func->fini(subdev, false);
+       nvkm_mc_disable(device, subdev->type, subdev->inst);
+
+       nvkm_mc_enable(device, subdev->type, subdev->inst);
+       return subdev->func->init(subdev);
+}
+
 int
 gf100_gr_init(struct gf100_gr *gr)
 {
@@ -2392,6 +2424,7 @@ gf100_gr_ = {
        .oneinit = gf100_gr_oneinit,
        .init = gf100_gr_init_,
        .fini = gf100_gr_fini,
+       .reset = gf100_gr_reset,
        .intr = gf100_gr_intr,
        .units = gf100_gr_units,
        .chan_new = gf100_gr_chan_new,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h
index 9b2c66e8be9092e730fbecbdd907c55712f821e6..08d5c96e6458354472763ebeb4a17929f9b942f1 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h
@@ -17,6 +17,7 @@ struct nvkm_gr_func {
        int (*oneinit)(struct nvkm_gr *);
        int (*init)(struct nvkm_gr *);
        int (*fini)(struct nvkm_gr *, bool);
+       int (*reset)(struct nvkm_gr *);
        void (*intr)(struct nvkm_gr *);
        void (*tile)(struct nvkm_gr *, int region, struct nvkm_fb_tile *);
        int (*tlb_flush)(struct nvkm_gr *);