summaryrefslogtreecommitdiff
path: root/drm/nouveau/nvkm
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2015-10-26 17:41:17 +0900
committerAlexandre Courbot <acourbot@nvidia.com>2016-01-15 14:32:54 +0900
commitdfb766410b1356b623b8d497a48f774ef616346a (patch)
treedf96695ffac3c8d875ae2a133258826c304920a3 /drm/nouveau/nvkm
parent241602675b2c353a89172aaaff4cd991e66236be (diff)
downloadnouveau-dfb766410b1356b623b8d497a48f774ef616346a.tar.gz
add speedo GPU ID information
Diffstat (limited to 'drm/nouveau/nvkm')
-rw-r--r--drm/nouveau/nvkm/engine/device/tegra.c3
-rw-r--r--drm/nouveau/nvkm/subdev/volt/gk20a.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/drm/nouveau/nvkm/engine/device/tegra.c b/drm/nouveau/nvkm/engine/device/tegra.c
index 6e6c8d3c1..1aca2666b 100644
--- a/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drm/nouveau/nvkm/engine/device/tegra.c
@@ -295,7 +295,8 @@ nvkm_device_tegra_new(const struct nvkm_device_tegra_func *func,
if (ret)
return ret;
- tdev->gpu_speedo = tegra_sku_info.gpu_speedo_value;
+ tdev->gpu_speedo_id = tegra_sku_info.gpu_speedo_id;
+ tdev->gpu_speedo_value = tegra_sku_info.gpu_speedo_value;
ret = nvkm_device_ctor(&nvkm_device_tegra_func, NULL, &pdev->dev,
NVKM_DEVICE_TEGRA, pdev->id, NULL,
cfg, dbg, detect, mmio, subdev_mask,
diff --git a/drm/nouveau/nvkm/subdev/volt/gk20a.c b/drm/nouveau/nvkm/subdev/volt/gk20a.c
index fd56c6476..788241356 100644
--- a/drm/nouveau/nvkm/subdev/volt/gk20a.c
+++ b/drm/nouveau/nvkm/subdev/volt/gk20a.c
@@ -179,7 +179,7 @@ gk20a_volt_new(struct nvkm_device *device, int index, struct nvkm_volt **pvolt)
volt->base.vid[i].vid = i;
volt->base.vid[i].uv =
gk20a_volt_calc_voltage(&gk20a_cvb_coef[i],
- tdev->gpu_speedo);
+ tdev->gpu_speedo_value);
nvkm_debug(&volt->base.subdev, "%2d: vid=%d, uv=%d\n", i,
volt->base.vid[i].vid, volt->base.vid[i].uv);
}