Merge "disp: msm: sde: add macro for default fps"

This commit is contained in:
qctecmdr
2020-07-24 06:38:09 -07:00
committed by Gerrit - the friendly Code Review server
4 changed files with 4 additions and 4 deletions

View File

@@ -162,7 +162,7 @@ static void _sde_encoder_pm_qos_add_request(struct drm_encoder *drm_enc)
cpu_dma_latency = sde_kms->catalog->perf.cpu_dma_latency; cpu_dma_latency = sde_kms->catalog->perf.cpu_dma_latency;
cpumask_clear(&sde_enc->valid_cpu_mask); cpumask_clear(&sde_enc->valid_cpu_mask);
if (sde_enc->mode_info.frame_rate > FPS60) if (sde_enc->mode_info.frame_rate > DEFAULT_FPS)
cpu_mask = to_cpumask(&sde_kms->catalog->perf.cpu_mask_perf); cpu_mask = to_cpumask(&sde_kms->catalog->perf.cpu_mask_perf);
if (!cpu_mask && if (!cpu_mask &&
sde_encoder_check_curr_mode(drm_enc, sde_encoder_check_curr_mode(drm_enc,

View File

@@ -210,7 +210,7 @@ static u32 programmable_fetch_get_num_lines(
struct sde_encoder_phys *phys_enc = &vid_enc->base; struct sde_encoder_phys *phys_enc = &vid_enc->base;
u32 needed_prefill_lines, needed_vfp_lines, actual_vfp_lines; u32 needed_prefill_lines, needed_vfp_lines, actual_vfp_lines;
const u32 fixed_prefill_fps = 60; const u32 fixed_prefill_fps = DEFAULT_FPS;
u32 default_prefill_lines = u32 default_prefill_lines =
phys_enc->hw_intf->cap->prog_fetch_lines_worst_case; phys_enc->hw_intf->cap->prog_fetch_lines_worst_case;
u32 start_of_frame_lines = u32 start_of_frame_lines =

View File

@@ -105,6 +105,8 @@
#define SDE_NAME_SIZE 12 #define SDE_NAME_SIZE 12
#define DEFAULT_FPS 60
/* timeout in frames waiting for frame done */ /* timeout in frames waiting for frame done */
#define SDE_FRAME_DONE_TIMEOUT 60 #define SDE_FRAME_DONE_TIMEOUT 60

View File

@@ -69,8 +69,6 @@ enum {
#define SDE_QSEED_DEFAULT_DYN_EXP 0x0 #define SDE_QSEED_DEFAULT_DYN_EXP 0x0
#define DEFAULT_REFRESH_RATE 60
/** /**
* enum sde_plane_qos - Different qos configurations for each pipe * enum sde_plane_qos - Different qos configurations for each pipe
* *