lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: sde: avoid seamless crtc transition when CWB is enabled

Browse Source 
Add changes to avoid primary crtc seamless transition when CWB is
enabled in bootup first commit. This ensures atomic_enable gets called
for primary crtc in splash handoff commit and software states get updated.

Change-Id: I7faab3e4839ab6a69023790ee2874250091f32f0
Signed-off-by: Jayaprakash Madisetty <jmadiset@codeaurora.org>
This commit is contained in:
Jayaprakash Madisetty 2021-04-28 16:40:46 +05:30 committed by Jayaprakash
parent c93cae7d78
commit a799d5f7b6
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
msm/msm_atomic.c
View File

@ -34,13 +34,17 @@ struct msm_commit {
struct kthread_work commit_work; struct kthread_work commit_work;
}; };
static inline bool _msm_seamless_for_crtc(struct drm_atomic_state *state, static inline bool _msm_seamless_for_crtc(struct drm_device *dev,
struct drm_atomic_state *state,
struct drm_crtc_state *crtc_state, bool enable) struct drm_crtc_state *crtc_state, bool enable)
{ {
struct drm_connector *connector = NULL; struct drm_connector *connector = NULL;
struct drm_connector_state *conn_state = NULL; struct drm_connector_state *conn_state = NULL;
struct msm_drm_private *priv = dev->dev_private;
struct msm_kms *kms = priv->kms;
int i = 0; int i = 0;
int conn_cnt = 0; int conn_cnt = 0;
bool splash_en = false;
if (msm_is_mode_seamless(&crtc_state->mode) || if (msm_is_mode_seamless(&crtc_state->mode) ||
msm_is_mode_seamless_vrr(&crtc_state->adjusted_mode) || msm_is_mode_seamless_vrr(&crtc_state->adjusted_mode) ||
@ -59,7 +63,11 @@ static inline bool _msm_seamless_for_crtc(struct drm_atomic_state *state,
crtc_state->crtc)) crtc_state->crtc))
conn_cnt++; conn_cnt++;
if (MULTIPLE_CONN_DETECTED(conn_cnt)) if (kms && kms->funcs && kms->funcs->check_for_splash)
splash_en = kms->funcs->check_for_splash(kms,
crtc_state->crtc);
if (MULTIPLE_CONN_DETECTED(conn_cnt) && !splash_en)
return true; return true;
} }
} }
@ -214,7 +222,7 @@ msm_disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
if (!old_crtc_state->active) if (!old_crtc_state->active)
continue; continue;
if (_msm_seamless_for_crtc(old_state, crtc->state, false)) if (_msm_seamless_for_crtc(dev, old_state, crtc->state, false))
continue; continue;
funcs = crtc->helper_private; funcs = crtc->helper_private;
@ -362,7 +370,7 @@ static void msm_atomic_helper_commit_modeset_enables(struct drm_device *dev,
if (!new_crtc_state->active) if (!new_crtc_state->active)
continue; continue;
if (_msm_seamless_for_crtc(old_state, crtc->state, true)) if (_msm_seamless_for_crtc(dev, old_state, crtc->state, true))
continue; continue;
funcs = crtc->helper_private; funcs = crtc->helper_private;

2
msm/msm_drv.c
View File

@ -1030,7 +1030,7 @@ static void msm_lastclose(struct drm_device *dev)
* commit then ignore the last close call * commit then ignore the last close call
*/ */
if (kms->funcs && kms->funcs->check_for_splash if (kms->funcs && kms->funcs->check_for_splash
&& kms->funcs->check_for_splash(kms)) && kms->funcs->check_for_splash(kms, NULL))
return; return;
/* /*

4
msm/msm_kms.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2016-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>
* *
@ -124,7 +124,7 @@ struct msm_kms_funcs {
int (*cont_splash_config)(struct msm_kms *kms, int (*cont_splash_config)(struct msm_kms *kms,
struct drm_atomic_state *state); struct drm_atomic_state *state);
/* check for continuous splash status */ /* check for continuous splash status */
bool (*check_for_splash)(struct msm_kms *kms); bool (*check_for_splash)(struct msm_kms *kms, struct drm_crtc *crtc);
/* topology lm information */ /* topology lm information */
int (*get_mixer_count)(const struct msm_kms *kms, int (*get_mixer_count)(const struct msm_kms *kms,
const struct drm_display_mode *mode, const struct drm_display_mode *mode,

12
msm/sde/sde_kms.c
View File

@ -3253,9 +3253,10 @@ static int sde_kms_cont_splash_config(struct msm_kms *kms,
return rc; return rc;
} }
static bool sde_kms_check_for_splash(struct msm_kms *kms) static bool sde_kms_check_for_splash(struct msm_kms *kms, struct drm_crtc *crtc)
{ {
struct sde_kms *sde_kms; struct sde_kms *sde_kms;
struct drm_encoder *encoder;
if (!kms) { if (!kms) {
SDE_ERROR("invalid kms\n"); SDE_ERROR("invalid kms\n");
@ -3263,7 +3264,16 @@ static bool sde_kms_check_for_splash(struct msm_kms *kms)
} }
sde_kms = to_sde_kms(kms); sde_kms = to_sde_kms(kms);
if (!crtc || !sde_kms->splash_data.num_splash_displays)
return sde_kms->splash_data.num_splash_displays; return sde_kms->splash_data.num_splash_displays;
drm_for_each_encoder_mask(encoder, crtc->dev,
crtc->state->encoder_mask) {
if (sde_encoder_in_cont_splash(encoder))
return true;
}
return false;
} }
static int sde_kms_get_mixer_count(const struct msm_kms *kms, static int sde_kms_get_mixer_count(const struct msm_kms *kms,