drm/nouveau/gr/gf100-: move fecs set_watchdog_timeout method into a function

Makes the code somewhat less magic.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index 70d3d41e616c50cf129483fd95411bc4d3efb52e..05cdfb7d1f85a2ad9ecba086935dccc601797bbd 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -715,6 +715,16 @@ gf100_gr_pack_mmio[] = {
  * PGRAPH engine/subdev functions
  ******************************************************************************/
 
+static void
+gf100_gr_fecs_set_watchdog_timeout(struct gf100_gr *gr, u32 timeout)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+
+       nvkm_wr32(device, 0x409840, 0xffffffff);
+       nvkm_wr32(device, 0x409500, timeout);
+       nvkm_wr32(device, 0x409504, 0x00000021);
+}
+
 static bool
 gf100_gr_chsw_load(struct nvkm_gr *base)
 {
@@ -1524,9 +1534,7 @@ gf100_gr_init_ctxctl_ext(struct gf100_gr *gr)
        ) < 0)
                return -EBUSY;
 
-       nvkm_wr32(device, 0x409840, 0xffffffff);
-       nvkm_wr32(device, 0x409500, 0x7fffffff);
-       nvkm_wr32(device, 0x409504, 0x00000021);
+       gf100_gr_fecs_set_watchdog_timeout(gr, 0x7fffffff);
 
        nvkm_wr32(device, 0x409840, 0xffffffff);
        nvkm_wr32(device, 0x409500, 0x00000000);