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

Commit 79f08803 authored by Lloyd Atkinson's avatar Lloyd Atkinson Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm/sde: check for null catalog in sde hw destroy 



Fix sde hw deconstruction which can be called twice back to
back if hw initialization itself fails. In this case the catalog
pointer will already be null, so we must check for it.

Change-Id: Idc05efd7dd8c2a27f2c8128654e4c0b06697f39e
Signed-off-by: default avatarLloyd Atkinson <latkinso@codeaurora.org>
parent 342410b9

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

+6 −4
Original line number Diff line number Diff line
@@ -838,12 +838,14 @@ static void _sde_kms_hw_destroy(struct sde_kms *sde_kms, 
	_sde_debugfs_destroy(sde_kms);

	_sde_kms_mmu_destroy(sde_kms);



	if (sde_kms->catalog) {

		for (i = 0; i < sde_kms->catalog->vbif_count; i++) {

			u32 vbif_idx = sde_kms->catalog->vbif[i].id;



			if ((vbif_idx < VBIF_MAX) && sde_kms->hw_vbif[vbif_idx])

				sde_hw_vbif_destroy(sde_kms->hw_vbif[vbif_idx]);

		}

	}



	if (sde_kms->rm_init)

		sde_rm_destroy(&sde_kms->rm);