summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi6
-rw-r--r--arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts12
-rw-r--r--arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts7
-rw-r--r--arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi12
-rw-r--r--arch/arm64/configs/msm-auto-gvm-perf_defconfig2
-rw-r--r--arch/arm64/configs/msm-auto-gvm_defconfig2
-rw-r--r--drivers/gpu/drm/drm_mm.c11
-rw-r--r--drivers/gpu/drm/msm/msm_gem.c2
-rw-r--r--drivers/gpu/drm/msm/msm_gem_vma.c2
9 files changed, 34 insertions, 22 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi
index 045cc44b2d4c..8f7773a87816 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi
@@ -27,11 +27,5 @@
memory-region = <&qseecom_mem>;
qcom,ion-heap-type = "DMA";
};
-
- qcom,ion-heap@28 { /* Audio Heap */
- reg = <28>;
- memory-region = <&ion_audio>;
- qcom,ion-heap-type = "CARVEOUT";
- };
};
};
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts
index 7543950c9cef..f4ddc20e4488 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts
@@ -41,3 +41,15 @@
&blsp1_uart2 {
status = "okay";
};
+
+&reserved_memory {
+ pmem_shared: pmem_shared_region@d0000000 {
+ reg = <0 0xd0000000 0 0x20000000>;
+ label = "pmem_shared_mem";
+ };
+
+ ion_system: ion_system_region@100000000 {
+ reg = <0x1 0x0 0 0x10000000>;
+ label = "ion_system_mem";
+ };
+};
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts
index 9057fb315c65..18821889b150 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts
@@ -34,11 +34,13 @@
no-map;
reg = <0 0x88800000 0 0x6200000>;
};
+
peripheral_mem: peripheral_region@8ea00000 {
compatible = "removed-dma-pool";
no-map;
reg = <0 0x8ea00000 0 0x2b00000>;
};
+
adsp_mem: adsp_region {
compatible = "shared-dma-pool";
alloc-ranges = <0 0x00000000 0 0xffffffff>;
@@ -46,6 +48,11 @@
alignment = <0 0x100000>;
size = <0 0x400000>;
};
+
+ ion_system: ion_system_region@ff000000 {
+ reg = <0 0xff000000 0 0x00400000>;
+ label = "ion_system_mem";
+ };
};
&soc {
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi
index 5ec05c8011d2..aa20c781175c 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi
@@ -35,14 +35,6 @@
#size-cells = <2>;
ranges;
- pmem_shared: pmem_shared_region {
- reg = <0 0xd0000000 0 0x20000000>;
- label = "pmem_shared_mem";
- };
- ion_system: ion_system_region {
- reg = <0x1 0x0 0 0x10000000>;
- label = "ion_system_mem";
- };
qseecom_mem: qseecom_region {
compatible = "shared-dma-pool";
alloc-ranges = <0 0x00000000 0 0xffffffff>;
@@ -50,10 +42,6 @@
alignment = <0 0x400000>;
size = <0 0x1400000>;
};
- ion_audio: ion_audio_region {
- reg = <0 0xc8000000 0 0x00400000>;
- label = "ion_audio_mem";
- };
};
};
diff --git a/arch/arm64/configs/msm-auto-gvm-perf_defconfig b/arch/arm64/configs/msm-auto-gvm-perf_defconfig
index 422309bf0ee4..969fc6b7e859 100644
--- a/arch/arm64/configs/msm-auto-gvm-perf_defconfig
+++ b/arch/arm64/configs/msm-auto-gvm-perf_defconfig
@@ -273,6 +273,8 @@ CONFIG_MSM_SMP2P_TEST=y
CONFIG_MSM_QMI_INTERFACE=y
CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y
+CONFIG_QCOM_WATCHDOG_V2=y
+CONFIG_QCOM_MEMORY_DUMP_V2=y
CONFIG_MSM_BOOT_STATS=y
CONFIG_MSM_BOOT_TIME_MARKER=y
CONFIG_MSM_SUBSYSTEM_RESTART=y
diff --git a/arch/arm64/configs/msm-auto-gvm_defconfig b/arch/arm64/configs/msm-auto-gvm_defconfig
index d79a2f74db08..c5d68e6e2d58 100644
--- a/arch/arm64/configs/msm-auto-gvm_defconfig
+++ b/arch/arm64/configs/msm-auto-gvm_defconfig
@@ -279,6 +279,8 @@ CONFIG_MSM_SMP2P_TEST=y
CONFIG_MSM_QMI_INTERFACE=y
CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y
+CONFIG_QCOM_WATCHDOG_V2=y
+CONFIG_QCOM_MEMORY_DUMP_V2=y
CONFIG_MSM_BOOT_STATS=y
CONFIG_MSM_BOOT_TIME_MARKER=y
CONFIG_MSM_SUBSYSTEM_RESTART=y
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index 6e4dd62d4ed9..dbf263d3511b 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -541,6 +541,9 @@ static struct drm_mm_node *get_first_hole(const struct drm_mm *mm,
if (flags & DRM_MM_SEARCH_BOTTOM_UP) {
struct rb_node *node = rb_first(&mm->holes_tree);
+ if (!node)
+ return NULL;
+
return rb_entry(node, struct drm_mm_node, hole_node);
} else if (flags & DRM_MM_SEARCH_BELOW) {
return list_entry((mm)->hole_stack.prev,
@@ -555,8 +558,12 @@ static struct drm_mm_node *get_next_hole(struct drm_mm_node *entry,
enum drm_mm_search_flags flags)
{
if (flags & DRM_MM_SEARCH_BOTTOM_UP) {
- return rb_entry(rb_next(&entry->hole_node),
- struct drm_mm_node, hole_node);
+ struct rb_node *node = rb_next(&entry->hole_node);
+
+ if (!node)
+ return NULL;
+
+ return rb_entry(node, struct drm_mm_node, hole_node);
} else if (flags & DRM_MM_SEARCH_BELOW) {
return list_entry(entry->hole_stack.prev,
struct drm_mm_node, hole_stack);
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index d66071672c62..3610c8fca5f3 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -585,7 +585,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj,
obj_remove_domain(domain);
mutex_unlock(&msm_obj->lock);
- return 0;
+ return ret;
}
/* get iova without taking a reference, used in places where you have
diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c
index f399d24019e4..a5a768a63858 100644
--- a/drivers/gpu/drm/msm/msm_gem_vma.c
+++ b/drivers/gpu/drm/msm/msm_gem_vma.c
@@ -60,7 +60,7 @@ msm_gem_address_space_new(struct msm_mmu *mmu, const char *name,
if (aspace->va_len)
drm_mm_init(&aspace->mm, (start >> PAGE_SHIFT),
- (end >> PAGE_SHIFT) - 1);
+ (aspace->va_len >> PAGE_SHIFT));
kref_init(&aspace->kref);
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-27 02:16:10 +0000