diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2015-10-26 17:41:17 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2015-11-11 18:52:49 +0900 |
| commit | 1cc40561f525d112e83466e8a131bd232067206b (patch) | |
| tree | f38e0876c64caa482998b176698bf1288131d32f | |
| parent | 59f036b921f6409313a0c064e8ecfa1985641493 (diff) | |
| download | nouveau-1cc40561f525d112e83466e8a131bd232067206b.tar.gz | |
add speedo GPU ID information
| -rw-r--r-- | drm/nouveau/include/nvkm/core/tegra.h | 3 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/device/tegra.c | 3 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/volt/gk20a.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drm/nouveau/include/nvkm/core/tegra.h b/drm/nouveau/include/nvkm/core/tegra.h index 450deb2ed..66fca0705 100644 --- a/drm/nouveau/include/nvkm/core/tegra.h +++ b/drm/nouveau/include/nvkm/core/tegra.h @@ -27,7 +27,8 @@ struct nvkm_device_tegra { unsigned long pgshift; } iommu; - int gpu_speedo; + int gpu_speedo_id; + int gpu_speedo_value; }; struct nvkm_device_tegra_func { diff --git a/drm/nouveau/nvkm/engine/device/tegra.c b/drm/nouveau/nvkm/engine/device/tegra.c index 91be7125c..e283be4bf 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); } |