disp: msm: sde: Rename Gunyah RM APIs

As we are merging upstream patches, resolve conflicts of namespaces in
downstream modules.

Change-Id: Id3af0de7102ddd92e312cb3cca10db9968974bcd
Signed-off-by: Prakruthi Deepak Heragu <quic_pheragu@quicinc.com>
Signed-off-by: Raviteja Tamatam<quic_travitej@quicinc.com>

msm/sde/sde_vm_common.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  */
 
@@ -35,7 +35,11 @@ struct gh_acl_desc *sde_vm_populate_acl(enum gh_vm_names vm_name)
 	struct gh_acl_desc *acl_desc;
 	gh_vmid_t vmid;
 
+#if (KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE)
+	ghd_rm_get_vmid(vm_name, &vmid);
+#else
 	gh_rm_get_vmid(vm_name, &vmid);
+#endif
 
 	acl_desc = kzalloc(offsetof(struct gh_acl_desc, acl_entries[1]),
 			   GFP_KERNEL);

msm/sde/sde_vm_primary.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #define pr_fmt(fmt)	"[drm:%s:%d] " fmt, __func__, __LINE__
@@ -50,7 +51,12 @@ int _sde_vm_reclaim_mem(struct sde_kms *sde_kms)
 	if (sde_vm->base.io_mem_handle < 0)
 		return 0;
 
+#if (KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE)
+	rc = ghd_rm_mem_reclaim(sde_vm->base.io_mem_handle, 0);
+#else
 	rc = gh_rm_mem_reclaim(sde_vm->base.io_mem_handle, 0);
+#endif
+
 	if (rc) {
 		SDE_ERROR("failed to reclaim IO memory, rc=%d\n", rc);
 		return rc;
@@ -143,8 +149,14 @@ static int _sde_vm_lend_mem(struct sde_vm *vm,
 		goto sgl_fail;
 	}
 
+#if (KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE)
+	rc = ghd_rm_mem_lend(GH_RM_MEM_TYPE_IO, 0, SDE_VM_MEM_LABEL,
+				 acl_desc, sgl_desc, NULL, &mem_handle);
+#else
 	rc = gh_rm_mem_lend(GH_RM_MEM_TYPE_IO, 0, SDE_VM_MEM_LABEL,
 				 acl_desc, sgl_desc, NULL, &mem_handle);
+#endif
+
 	if (rc) {
 		SDE_ERROR("hyp lend failed with error, rc: %d\n", rc);
 		goto fail;
@@ -152,7 +164,11 @@ static int _sde_vm_lend_mem(struct sde_vm *vm,
 
 	sde_vm->base.io_mem_handle = mem_handle;
 
+#if (KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE)
+	ghd_rm_get_vmid(GH_TRUSTED_VM, &trusted_vmid);
+#else
 	gh_rm_get_vmid(GH_TRUSTED_VM, &trusted_vmid);
+#endif
 
 	vmid_desc = sde_vm_populate_vmid(trusted_vmid);