revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / platform / x86 / intel_ips.c

diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index f0b3ad13c273fb73394cc78ca8fb36521a8a4c90..c44a5e8b8b82da9d06706d9cd3a3ec0fcb2b883c 100644 (file)
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -75,7 +75,6 @@
 #include <drm/i915_drm.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
-#include "intel_ips.h"
 
 #define PCI_DEVICE_ID_INTEL_THERMAL_SENSOR 0x3b32
 
@@ -246,7 +245,6 @@
 #define thm_writel(off, val) writel((val), ips->regmap + (off))
 
 static const int IPS_ADJUST_PERIOD = 5000; /* ms */
-static bool late_i915_load = false;
 
 /* For initial average collection */
 static const int IPS_SAMPLE_PERIOD = 200; /* ms */
@@ -341,9 +339,6 @@ struct ips_driver {
        u64 orig_turbo_ratios;
 };
 
-static bool
-ips_gpu_turbo_enabled(struct ips_driver *ips);
-
 /**
  * ips_cpu_busy - is CPU busy?
  * @ips: IPS driver struct
@@ -522,7 +517,7 @@ static void ips_disable_cpu_turbo(struct ips_driver *ips)
  */
 static bool ips_gpu_busy(struct ips_driver *ips)
 {
-       if (!ips_gpu_turbo_enabled(ips))
+       if (!ips->gpu_turbo_enabled)
                return false;
 
        return ips->gpu_busy();
@@ -537,7 +532,7 @@ static bool ips_gpu_busy(struct ips_driver *ips)
  */
 static void ips_gpu_raise(struct ips_driver *ips)
 {
-       if (!ips_gpu_turbo_enabled(ips))
+       if (!ips->gpu_turbo_enabled)
                return;
 
        if (!ips->gpu_raise())
@@ -554,7 +549,7 @@ static void ips_gpu_raise(struct ips_driver *ips)
  */
 static void ips_gpu_lower(struct ips_driver *ips)
 {
-       if (!ips_gpu_turbo_enabled(ips))
+       if (!ips->gpu_turbo_enabled)
                return;
 
        if (!ips->gpu_lower())
@@ -1459,31 +1454,6 @@ out_err:
        return false;
 }
 
-static bool
-ips_gpu_turbo_enabled(struct ips_driver *ips)
-{
-       if (!ips->gpu_busy && late_i915_load) {
-               if (ips_get_i915_syms(ips)) {
-                       dev_info(&ips->dev->dev,
-                                "i915 driver attached, reenabling gpu turbo\n");
-                       ips->gpu_turbo_enabled = !(thm_readl(THM_HTS) & HTS_GTD_DIS);
-               }
-       }
-
-       return ips->gpu_turbo_enabled;
-}
-
-void
-ips_link_to_i915_driver()
-{
-       /* We can't cleanly get at the various ips_driver structs from
-        * this caller (the i915 driver), so just set a flag saying
-        * that it's time to try getting the symbols again.
-        */
-       late_i915_load = true;
-}
-EXPORT_SYMBOL_GPL(ips_link_to_i915_driver);
-
 static DEFINE_PCI_DEVICE_TABLE(ips_id_table) = {
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL,
                     PCI_DEVICE_ID_INTEL_THERMAL_SENSOR), },