1 files changed, 22 insertions, 7 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c
index 5a46446dd5a..0f5a3016055 100644
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c
@@ -55,6 +55,10 @@ nouveau_temp_vbios_parse(struct drm_device *dev, u8 *temp)
         temps->down_clock = 100;
         temps->fan_boost = 90;
 
+        /* Set the default range for the pwm fan */
+        pm->fan.min_duty = 30;
+        pm->fan.max_duty = 100;
+
         /* Set the known default values to setup the temperature sensor */
         if (dev_priv->card_type >= NV_40) {
                 switch (dev_priv->chipset) {
@@ -156,11 +160,26 @@ nouveau_temp_vbios_parse(struct drm_device *dev, u8 *temp)
                 case 0x13:
                         sensor->slope_div = value;
                         break;
+                case 0x22:
+                        pm->fan.min_duty = value & 0xff;
+                        pm->fan.max_duty = (value & 0xff00) >> 8;
+                        break;
+                case 0x26:
+                        pm->fan.pwm_freq = value;
+                        break;
                 }
                 temp += recordlen;
         }
 
         nouveau_temp_safety_checks(dev);
+
+        /* check the fan min/max settings */
+        if (pm->fan.min_duty < 10)
+                pm->fan.min_duty = 10;
+        if (pm->fan.max_duty > 100)
+                pm->fan.max_duty = 100;
+        if (pm->fan.max_duty < pm->fan.min_duty)
+                pm->fan.max_duty = pm->fan.min_duty;
 }
 
 static int
@@ -267,8 +286,6 @@ probe_monitoring_device(struct nouveau_i2c_chan *i2c,
 static void
 nouveau_temp_probe_i2c(struct drm_device *dev)
 {
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct dcb_table *dcb = &dev_priv->vbios.dcb;
         struct i2c_board_info info[] = {
                 { I2C_BOARD_INFO("w83l785ts", 0x2d) },
                 { I2C_BOARD_INFO("w83781d", 0x2d) },
@@ -277,11 +294,9 @@ nouveau_temp_probe_i2c(struct drm_device *dev)
                 { I2C_BOARD_INFO("lm99", 0x4c) },
                 { }
         };
-        int idx = (dcb->version >= 0x40 ?
-                   dcb->i2c_default_indices & 0xf : 2);
 
         nouveau_i2c_identify(dev, "monitoring device", info,
-                             probe_monitoring_device, idx);
+                             probe_monitoring_device, NV_I2C_DEFAULT(0));
 }
 
 void
@@ -297,9 +312,9 @@ nouveau_temp_init(struct drm_device *dev)
                         return;
 
                 if (P.version == 1)
-                        temp = ROMPTR(bios, P.data[12]);
+                        temp = ROMPTR(dev, P.data[12]);
                 else if (P.version == 2)
-                        temp = ROMPTR(bios, P.data[16]);
+                        temp = ROMPTR(dev, P.data[16]);
                 else
                         NV_WARN(dev, "unknown temp for BIT P %d\n", P.version);