power: Clean up and fix set_interactive_override

* Remove debug logs and useless comments
* Consistent return values
* Check if set_interactive_override handled hints and print
  info message if it didn't

Change-Id: Iff9f7327ba71c282e34ff3143c45a3f40f72fc92

Android.mk

@@ -59,10 +59,6 @@ ifeq ($(call is-board-platform-in-list,sdm845), true)
 LOCAL_SRC_FILES += power-845.c
 endif
 
-ifeq ($(call is-board-platform-in-list,sdm710), true)
-LOCAL_SRC_FILES += power-710.c
-endif
-
 ifeq ($(call is-board-platform-in-list,msmnile), true)
 LOCAL_SRC_FILES += power-msmnile.c
 endif

power-660.c

@@ -49,8 +49,6 @@
 #include "power-common.h"
 #include "utils.h"
 
-#define MIN_VAL(X, Y) ((X > Y) ? (Y) : (X))
-
 static int video_encode_hint_sent;
 
 /**
@@ -153,19 +151,16 @@ int power_hint_override(power_hint_t hint, void* data) {
 
 int set_interactive_override(int on) {
     char governor[80];
-    int resource_values[20];
-    int num_resources;
-
-    ALOGI("Got set_interactive hint");
 
     if (get_scaling_governor(governor, sizeof(governor)) == -1) {
         ALOGE("Can't obtain scaling governor.");
-        return HINT_HANDLED;
+        return HINT_NONE;
     }
 
     if (!on) {
-        /* Display off. */
+        /* Display off */
         if (is_interactive_governor(governor)) {
+            if (is_target_SDM630()) {
                 /*
                     1. CPUfreq params
                         - hispeed freq for big - 1113Mhz
@@ -174,11 +169,11 @@ int set_interactive_override(int on) {
                     2. BusDCVS V2 params
                        - Sample_ms of 10ms
                  */
-            if (is_target_SDM630()) {
+                int resource_values[] = {0x41414000, 0x459, 0x41410000, 0x5F,
-                int res[] = {0x41414000, 0x459, 0x41410000, 0x5F, 0x41400000, 0x4, 0x41820000, 0xA};
+                                         0x41400000, 0x4,   0x41820000, 0xA};
-                memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res)));
+                perform_hint_action(DISPLAY_STATE_HINT_ID, resource_values,
-                num_resources = ARRAY_SIZE(res);
+                                    ARRAY_SIZE(resource_values));
-            }
+            } else {
                 /*
                     1. CPUfreq params
                         - hispeed freq for little - 902Mhz
@@ -188,17 +183,14 @@ int set_interactive_override(int on) {
                         - Sample_ms of 10ms
                     3. Sched group upmigrate - 500
                  */
-            else {
+                int resource_values[] = {0x41414100, 0x386,      0x41410100, 0x5F,       0x41400100,
-                int res[] = {0x41414100, 0x386,      0x41410100, 0x5F,       0x41400100,
                                          0x4,        0x41820000, 0xA,        0x40C54000, 0x1F4};
-                memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res)));
+                perform_hint_action(DISPLAY_STATE_HINT_ID, resource_values,
-                num_resources = ARRAY_SIZE(res);
+                                    ARRAY_SIZE(resource_values));
             }
-            perform_hint_action(DISPLAY_STATE_HINT_ID, resource_values, num_resources);
         }
-
     } else {
-        /* Display on. */
+        /* Display on */
         if (is_interactive_governor(governor)) {
             undo_hint_action(DISPLAY_STATE_HINT_ID);
         }

power-710.c

@@ -1,56 +0,0 @@
-/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * *    * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#define LOG_TAG "QTI PowerHAL"
-#include <hardware/hardware.h>
-#include <hardware/power.h>
-#include <log/log.h>
-
-#include "hint-data.h"
-#include "metadata-defs.h"
-#include "performance.h"
-#include "power-common.h"
-#include "utils.h"
-
-int set_interactive_override(int on) {
-    static int set_i_count = 0;
-
-    set_i_count++;
-    ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count);
-
-    return HINT_HANDLED; /* Don't excecute this code path, not in use */
-}

power-845.c

@@ -200,12 +200,3 @@ int power_hint_override(power_hint_t hint, void* data) {
     }
     return ret_val;
 }
-
-int set_interactive_override(int on) {
-    static int set_i_count = 0;
-
-    set_i_count++;
-    ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count);
-
-    return HINT_HANDLED; /* Don't excecute this code path, not in use */
-}

power-8937.c

@@ -161,35 +161,27 @@ int power_hint_override(power_hint_t hint, void* data) {
 
 int set_interactive_override(int on) {
     char governor[80];
-    static int set_i_count = 0;
-
-    ALOGI("Got set_interactive hint");
 
     if (get_scaling_governor(governor, sizeof(governor)) == -1) {
         ALOGE("Can't obtain scaling governor.");
-        return HINT_HANDLED;
+        return HINT_NONE;
     }
 
     if (!on) {
-        /* Display off. */
+        /* Display off */
         if (is_interactive_governor(governor)) {
             int resource_values[] = {INT_OP_CLUSTER0_TIMER_RATE, BIG_LITTLE_TR_MS_50,
                                      INT_OP_CLUSTER1_TIMER_RATE, BIG_LITTLE_TR_MS_50,
                                      INT_OP_NOTIFY_ON_MIGRATE,   0x00};
-
             perform_hint_action(DISPLAY_STATE_HINT_ID, resource_values,
                                 ARRAY_SIZE(resource_values));
-        } /* Perf time rate set for CORE0,CORE4 8952 target*/
+        }
-
     } else {
-        /* Display on. */
+        /* Display on */
         if (is_interactive_governor(governor)) {
             undo_hint_action(DISPLAY_STATE_HINT_ID);
         }
     }
 
-    set_i_count++;
-    ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count);
-
     return HINT_HANDLED;
 }

power-8953.c

@@ -158,17 +158,14 @@ int power_hint_override(power_hint_t hint, void* data) {
 
 int set_interactive_override(int on) {
     char governor[80];
-    static int set_i_count = 0;
-
-    ALOGI("Got set_interactive hint");
 
     if (get_scaling_governor(governor, sizeof(governor)) == -1) {
         ALOGE("Can't obtain scaling governor.");
-        return HINT_HANDLED;
+        return HINT_NONE;
     }
 
     if (!on) {
-        /* Display off. */
+        /* Display off */
         if (is_interactive_governor(governor)) {
             /* timer rate - 40mS*/
             int resource_values[] = {
@@ -177,17 +174,13 @@ int set_interactive_override(int on) {
             };
             perform_hint_action(DISPLAY_STATE_HINT_ID, resource_values,
                                 ARRAY_SIZE(resource_values));
-        } /* Perf time rate set for CORE0,CORE4 8952 target*/
+        }
-
     } else {
-        /* Display on. */
+        /* Display on */
         if (is_interactive_governor(governor)) {
             undo_hint_action(DISPLAY_STATE_HINT_ID);
         }
     }
 
-    set_i_count++;
-    ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count);
-
     return HINT_HANDLED;
 }

power-8996.c

@@ -121,7 +121,3 @@ int power_hint_override(power_hint_t hint, void* data) {
     }
     return ret_val;
 }
-
-int set_interactive_override(int UNUSED(on)) {
-    return HINT_HANDLED;
-}

power-8998.c

@@ -198,7 +198,3 @@ int power_hint_override(power_hint_t hint, void* data) {
     }
     return ret_val;
 }
-
-int set_interactive_override(int on) {
-    return HINT_HANDLED; /* Don't excecute this code path, not in use */
-}

power-common.c

@@ -120,7 +120,7 @@ void set_expensive_rendering(bool enabled) {
 }
 
 int __attribute__((weak)) set_interactive_override(int on) {
-    return HINT_NONE;
+    return HINT_HANDLED;
 }
 
 #ifdef SET_INTERACTIVE_EXT
@@ -152,7 +152,7 @@ void set_interactive(int on) {
 
     if (set_interactive_override(on) == HINT_HANDLED) {
         return;
+    } else {
+        ALOGI("Hint not handled in set_interactive_override");
     }
-
-    ALOGI("Got set_interactive hint");
 }

power-msmnile.c

@@ -45,15 +45,6 @@
 #include "power-common.h"
 #include "utils.h"
 
-int set_interactive_override(int on) {
-    static int set_i_count = 0;
-
-    set_i_count++;
-    ALOGI("Got set_interactive hint on= %d, count= %d\n", on, set_i_count);
-
-    return HINT_HANDLED;
-}
-
 int power_hint_override(power_hint_t hint, void* data) {
     int ret_val = HINT_NONE;
     switch (hint) {