diff options
| author | Cesar <cesar.maximo@gmail.com> | 2017-10-24 00:28:30 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-11-20 18:13:46 +0100 |
| commit | 17193fce2304a2032bbafa4817bac7d675c6c164 (patch) | |
| tree | c14d3c42fa5fff4f4385c356cdf87962b84b5a6a | |
| parent | 431fc4f26f963e827fd1e3693b41e2dc853e9fbc (diff) | |
| download | android_kernel_m2note-17193fce2304a2032bbafa4817bac7d675c6c164.tar.gz | |
SMI: multimedia: Update from Sony
this was already on MM -Lenovo-
Signed-off-by: Moyster <oysterized@gmail.com>
| -rw-r--r-- | drivers/misc/mediatek/mach/mt6735/include/mach/mt_smi.h | 5 | ||||
| -rw-r--r-- | drivers/misc/mediatek/smi/mmdvfs_mgr.c | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/drivers/misc/mediatek/mach/mt6735/include/mach/mt_smi.h b/drivers/misc/mediatek/mach/mt6735/include/mach/mt_smi.h index 9ab941167..936ec6300 100644 --- a/drivers/misc/mediatek/mach/mt6735/include/mach/mt_smi.h +++ b/drivers/misc/mediatek/mach/mt6735/include/mach/mt_smi.h @@ -45,6 +45,8 @@ typedef enum { SMI_BWC_SCEN_FORCE_MMDVFS, SMI_BWC_SCEN_HDMI, SMI_BWC_SCEN_HDMI4K, + SMI_BWC_SCEN_VPMJC, + SMI_BWC_SCEN_N3D, SMI_BWC_SCEN_CNT } MTK_SMI_BWC_SCEN; @@ -67,8 +69,7 @@ typedef struct { typedef struct { unsigned int *hwc_max_pixel; /* : exit this scenario , 1 : enter this scenario */ } MTK_SMI_BWC_STATE; - -typedef struct { + typedef struct { unsigned int address; unsigned int value; } MTK_SMI_BWC_REGISTER_SET; diff --git a/drivers/misc/mediatek/smi/mmdvfs_mgr.c b/drivers/misc/mediatek/smi/mmdvfs_mgr.c index b428c1ba9..730c59a38 100644 --- a/drivers/misc/mediatek/smi/mmdvfs_mgr.c +++ b/drivers/misc/mediatek/smi/mmdvfs_mgr.c @@ -18,8 +18,6 @@ #include <linux/uaccess.h> #include <linux/aee.h> -#include <mach/mt_smi.h> - #include <linux/timer.h> #include <linux/jiffies.h> #include <linux/workqueue.h> @@ -30,7 +28,7 @@ #include <mach/mt_vcore_dvfs.h> #include <mach/mt_freqhopping_drv.h> - +#include <mach/mt_smi.h> #include "mmdvfs_mgr.h" #undef pr_fmt @@ -192,16 +190,18 @@ static void mmdvfs_update_cmd(MTK_MMDVFS_CMD *cmd) if (cmd->sensor_fps) g_mmdvfs_cmd.sensor_fps = cmd->sensor_fps; - MMDVFSMSG("update cm %d %d\n", cmd->camera_mode, cmd->sensor_size); + /* MMDVFSMSG("update cm %d %d\n", cmd->camera_mode, cmd->sensor_size); */ g_mmdvfs_cmd.camera_mode = cmd->camera_mode; } static void mmdvfs_dump_info(void) { +/* MMDVFSMSG("CMD %d %d %d\n", g_mmdvfs_cmd.sensor_size, g_mmdvfs_cmd.sensor_fps, g_mmdvfs_cmd.camera_mode); MMDVFSMSG("INFO VR %d %d\n", g_mmdvfs_info->video_record_size[0], g_mmdvfs_info->video_record_size[1]); +*/ } /* delay 4 seconds to go LPM to workaround camera ZSD + PIP issue */ @@ -312,7 +312,7 @@ void mmdvfs_handle_cmd(MTK_MMDVFS_CMD *cmd) return; #endif - MMDVFSMSG("MMDVFS cmd %u %d\n", cmd->type, cmd->scen); + /* MMDVFSMSG("MMDVFS cmd %u %d\n", cmd->type, cmd->scen); */ switch (cmd->type) { case MTK_MMDVFS_CMD_TYPE_MMSYS_SET: @@ -457,12 +457,12 @@ void mmdvfs_notify_scenario_concurrency(unsigned int u4Concurrency) if (u4Concurrency & ((1 << SMI_BWC_SCEN_VP) | (1 << SMI_BWC_SCEN_VR) | (1 << SMI_BWC_SCEN_VR_SLOW))) { #if MMDVFS_ENABLE_FLIPER_CONTROL - MMDVFSMSG("fliper high\n"); + /* MMDVFSMSG("fliper high\n"); */ fliper_set_bw(BW_THRESHOLD_HIGH); #endif } else { #if MMDVFS_ENABLE_FLIPER_CONTROL - MMDVFSMSG("fliper normal\n"); + /* MMDVFSMSG("fliper normal\n"); */ fliper_restore_bw(); #endif } |