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: reset cwb encoder for the associated crtc"

Browse Source
This commit is contained in:
qctecmdr
2024-01-04 21:36:35 -08:00
committed by Gerrit - the friendly Code Review server
parent 0cdd0bcba2 9e3e63ad9e
commit 217c457d84
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
msm/sde/sde_encoder.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
* Copyright (C) 2013 Red Hat * Copyright (C) 2013 Red Hat
* Author: Rob Clark <robdclark@gmail.com> * Author: Rob Clark <robdclark@gmail.com>
@@ -977,6 +977,9 @@ bool sde_encoder_is_cwb_disabling(struct drm_encoder *drm_enc,
if (sde_enc->disp_info.intf_type != DRM_MODE_CONNECTOR_VIRTUAL) if (sde_enc->disp_info.intf_type != DRM_MODE_CONNECTOR_VIRTUAL)
return false; return false;
if (sde_enc->crtc != crtc)
return false;
for (i = 0; i < sde_enc->num_phys_encs; i++) { for (i = 0; i < sde_enc->num_phys_encs; i++) {
struct sde_encoder_phys *phys = sde_enc->phys_encs[i]; struct sde_encoder_phys *phys = sde_enc->phys_encs[i];

4
msm/sde/sde_kms.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2014-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
* Copyright (C) 2013 Red Hat * Copyright (C) 2013 Red Hat
* Author: Rob Clark <robdclark@gmail.com> * Author: Rob Clark <robdclark@gmail.com>
@@ -1729,7 +1729,7 @@ static void sde_kms_wait_for_commit_done(struct msm_kms *kms,
sde_crtc_complete_flip(crtc, NULL); sde_crtc_complete_flip(crtc, NULL);
} }
if (cwb_disabling && cwb_enc) if (cwb_enc)
sde_encoder_virt_reset(cwb_enc); sde_encoder_virt_reset(cwb_enc);
if (drm_atomic_crtc_needs_modeset(crtc->state)) { if (drm_atomic_crtc_needs_modeset(crtc->state)) {