drm/nouveau/gr/gf100-: move fecs discover_pm_image_size 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 b5eecc6707b453721813d72725998d4ce262929b..28dae3bf5f0f9a6ed3e056135b9425c8c920b0ff 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,22 @@ gf100_gr_pack_mmio[] = {
  * PGRAPH engine/subdev functions
  ******************************************************************************/
 
+static int
+gf100_gr_fecs_discover_pm_image_size(struct gf100_gr *gr, u32 *psize)
+{
+       struct nvkm_device *device = gr->base.engine.subdev.device;
+
+       nvkm_wr32(device, 0x409840, 0xffffffff);
+       nvkm_wr32(device, 0x409500, 0x00000000);
+       nvkm_wr32(device, 0x409504, 0x00000025);
+       nvkm_msec(device, 2000,
+               if ((*psize = nvkm_rd32(device, 0x409800)))
+                       return 0;
+       );
+
+       return -ETIMEDOUT;
+}
+
 static int
 gf100_gr_fecs_discover_zcull_image_size(struct gf100_gr *gr, u32 *psize)
 {
@@ -1579,14 +1595,10 @@ gf100_gr_init_ctxctl_ext(struct gf100_gr *gr)
        if (ret)
                return ret;
 
-       nvkm_wr32(device, 0x409840, 0xffffffff);
-       nvkm_wr32(device, 0x409500, 0x00000000);
-       nvkm_wr32(device, 0x409504, 0x00000025);
-       if (nvkm_msec(device, 2000,
-               if (nvkm_rd32(device, 0x409800))
-                       break;
-       ) < 0)
-               return -EBUSY;
+       /* Determine how much memory is required to store PerfMon image. */
+       ret = gf100_gr_fecs_discover_pm_image_size(gr, &gr->size_pm);
+       if (ret)
+               return ret;
 
        if (device->chipset >= 0xe0) {
                nvkm_wr32(device, 0x409800, 0x00000000);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
index 81bdf658b5cddd2df71adffaf9a69da146d4a13e..8fda190736149188da102861af270787c2700f86 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
@@ -129,6 +129,7 @@ struct gf100_gr {
        u32  size;
        u32 *data;
        u32 size_zcull;
+       u32 size_pm;
 };
 
 int gf100_gr_ctor(const struct gf100_gr_func *, struct nvkm_device *,