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

Commit 61a9e672 authored by Gopikrishnaiah Anandan's avatar Gopikrishnaiah Anandan Committed by Gerrit - the friendly Code Review server
Browse files

drm: msm: sde: Fix lut dma initialization sequence 



SMMU needs to be initialized before the LUT dma block initialization.
Change fixes the sequence and ensures that LUT dma resources are
allocated before the resource manager is initialized.

Change-Id: I4b6ea6a4d1c94950f9b7604d3bd75ce6b45ac962
Signed-off-by: default avatarGopikrishnaiah Anandan <agopik@codeaurora.org>
parent b38d329c

drivers/gpu/drm/msm/sde/sde_kms.c

+16 −15
Original line number Diff line number Diff line
@@ -3278,6 +3278,22 @@ static int sde_kms_hw_init(struct msm_kms *kms) 
		goto power_error;

	}



	sde_kms->splash_data.resource_handoff_pending = true;



	rc = _sde_kms_mmu_init(sde_kms);

	if (rc) {

		SDE_ERROR("sde_kms_mmu_init failed: %d\n", rc);

		goto power_error;

	}



	/* Initialize reg dma block which is a singleton */

	rc = sde_reg_dma_init(sde_kms->reg_dma, sde_kms->catalog,

			sde_kms->dev);

	if (rc) {

		SDE_ERROR("failed: reg dma init failed\n");

		goto power_error;

	}



	sde_dbg_init_dbg_buses(sde_kms->core_rev);



	rm = &sde_kms->rm;
@@ -3307,21 +3323,6 @@ static int sde_kms_hw_init(struct msm_kms *kms) 
					&sde_kms->splash_data,

					sde_kms->catalog);



	sde_kms->splash_data.resource_handoff_pending = true;



	/* Initialize reg dma block which is a singleton */

	rc = sde_reg_dma_init(sde_kms->reg_dma, sde_kms->catalog,

			sde_kms->dev);

	if (rc) {

		SDE_ERROR("failed: reg dma init failed\n");

		goto power_error;

	}



	rc = _sde_kms_mmu_init(sde_kms);

	if (rc) {

		SDE_ERROR("sde_kms_mmu_init failed: %d\n", rc);

		goto power_error;

	}

	sde_kms->hw_mdp = sde_rm_get_mdp(&sde_kms->rm);

	if (IS_ERR_OR_NULL(sde_kms->hw_mdp)) {

		rc = PTR_ERR(sde_kms->hw_mdp);