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

Merge 89c5866e4b on remote branch

Browse Source 
Change-Id: I92c8f5e431df28f9ca2880b3bf0ecd16ebadcb4a
This commit is contained in:
Linux Build Service Account
2024-07-05 02:18:10 -07:00
parent 79ec84f506 89c5866e4b
commit 451c9ccdd5
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
msm/sde/sde_encoder.c
View File

@@ -5472,6 +5472,7 @@ u32 sde_encoder_helper_get_kickoff_timeout_ms(struct drm_encoder *drm_enc)
struct drm_encoder *src_enc = drm_enc; struct drm_encoder *src_enc = drm_enc;
struct sde_encoder_virt *sde_enc; struct sde_encoder_virt *sde_enc;
struct sde_kms *sde_kms; struct sde_kms *sde_kms;
u32 qsync_mode = 0, qsync_min_fps = 0;
u32 fps; u32 fps;
if (!drm_enc) { if (!drm_enc) {
@@ -5495,6 +5496,13 @@ u32 sde_encoder_helper_get_kickoff_timeout_ms(struct drm_encoder *drm_enc)
sde_enc = to_sde_encoder_virt(src_enc); sde_enc = to_sde_encoder_virt(src_enc);
fps = sde_enc->mode_info.frame_rate; fps = sde_enc->mode_info.frame_rate;
if (sde_enc->cur_master)
qsync_mode = sde_connector_get_qsync_mode(sde_enc->cur_master->connector);
qsync_min_fps = sde_enc->mode_info.qsync_min_fps;
if (qsync_mode && qsync_min_fps)
fps = min(fps, qsync_min_fps);
if (!fps || fps >= DEFAULT_TIMEOUT_FPS_THRESHOLD) if (!fps || fps >= DEFAULT_TIMEOUT_FPS_THRESHOLD)
return DEFAULT_KICKOFF_TIMEOUT_MS; return DEFAULT_KICKOFF_TIMEOUT_MS;
else else

4
msm/sde/sde_encoder_phys_cmd.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved.
*/ */
@@ -1849,6 +1849,8 @@ static int sde_encoder_phys_cmd_prepare_for_kickoff(
sde_enc = to_sde_encoder_virt(phys_enc->parent); sde_enc = to_sde_encoder_virt(phys_enc->parent);
phys_enc->frame_trigger_mode = params->frame_trigger_mode; phys_enc->frame_trigger_mode = params->frame_trigger_mode;
phys_enc->kickoff_timeout_ms =
sde_encoder_helper_get_kickoff_timeout_ms(phys_enc->parent);
SDE_EVT32(DRMID(phys_enc->parent), phys_enc->hw_pp->idx - PINGPONG_0, SDE_EVT32(DRMID(phys_enc->parent), phys_enc->hw_pp->idx - PINGPONG_0,
atomic_read(&phys_enc->pending_kickoff_cnt), atomic_read(&phys_enc->pending_kickoff_cnt),
atomic_read(&cmd_enc->autorefresh.kickoff_cnt), atomic_read(&cmd_enc->autorefresh.kickoff_cnt),

2
msm/sde/sde_encoder_phys_vid.c
View File

@@ -1041,6 +1041,8 @@ static int sde_encoder_phys_vid_prepare_for_kickoff(
} }
vid_enc = to_sde_encoder_phys_vid(phys_enc); vid_enc = to_sde_encoder_phys_vid(phys_enc);
phys_enc->kickoff_timeout_ms =
sde_encoder_helper_get_kickoff_timeout_ms(phys_enc->parent);
ctl = phys_enc->hw_ctl; ctl = phys_enc->hw_ctl;
if (!ctl->ops.wait_reset_status) if (!ctl->ops.wait_reset_status)
return 0; return 0;

2
msm/sde_dbg.c
View File

@@ -2874,7 +2874,7 @@ void sde_dbg_reg_register_dump_range(const char *base_name,
return; return;
} }
if (!offset_start || !offset_end || (offset_start > offset_end)) { if ((!offset_start && !offset_end) || (offset_start > offset_end)) {
pr_info("%pS: bad range, base_name %s, range_name %s, offset_start 0x%X, end 0x%X\n", pr_info("%pS: bad range, base_name %s, range_name %s, offset_start 0x%X, end 0x%X\n",
__builtin_return_address(0), base_name, __builtin_return_address(0), base_name,
range_name, offset_start, offset_end); range_name, offset_start, offset_end);