瀏覽代碼

Merge "disp: msm: sde: correct the sde vm release sequence"

qctecmdr 2 年之前
父節點
當前提交
2366eef20d
共有 1 個文件被更改,包括 5 次插入4 次删除
  1. 5 4
      msm/sde/sde_vm_trusted.c

+ 5 - 4
msm/sde/sde_vm_trusted.c

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-License-Identifier: GPL-2.0-only
 /*
 /*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  */
  */
 
 
@@ -177,16 +178,16 @@ static int _sde_vm_release(struct sde_kms *kms)
 
 
 	sde_kms_vm_trusted_resource_deinit(kms);
 	sde_kms_vm_trusted_resource_deinit(kms);
 
 
+	rc = _sde_vm_release_irq(kms->vm);
+	if (rc)
+		SDE_ERROR("irq_release failed, rc = %d\n", rc);
+
 	rc = _sde_vm_release_mem(kms->vm);
 	rc = _sde_vm_release_mem(kms->vm);
 	if (rc) {
 	if (rc) {
 		SDE_ERROR("mem_release failed, rc = %d\n", rc);
 		SDE_ERROR("mem_release failed, rc = %d\n", rc);
 		goto end;
 		goto end;
 	}
 	}
 
 
-	rc = _sde_vm_release_irq(kms->vm);
-	if (rc)
-		SDE_ERROR("irq_release failed, rc = %d\n", rc);
-
 end:
 end:
 	return rc;
 	return rc;
 }
 }