Browse Source

disp: msm: sde: upstream memblock_free API returns void

The memblock_free API has been updated to return void. This
change removes the check on return and passes the pointer
address in correctly.

Change-Id: I8b60c8d3c5e3e8c2f94e33015c2c03686a556807
Signed-off-by: Nilaan Gunabalachandran <[email protected]>
Nilaan Gunabalachandran 2 years ago
parent
commit
719e3a8e1d
1 changed files with 6 additions and 1 deletions
  1. 6 1
      msm/sde/sde_kms.c

+ 6 - 1
msm/sde/sde_kms.c

@@ -750,7 +750,7 @@ no_ops:
 	return 0;
 }
 
-static int _sde_kms_release_shared_buffer(unsigned int mem_addr,
+static int _sde_kms_release_shared_buffer(unsigned long mem_addr,
 					unsigned int splash_buffer_size,
 					unsigned int ramdump_base,
 					unsigned int ramdump_buffer_size)
@@ -773,11 +773,16 @@ static int _sde_kms_release_shared_buffer(unsigned int mem_addr,
 	pfn_start = mem_addr >> PAGE_SHIFT;
 	pfn_end = (mem_addr + splash_buffer_size) >> PAGE_SHIFT;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
+	memblock_free((unsigned int*)mem_addr, splash_buffer_size);
+#else
 	ret = memblock_free(mem_addr, splash_buffer_size);
 	if (ret) {
 		SDE_ERROR("continuous splash memory free failed:%d\n", ret);
 		return ret;
 	}
+#endif
+
 	for (pfn_idx = pfn_start; pfn_idx < pfn_end; pfn_idx++)
 		free_reserved_page(pfn_to_page(pfn_idx));