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

Commit 119b84ea authored by Amine Najahi's avatar Amine Najahi
Browse files

disp: msm: sde: add atomic check handling in cp framework 



Add atomic check handling in color processing framework.
This will check cp features during the validate phase.

Change-Id: I6d94316a749ad247aec0554c31fa56af6db61ab6
Signed-off-by: default avatarAmine Najahi <anajahi@codeaurora.org>
parent c84f906b

msm/sde/sde_color_processing.c

+122 −7
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ enum { 


static void _sde_cp_crtc_enable_hist_irq(struct sde_crtc *sde_crtc);



typedef int (*set_feature_wrapper)(struct sde_hw_dspp *hw_dspp,

typedef int (*feature_wrapper)(struct sde_hw_dspp *hw_dspp,

				   struct sde_hw_cp_cfg *hw_cfg,

				   struct sde_crtc *hw_crtc);
@@ -655,9 +655,13 @@ static int set_ltm_hist_crtl_feature(struct sde_hw_dspp *hw_dspp, 
	return ret;

}



set_feature_wrapper crtc_feature_wrappers[SDE_CP_CRTC_MAX_FEATURES];



#define setup_crtc_feature_wrappers(wrappers) \

feature_wrapper check_crtc_feature_wrappers[SDE_CP_CRTC_MAX_FEATURES];

#define setup_check_crtc_feature_wrappers(wrappers) \

memset(wrappers, 0, sizeof(wrappers))



feature_wrapper set_crtc_feature_wrappers[SDE_CP_CRTC_MAX_FEATURES];

#define setup_set_crtc_feature_wrappers(wrappers) \

do { \

	memset(wrappers, 0, sizeof(wrappers)); \

	wrappers[SDE_CP_CRTC_DSPP_VLUT] = set_dspp_vlut_feature; \
@@ -1182,6 +1186,68 @@ static void _sde_cp_crtc_enable_hist_irq(struct sde_crtc *sde_crtc) 
	spin_unlock_irqrestore(&node->state_lock, flags);

}



static int sde_cp_crtc_checkfeature(struct sde_cp_node *prop_node,

	struct sde_crtc *sde_crtc, struct sde_crtc_state *sde_crtc_state)

{

	struct sde_hw_cp_cfg hw_cfg;

	struct sde_hw_mixer *hw_lm;

	struct sde_hw_dspp *hw_dspp;

	u32 num_mixers = sde_crtc->num_mixers;

	int i = 0, ret = 0;

	bool feature_enabled = false;

	feature_wrapper check_feature = NULL;



	if (!prop_node || !sde_crtc || !sde_crtc_state) {

		DRM_ERROR("invalid arguments");

		return -EINVAL;

	}



	if (prop_node->feature >= SDE_CP_CRTC_MAX_FEATURES) {

		DRM_ERROR("invalid feature %d\n", prop_node->feature);

		return -EINVAL;

	}



	check_feature = check_crtc_feature_wrappers[prop_node->feature];

	if (check_feature == NULL)

		return 0;



	memset(&hw_cfg, 0, sizeof(hw_cfg));

	sde_cp_get_hw_payload(prop_node, &hw_cfg, &feature_enabled);

	hw_cfg.num_of_mixers = sde_crtc->num_mixers;

	hw_cfg.last_feature = 0;



	for (i = 0; i < num_mixers; i++) {

		hw_dspp = sde_crtc->mixers[i].hw_dspp;

		if (!hw_dspp || i >= DSPP_MAX)

			continue;

		hw_cfg.dspp[i] = hw_dspp;

	}



	for (i = 0; i < num_mixers && !ret; i++) {

		hw_lm = sde_crtc->mixers[i].hw_lm;

		hw_dspp = sde_crtc->mixers[i].hw_dspp;

		if (!hw_lm) {

			ret = -EINVAL;

			continue;

		}

		hw_cfg.ctl = sde_crtc->mixers[i].hw_ctl;

		hw_cfg.mixer_info = hw_lm;



		/* use incoming state information */

		hw_cfg.displayh = num_mixers *

				sde_crtc_state->lm_roi[i].w;

		hw_cfg.displayv = sde_crtc_state->lm_roi[i].h;



		DRM_DEBUG_DRIVER("check cp feature %d on mixer %d\n",

				prop_node->feature, hw_lm->idx - LM_0);

		ret = check_feature(hw_dspp, &hw_cfg, sde_crtc);

		if (ret)

			break;

	}



	return ret;

}



static void sde_cp_crtc_setfeature(struct sde_cp_node *prop_node,

				   struct sde_crtc *sde_crtc)

{
@@ -1206,11 +1272,11 @@ static void sde_cp_crtc_setfeature(struct sde_cp_node *prop_node, 
	}



	if ((prop_node->feature >= SDE_CP_CRTC_MAX_FEATURES) ||

			crtc_feature_wrappers[prop_node->feature] == NULL) {

			set_crtc_feature_wrappers[prop_node->feature] == NULL) {

		ret = -EINVAL;

	} else {

		set_feature_wrapper set_feature =

			crtc_feature_wrappers[prop_node->feature];

		feature_wrapper set_feature =

			set_crtc_feature_wrappers[prop_node->feature];

		catalog = get_kms(&sde_crtc->base)->catalog;

		hw_cfg.broadcast_disabled = catalog->dma_cfg.broadcast_disabled;
@@ -1314,6 +1380,54 @@ void sde_cp_dspp_flush_helper(struct sde_crtc *sde_crtc, u32 feature) 
	}

}



int sde_cp_crtc_check_properties(struct drm_crtc *crtc,

	struct drm_crtc_state *state)

{

	struct sde_crtc *sde_crtc = NULL;

	struct sde_crtc_state *sde_crtc_state = NULL;

	struct sde_cp_node *prop_node = NULL, *n = NULL;

	int ret = 0;



	if (!crtc || !crtc->dev || !state) {

		DRM_ERROR("invalid crtc %pK dev %pK state %pK\n", crtc,

				(crtc ? crtc->dev : NULL), state);

		return -EINVAL;

	}



	sde_crtc = to_sde_crtc(crtc);

	if (!sde_crtc) {

		DRM_ERROR("invalid sde_crtc %pK\n", sde_crtc);

		return -EINVAL;

	}



	sde_crtc_state = to_sde_crtc_state(state);

	if (!sde_crtc_state) {

		DRM_ERROR("invalid sde_crtc_state %pK\n", sde_crtc_state);

		return -EINVAL;

	}

	mutex_lock(&sde_crtc->crtc_cp_lock);



	if (list_empty(&sde_crtc->dirty_list)) {

		DRM_DEBUG_DRIVER("Dirty list is empty\n");

		goto exit;

	}



	list_for_each_entry_safe(prop_node, n, &sde_crtc->dirty_list,

		dirty_list) {

		ret = sde_cp_crtc_checkfeature(prop_node, sde_crtc,

				sde_crtc_state);

		if (ret) {

			DRM_ERROR("failed check on prop_node %u\n",

					prop_node->property_id);

			goto exit;

		}

	}



exit:

	mutex_unlock(&sde_crtc->crtc_cp_lock);

	return ret;

}



void sde_cp_crtc_apply_properties(struct drm_crtc *crtc)

{

	struct sde_crtc *sde_crtc = NULL;
@@ -1444,7 +1558,8 @@ void sde_cp_crtc_install_properties(struct drm_crtc *crtc) 
				SDE_CP_CRTC_MAX_FEATURES), GFP_KERNEL);

		setup_dspp_prop_install_funcs(dspp_prop_install_func);

		setup_lm_prop_install_funcs(lm_prop_install_func);

		setup_crtc_feature_wrappers(crtc_feature_wrappers);

		setup_set_crtc_feature_wrappers(set_crtc_feature_wrappers);

		setup_check_crtc_feature_wrappers(check_crtc_feature_wrappers);

	}

	if (!priv->cp_property)

		goto exit;

msm/sde/sde_color_processing.h

+10 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _SDE_COLOR_PROCESSING_H
@@ -93,6 +93,15 @@ void sde_cp_crtc_destroy_properties(struct drm_crtc *crtc); 
 */

int sde_cp_crtc_set_property(struct drm_crtc *crtc,

				struct drm_property *property, uint64_t val);

/**

 * sde_cp_crtc_check_properties: Verify color processing properties for a crtc.

 *                               Should be called during atomic check call.

 * @crtc: Pointer to crtc.

 * @state: Pointer to crtc state.

 * @returns: 0 on success, non-zero otherwise

 */

int sde_cp_crtc_check_properties(struct drm_crtc *crtc,

					struct drm_crtc_state *state);



/**

 * sde_cp_crtc_apply_properties: Enable/disable properties

msm/sde/sde_crtc.c

+6 −0
Original line number Diff line number Diff line
@@ -4655,6 +4655,12 @@ static int sde_crtc_atomic_check(struct drm_crtc *crtc, 
		goto end;

	}



	rc = sde_cp_crtc_check_properties(crtc, state);

	if (rc) {

		SDE_ERROR("crtc%d failed cp properties check %d\n",

				crtc->base.id, rc);

		goto end;

	}

end:

	kfree(pstates);

	kfree(multirect_plane);