Commit 134c78c9 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: cleanup dpu_kms_hw_init error path 



It was noticed that dpu_kms_hw_init()'s error path contains several
labels which point to the same code path. Replace all of them with a
single label.

Suggested-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/570035/
Link: https://lore.kernel.org/r/20231201211845.1026967-2-dmitry.baryshkov@linaro.org
parent a55c8ff2

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+11 −14
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 
	if (!dpu_kms->catalog) {

		DPU_ERROR("device config not known!\n");

		rc = -EINVAL;

		goto power_error;

		goto err_pm_put;

	}



	/*
@@ -1073,26 +1073,26 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 
	rc = _dpu_kms_mmu_init(dpu_kms);

	if (rc) {

		DPU_ERROR("dpu_kms_mmu_init failed: %d\n", rc);

		goto power_error;

		goto err_pm_put;

	}



	dpu_kms->mdss = msm_mdss_get_mdss_data(dpu_kms->pdev->dev.parent);

	if (IS_ERR(dpu_kms->mdss)) {

		rc = PTR_ERR(dpu_kms->mdss);

		DPU_ERROR("failed to get MDSS data: %d\n", rc);

		goto power_error;

		goto err_pm_put;

	}



	if (!dpu_kms->mdss) {

		rc = -EINVAL;

		DPU_ERROR("NULL MDSS data\n");

		goto power_error;

		goto err_pm_put;

	}



	rc = dpu_rm_init(&dpu_kms->rm, dpu_kms->catalog, dpu_kms->mdss, dpu_kms->mmio);

	if (rc) {

		DPU_ERROR("rm init failed: %d\n", rc);

		goto power_error;

		goto err_pm_put;

	}



	dpu_kms->rm_init = true;
@@ -1104,7 +1104,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 
		rc = PTR_ERR(dpu_kms->hw_mdp);

		DPU_ERROR("failed to get hw_mdp: %d\n", rc);

		dpu_kms->hw_mdp = NULL;

		goto power_error;

		goto err_pm_put;

	}



	for (i = 0; i < dpu_kms->catalog->vbif_count; i++) {
@@ -1115,7 +1115,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 
		if (IS_ERR(hw)) {

			rc = PTR_ERR(hw);

			DPU_ERROR("failed to init vbif %d: %d\n", vbif->id, rc);

			goto power_error;

			goto err_pm_put;

		}



		dpu_kms->hw_vbif[vbif->id] = hw;
@@ -1131,7 +1131,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 
	rc = dpu_core_perf_init(&dpu_kms->perf, dpu_kms->catalog->perf, max_core_clk_rate);

	if (rc) {

		DPU_ERROR("failed to init perf %d\n", rc);

		goto perf_err;

		goto err_pm_put;

	}



	dpu_kms->hw_intr = dpu_hw_intr_init(dpu_kms->mmio, dpu_kms->catalog);
@@ -1139,7 +1139,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 
		rc = PTR_ERR(dpu_kms->hw_intr);

		DPU_ERROR("hw_intr init failed: %d\n", rc);

		dpu_kms->hw_intr = NULL;

		goto hw_intr_init_err;

		goto err_pm_put;

	}



	dev->mode_config.min_width = 0;
@@ -1164,7 +1164,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 
	rc = _dpu_kms_drm_obj_init(dpu_kms);

	if (rc) {

		DPU_ERROR("modeset init failed: %d\n", rc);

		goto drm_obj_init_err;

		goto err_pm_put;

	}



	dpu_vbif_init_memtypes(dpu_kms);
@@ -1173,10 +1173,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) 


	return 0;



drm_obj_init_err:

hw_intr_init_err:

perf_err:

power_error:

err_pm_put:

	pm_runtime_put_sync(&dpu_kms->pdev->dev);

error:

	_dpu_kms_hw_destroy(dpu_kms);