Merge "disp: msm: sde: remove fb's attached to a drm_file in preclose"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
a5da9d0045
@@ -2837,17 +2837,16 @@ static void _sde_crtc_set_input_fence_timeout(struct sde_crtc_state *cstate)
|
||||
cstate->input_fence_timeout_ns *= NSEC_PER_MSEC;
|
||||
}
|
||||
|
||||
/**
|
||||
* _sde_crtc_clear_dim_layers_v1 - clear all dim layer settings
|
||||
* @cstate: Pointer to sde crtc state
|
||||
*/
|
||||
static void _sde_crtc_clear_dim_layers_v1(struct sde_crtc_state *cstate)
|
||||
void _sde_crtc_clear_dim_layers_v1(struct drm_crtc_state *state)
|
||||
{
|
||||
u32 i;
|
||||
struct sde_crtc_state *cstate;
|
||||
|
||||
if (!cstate)
|
||||
if (!state)
|
||||
return;
|
||||
|
||||
cstate = to_sde_crtc_state(state);
|
||||
|
||||
for (i = 0; i < cstate->num_dim_layers; i++)
|
||||
memset(&cstate->dim_layer[i], 0, sizeof(cstate->dim_layer[i]));
|
||||
|
||||
@@ -2876,7 +2875,7 @@ static void _sde_crtc_set_dim_layer_v1(struct drm_crtc *crtc,
|
||||
|
||||
if (!usr_ptr) {
|
||||
/* usr_ptr is null when setting the default property value */
|
||||
_sde_crtc_clear_dim_layers_v1(cstate);
|
||||
_sde_crtc_clear_dim_layers_v1(&cstate->base);
|
||||
SDE_DEBUG("dim_layer data removed\n");
|
||||
goto clear;
|
||||
}
|
||||
|
Reference in New Issue
Block a user