samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: enable uidle on pineapple target"

Browse Source
This commit is contained in:
qctecmdr
2022-10-24 12:37:22 -07:00
committed by Gerrit - the friendly Code Review server
parent f320be5d5e 6ae388a1c1
commit 38c0d4cdba
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
msm/sde/sde_encoder.c
View File

@@ -236,6 +236,9 @@ static void _sde_encoder_control_fal10_veto(struct drm_encoder *drm_enc, bool ve
if (!sde_kms || !sde_kms->hw_uidle || !sde_kms->hw_uidle->ops.uidle_fal10_override) if (!sde_kms || !sde_kms->hw_uidle || !sde_kms->hw_uidle->ops.uidle_fal10_override)
return; return;
if (test_bit(SDE_UIDLE_WB_FAL_STATUS, &sde_kms->catalog->uidle_cfg.features))
return;
/* /*
* clone mode is the only scenario where we want to enable software override * clone mode is the only scenario where we want to enable software override
* of fal10 veto. * of fal10 veto.

12
msm/sde/sde_hw_catalog.c
View File

@@ -157,6 +157,7 @@
#define SDE_UIDLE_FAL1_MAX_THRESHOLD 15 #define SDE_UIDLE_FAL1_MAX_THRESHOLD 15
#define SDE_UIDLE_FAL1_MAX_THRESHOLD_EXT_REV_102 255 #define SDE_UIDLE_FAL1_MAX_THRESHOLD_EXT_REV_102 255
#define SDE_UIDLE_FAL1_MAX_THRESHOLD_EXT_REV_103 255 #define SDE_UIDLE_FAL1_MAX_THRESHOLD_EXT_REV_103 255
#define SDE_UIDLE_FAL1_MAX_THRESHOLD_EXT_REV_104 255
#define SDE_UIDLE_FAL10_THRESHOLD_60 12 #define SDE_UIDLE_FAL10_THRESHOLD_60 12
#define SDE_UIDLE_FAL10_THRESHOLD_90 13 #define SDE_UIDLE_FAL10_THRESHOLD_90 13
#define SDE_UIDLE_MAX_DWNSCALE 1500 #define SDE_UIDLE_MAX_DWNSCALE 1500
@@ -2035,7 +2036,8 @@ static int sde_ctl_parse_dt(struct device_node *np,
set_bit(SDE_CTL_PINGPONG_SPLIT, &ctl->features); set_bit(SDE_CTL_PINGPONG_SPLIT, &ctl->features);
if (IS_SDE_CTL_REV_100(sde_cfg->ctl_rev)) if (IS_SDE_CTL_REV_100(sde_cfg->ctl_rev))
set_bit(SDE_CTL_ACTIVE_CFG, &ctl->features); set_bit(SDE_CTL_ACTIVE_CFG, &ctl->features);
if (SDE_UIDLE_MAJOR(sde_cfg->uidle_cfg.uidle_rev)) if (SDE_UIDLE_MAJOR(sde_cfg->uidle_cfg.uidle_rev) &&
sde_cfg->uidle_cfg.uidle_rev < SDE_UIDLE_VERSION_1_0_4)
set_bit(SDE_CTL_UIDLE, &ctl->features); set_bit(SDE_CTL_UIDLE, &ctl->features);
if (SDE_HW_MAJOR(sde_cfg->hw_rev) >= SDE_HW_MAJOR(SDE_HW_VER_700)) if (SDE_HW_MAJOR(sde_cfg->hw_rev) >= SDE_HW_MAJOR(SDE_HW_VER_700))
set_bit(SDE_CTL_UNIFIED_DSPP_FLUSH, &ctl->features); set_bit(SDE_CTL_UNIFIED_DSPP_FLUSH, &ctl->features);
@@ -4860,6 +4862,13 @@ static void _sde_hw_setup_uidle(struct sde_uidle_cfg *uidle_cfg)
uidle_cfg->max_fal1_fps = SDE_UIDLE_MAX_FPS_240; uidle_cfg->max_fal1_fps = SDE_UIDLE_MAX_FPS_240;
uidle_cfg->fal1_max_threshold = SDE_UIDLE_FAL1_MAX_THRESHOLD_EXT_REV_103; uidle_cfg->fal1_max_threshold = SDE_UIDLE_FAL1_MAX_THRESHOLD_EXT_REV_103;
uidle_cfg->fal10_threshold = SDE_UIDLE_FAL10_THRESHOLD_60; uidle_cfg->fal10_threshold = SDE_UIDLE_FAL10_THRESHOLD_60;
} else if (IS_SDE_UIDLE_REV_104(uidle_cfg->uidle_rev)) {
set_bit(SDE_UIDLE_QACTIVE_OVERRIDE, &uidle_cfg->features);
uidle_cfg->max_fps = SDE_UIDLE_MAX_FPS_240;
uidle_cfg->max_fal1_fps = SDE_UIDLE_MAX_FPS_240;
uidle_cfg->fal1_max_threshold = SDE_UIDLE_FAL1_MAX_THRESHOLD_EXT_REV_104;
uidle_cfg->fal10_threshold = SDE_UIDLE_FAL10_THRESHOLD_60;
set_bit(SDE_UIDLE_WB_FAL_STATUS, &uidle_cfg->features);
} }
} }
@@ -5262,6 +5271,7 @@ static int _sde_hardware_pre_caps(struct sde_mdss_cfg *sde_cfg, uint32_t hw_rev)
sde_cfg->ts_prefill_rev = 2; sde_cfg->ts_prefill_rev = 2;
sde_cfg->ctl_rev = SDE_CTL_CFG_VERSION_1_0_0; sde_cfg->ctl_rev = SDE_CTL_CFG_VERSION_1_0_0;
sde_cfg->true_inline_rot_rev = SDE_INLINE_ROT_VERSION_2_0_1; sde_cfg->true_inline_rot_rev = SDE_INLINE_ROT_VERSION_2_0_1;
sde_cfg->uidle_cfg.uidle_rev = SDE_UIDLE_VERSION_1_0_4;
sde_cfg->sid_rev = SDE_SID_VERSION_2_0_0; sde_cfg->sid_rev = SDE_SID_VERSION_2_0_0;
sde_cfg->mdss_hw_block_size = 0x158; sde_cfg->mdss_hw_block_size = 0x158;
sde_cfg->demura_supported[SSPP_DMA1][0] = 0; sde_cfg->demura_supported[SSPP_DMA1][0] = 0;

5
msm/sde/sde_hw_catalog.h
View File

@@ -158,6 +158,7 @@
#define SDE_UIDLE_VERSION_1_0_1 0x101 #define SDE_UIDLE_VERSION_1_0_1 0x101
#define SDE_UIDLE_VERSION_1_0_2 0x102 #define SDE_UIDLE_VERSION_1_0_2 0x102
#define SDE_UIDLE_VERSION_1_0_3 0x103 #define SDE_UIDLE_VERSION_1_0_3 0x103
#define SDE_UIDLE_VERSION_1_0_4 0x104
#define IS_SDE_UIDLE_REV_100(rev) \ #define IS_SDE_UIDLE_REV_100(rev) \
((rev) == SDE_UIDLE_VERSION_1_0_0) ((rev) == SDE_UIDLE_VERSION_1_0_0)
@@ -167,6 +168,8 @@
((rev) == SDE_UIDLE_VERSION_1_0_2) ((rev) == SDE_UIDLE_VERSION_1_0_2)
#define IS_SDE_UIDLE_REV_103(rev) \ #define IS_SDE_UIDLE_REV_103(rev) \
((rev) == SDE_UIDLE_VERSION_1_0_3) ((rev) == SDE_UIDLE_VERSION_1_0_3)
#define IS_SDE_UIDLE_REV_104(rev) \
((rev) == SDE_UIDLE_VERSION_1_0_4)
#define SDE_UIDLE_MAJOR(rev) ((rev) >> 8) #define SDE_UIDLE_MAJOR(rev) ((rev) >> 8)
@@ -693,10 +696,12 @@ enum {
/** /**
* uidle features * uidle features
* @SDE_UIDLE_QACTIVE_OVERRIDE uidle sends qactive signal * @SDE_UIDLE_QACTIVE_OVERRIDE uidle sends qactive signal
* @SDE_UIDLE_WB_FAL_STATUS wb contributes to fal status
* @SDE_UIDLE_MAX maximum value * @SDE_UIDLE_MAX maximum value
*/ */
enum { enum {
SDE_UIDLE_QACTIVE_OVERRIDE = 0x1, SDE_UIDLE_QACTIVE_OVERRIDE = 0x1,
SDE_UIDLE_WB_FAL_STATUS,
SDE_UIDLE_MAX SDE_UIDLE_MAX
}; };