Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c913380 authored by Jayaprakash's avatar Jayaprakash
Browse files

disp: msm: sde: clear dim_layers as part of null commit 



Add changes to clear any dim_layers present in the crtc_state
as part of null commit.

Change-Id: Iaa5d01d7d512445e1524bac85012adda6be6c4a9
Signed-off-by: default avatarJayaprakash <jmadiset@codeaurora.org>
parent f0e165a8

msm/sde/sde_crtc.c

+6 −7
Original line number Diff line number Diff line
@@ -2480,17 +2480,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]));
@@ -2519,7 +2518,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");

		return;

	}

msm/sde/sde_crtc.h

+6 −0
Original line number Diff line number Diff line
@@ -861,6 +861,12 @@ void sde_crtc_get_misr_info(struct drm_crtc *crtc, 
int sde_crtc_get_num_datapath(struct drm_crtc *crtc,

		struct drm_connector *connector);



/**

 * _sde_crtc_clear_dim_layers_v1 - clear all dim layer settings

 * @cstate:      Pointer to drm crtc state

 */

void _sde_crtc_clear_dim_layers_v1(struct drm_crtc_state *state);



/*

 * sde_crtc_set_compression_ratio - set compression ratio src_bpp/target_bpp

 * @msm_mode_info: Mode info

msm/sde/sde_kms.c

+2 −0
Original line number Diff line number Diff line
@@ -2066,6 +2066,8 @@ static int sde_kms_set_crtc_for_conn(struct drm_device *dev, 
	if (ret)

		SDE_ERROR("error %d setting the crtc\n", ret);



	_sde_crtc_clear_dim_layers_v1(crtc_state);



	return 0;

}