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

Merge 55ec06a914 on remote branch

Browse Source 
Change-Id: Id59022e07b9cc50abc41446fbdf94df93adeca94
This commit is contained in:
Linux Build Service Account
2024-09-11 09:32:48 -07:00
parent 6791773c64 55ec06a914
commit 5ff96e6831
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
msm/dsi/dsi_display.c
View File

@@ -8605,10 +8605,6 @@ static int dsi_display_set_roi(struct dsi_display *display,
if (!changed)
continue;
rc = dsi_ctrl_wait_for_cmd_mode_mdp_idle(ctrl->ctrl);
if (rc)
DSI_ERR("wait for cmd mode mdp idle failed rc = %d", rc);
/* re-program the ctrl with the timing based on the new roi */
rc = dsi_ctrl_timing_setup(ctrl->ctrl);
if (rc) {

34
msm/sde/sde_crtc.c
View File

@@ -5043,13 +5043,21 @@ static int _sde_crtc_vblank_enable(
static void _sde_crtc_reserve_resource(struct drm_crtc *crtc, struct drm_connector *conn)
{
struct sde_kms *kms;
struct drm_encoder *encoder;
u32 min_transfer_time = 0, lm_count = 1;
u64 mode_clock_hz = 0, updated_fps = 0, topology_id;
struct drm_encoder *encoder;
u32 inf_factor = 105, lm_width, num_bubbles = 0;
if (!crtc || !conn)
return;
kms = _sde_crtc_get_kms(crtc);
if (!kms || !kms->catalog) {
SDE_ERROR("invalid kms\n");
return;
}
encoder = conn->state->best_encoder;
if (!sde_encoder_is_built_in_display(encoder))
return;
@@ -5063,17 +5071,31 @@ static void _sde_crtc_reserve_resource(struct drm_crtc *crtc, struct drm_connect
updated_fps = drm_mode_vrefresh(&crtc->mode);
topology_id = sde_connector_get_topology_name(conn);
if (TOPOLOGY_DUALPIPE_MODE(topology_id))
if (TOPOLOGY_DUALPIPE_MODE(topology_id)) {
lm_count = 2;
else if (TOPOLOGY_QUADPIPE_MODE(topology_id))
if (SDE_HW_MAJOR(kms->catalog->hw_rev) == SDE_HW_MAJOR(SDE_HW_VER_A00))
num_bubbles = 40;
} else if (TOPOLOGY_QUADPIPE_MODE(topology_id)) {
lm_count = 4;
if (SDE_HW_MAJOR(kms->catalog->hw_rev) == SDE_HW_MAJOR(SDE_HW_VER_A00))
num_bubbles = 56;
}
if (SDE_HW_MAJOR(kms->catalog->hw_rev) == SDE_HW_MAJOR(SDE_HW_VER_900)
&& lm_count > 1)
num_bubbles = 30;
lm_width = (crtc->mode.hdisplay) / lm_count;
num_bubbles = mult_frac(num_bubbles, 100, lm_width);
inf_factor = max((100 + num_bubbles), inf_factor);
/* mode clock = [(h * v * fps * 1.05) / (num_lm)] */
mode_clock_hz = mult_frac(crtc->mode.htotal * crtc->mode.vtotal * updated_fps, 105, 100);
mode_clock_hz = mult_frac(crtc->mode.htotal * crtc->mode.vtotal * updated_fps,
inf_factor, 100);
mode_clock_hz = div_u64(mode_clock_hz, lm_count);
SDE_DEBUG("[%s] h=%d v=%d fps=%d lm=%d mode_clk=%u\n",
SDE_DEBUG("[%s] h=%d v=%d fps=%d lm=%d mode_clk=%u inf_factor=%u\n",
crtc->mode.name, crtc->mode.htotal, crtc->mode.vtotal,
updated_fps, lm_count, mode_clock_hz);
updated_fps, lm_count, mode_clock_hz, inf_factor);
sde_core_perf_crtc_reserve_res(crtc, mode_clock_hz);
}