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

disp: msm: sde: destroy framebuffers after plane cleanup

Browse Source 
Add framebuffer destroy immediately following plane cleanup
during secure display transition. Set state's fb to NULL
after destroying to avoid attempting to destroy fb again
during plane state destroy. Previously, framebuffer destroy
is happening after the context is detached while plane states
are being destroyed.

Change-Id: I273ce5b85c30962ea7e0a738a366487c9c85d4df
Signed-off-by: Samantha Tran <samtran@codeaurora.org>
This commit is contained in:
Samantha Tran
2019-12-06 14:52:06 -08:00
committed by Gerrit - the friendly Code Review server
parent d8cabe36c1
commit 793d2a33d7
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
msm/sde/sde_kms.c
View File

@@ -602,6 +602,7 @@ static int sde_kms_prepare_secure_transition(struct msm_kms *kms,
{ {
struct drm_crtc *crtc; struct drm_crtc *crtc;
struct drm_crtc_state *old_crtc_state; struct drm_crtc_state *old_crtc_state;
struct drm_plane_state *old_plane_state, *new_plane_state;
struct drm_plane *plane; struct drm_plane *plane;
struct drm_plane_state *plane_state; struct drm_plane_state *plane_state;
@@ -663,6 +664,9 @@ static int sde_kms_prepare_secure_transition(struct msm_kms *kms,
if (ops & SDE_KMS_OPS_CLEANUP_PLANE_FB) { if (ops & SDE_KMS_OPS_CLEANUP_PLANE_FB) {
SDE_DEBUG("cleanup planes\n"); SDE_DEBUG("cleanup planes\n");
drm_atomic_helper_cleanup_planes(dev, state); drm_atomic_helper_cleanup_planes(dev, state);
for_each_oldnew_plane_in_state(state, plane,
old_plane_state, new_plane_state, i)
sde_plane_destroy_fb(old_plane_state);
} }
if (ops & SDE_KMS_OPS_SECURE_STATE_CHANGE) { if (ops & SDE_KMS_OPS_SECURE_STATE_CHANGE) {
SDE_DEBUG("secure ctrl\n"); SDE_DEBUG("secure ctrl\n");

22
msm/sde/sde_plane.c
View File

@@ -4043,6 +4043,28 @@ static void sde_plane_destroy(struct drm_plane *plane)
} }
} }
void sde_plane_destroy_fb(struct drm_plane_state *state)
{
struct sde_plane_state *pstate;
if (!state) {
SDE_ERROR("invalid arg state %d\n", !state);
return;
}
pstate = to_sde_plane_state(state);
if (sde_plane_get_property(pstate, PLANE_PROP_FB_TRANSLATION_MODE) ==
SDE_DRM_FB_SEC) {
/* remove ref count for frame buffers */
if (state->fb) {
drm_framebuffer_put(state->fb);
state->fb = NULL;
}
}
}
static void sde_plane_destroy_state(struct drm_plane *plane, static void sde_plane_destroy_state(struct drm_plane *plane,
struct drm_plane_state *state) struct drm_plane_state *state)
{ {

8
msm/sde/sde_plane.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2020, 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>
* *
@@ -133,6 +133,12 @@ struct sde_multirect_plane_states {
#define sde_plane_get_property(S, X) ((S) && ((X) < PLANE_PROP_COUNT) ? \ #define sde_plane_get_property(S, X) ((S) && ((X) < PLANE_PROP_COUNT) ? \
((S)->property_values[(X)].value) : 0) ((S)->property_values[(X)].value) : 0)
/**
* sde_plane_destroy_fb - destroy fb object and clear fb
* @state: old plane state
*/
void sde_plane_destroy_fb(struct drm_plane_state *state);
/** /**
* sde_plane_pipe - return sspp identifier for the given plane * sde_plane_pipe - return sspp identifier for the given plane
* @plane: Pointer to DRM plane object * @plane: Pointer to DRM plane object