These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / bios / therm.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c
index 249ff6d..a54cfec 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c
@@ -25,8 +25,6 @@
 #include <subdev/bios/bit.h>
 #include <subdev/bios/therm.h>
 
-#include <core/device.h>
-
 static u16
 therm_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *len, u8 *cnt)
 {
@@ -35,24 +33,24 @@ therm_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *len, u8 *cnt)
 
        if (!bit_entry(bios, 'P', &bit_P)) {
                if (bit_P.version == 1)
-                       therm = nv_ro16(bios, bit_P.offset + 12);
+                       therm = nvbios_rd16(bios, bit_P.offset + 12);
                else if (bit_P.version == 2)
-                       therm = nv_ro16(bios, bit_P.offset + 16);
+                       therm = nvbios_rd16(bios, bit_P.offset + 16);
                else
-                       nv_error(bios,
-                               "unknown offset for thermal in BIT P %d\n",
-                               bit_P.version);
+                       nvkm_error(&bios->subdev,
+                                  "unknown offset for thermal in BIT P %d\n",
+                                  bit_P.version);
        }
 
        /* exit now if we haven't found the thermal table */
        if (!therm)
                return 0x0000;
 
-       *ver = nv_ro08(bios, therm + 0);
-       *hdr = nv_ro08(bios, therm + 1);
-       *len = nv_ro08(bios, therm + 2);
-       *cnt = nv_ro08(bios, therm + 3);
-       return therm + nv_ro08(bios, therm + 1);
+       *ver = nvbios_rd08(bios, therm + 0);
+       *hdr = nvbios_rd08(bios, therm + 1);
+       *len = nvbios_rd08(bios, therm + 2);
+       *cnt = nvbios_rd08(bios, therm + 3);
+       return therm + nvbios_rd08(bios, therm + 1);
 }
 
 static u16
@@ -83,9 +81,9 @@ nvbios_therm_sensor_parse(struct nvkm_bios *bios,
        sensor_section = -1;
        i = 0;
        while ((entry = nvbios_therm_entry(bios, i++, &ver, &len))) {
-               s16 value = nv_ro16(bios, entry + 1);
+               s16 value = nvbios_rd16(bios, entry + 1);
 
-               switch (nv_ro08(bios, entry + 0)) {
+               switch (nvbios_rd08(bios, entry + 0)) {
                case 0x0:
                        thrs_section = value;
                        if (value > 0)
@@ -94,7 +92,7 @@ nvbios_therm_sensor_parse(struct nvkm_bios *bios,
                case 0x01:
                        sensor_section++;
                        if (sensor_section == 0) {
-                               offset = ((s8) nv_ro08(bios, entry + 2)) / 2;
+                               offset = ((s8) nvbios_rd08(bios, entry + 2)) / 2;
                                sensor->offset_constant = offset;
                        }
                        break;
@@ -165,9 +163,9 @@ nvbios_therm_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan)
        fan->nr_fan_trip = 0;
        fan->fan_mode = NVBIOS_THERM_FAN_OTHER;
        while ((entry = nvbios_therm_entry(bios, i++, &ver, &len))) {
-               s16 value = nv_ro16(bios, entry + 1);
+               s16 value = nvbios_rd16(bios, entry + 1);
 
-               switch (nv_ro08(bios, entry + 0)) {
+               switch (nvbios_rd08(bios, entry + 0)) {
                case 0x22:
                        fan->min_duty = value & 0xff;
                        fan->max_duty = (value & 0xff00) >> 8;
@@ -198,14 +196,14 @@ nvbios_therm_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan)
                case 0x46:
                        if (fan->fan_mode > NVBIOS_THERM_FAN_LINEAR)
                                fan->fan_mode = NVBIOS_THERM_FAN_LINEAR;
-                       fan->linear_min_temp = nv_ro08(bios, entry + 1);
-                       fan->linear_max_temp = nv_ro08(bios, entry + 2);
+                       fan->linear_min_temp = nvbios_rd08(bios, entry + 1);
+                       fan->linear_max_temp = nvbios_rd08(bios, entry + 2);
                        break;
                }
        }
 
        /* starting from fermi, fan management is always linear */
-       if (nv_device(bios)->card_type >= NV_C0 &&
+       if (bios->subdev.device->card_type >= NV_C0 &&
                fan->fan_mode == NVBIOS_THERM_FAN_OTHER) {
                fan->fan_mode = NVBIOS_THERM_FAN_LINEAR;
        }