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

disp: msm: sde: avoid connector remove in dual display recovery

Browse Source 
Add changes to get drm object reference for connector and
remove out fb in dual display recovery case.

Change-Id: I1fd0c4818575b3f532d51ad41285031e8320c5fe
Signed-off-by: Raviteja Tamatam <quic_travitej@quicinc.com>
This commit is contained in:
Raviteja Tamatam
2022-09-13 12:17:58 -07:00
committed by Gerrit - the friendly Code Review server
parent 4afb745c53
commit 45a1db8361
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
msm/sde/sde_kms.c
View File

@@ -2579,6 +2579,38 @@ static void _sde_kms_plane_force_remove(struct drm_plane *plane,
drm_atomic_set_fb_for_plane(plane_state, NULL); drm_atomic_set_fb_for_plane(plane_state, NULL);
} }
static int _sde_kms_connector_add_refcount(struct sde_kms *sde_kms,
struct drm_atomic_state *state)
{
struct drm_device *dev = sde_kms->dev;
struct drm_connector *conn;
struct drm_connector_state *conn_state;
struct drm_connector_list_iter conn_iter;
struct sde_connector_state *c_state;
int ret = 0;
drm_connector_list_iter_begin(dev, &conn_iter);
drm_for_each_connector_iter(conn, &conn_iter) {
/*
* Acquire a connector reference to avoid removing
* connector in drm_release for splash and recovery cases.
*/
conn_state = drm_atomic_get_connector_state(state, conn);
if (IS_ERR(conn_state)) {
ret = PTR_ERR(conn_state);
SDE_ERROR("error %d getting connector %d state\n",
ret, DRMID(conn));
return ret;
}
c_state = to_sde_connector_state(conn_state);
if (c_state->out_fb)
drm_framebuffer_put(c_state->out_fb);
}
drm_connector_list_iter_end(&conn_iter);
return ret;
}
static int _sde_kms_remove_fbs(struct sde_kms *sde_kms, struct drm_file *file, static int _sde_kms_remove_fbs(struct sde_kms *sde_kms, struct drm_file *file,
struct drm_atomic_state *state) struct drm_atomic_state *state)
{ {
@@ -2611,6 +2643,8 @@ static int _sde_kms_remove_fbs(struct sde_kms *sde_kms, struct drm_file *file,
if (list_empty(&fbs)) { if (list_empty(&fbs)) {
SDE_DEBUG("skip commit as no fb(s)\n"); SDE_DEBUG("skip commit as no fb(s)\n");
if (sde_kms->dsi_display_count == sde_kms->splash_data.num_splash_displays)
_sde_kms_connector_add_refcount(sde_kms, state);
return 0; return 0;
} }