Revert "msm: iommu: Split rotator/mdp iommu domains"
This reverts commit 9ae9beaf0a79f929c4f9928b8daed5a9ed131d6a.
Change-Id: Ie93cbb23eaa1e35bfbacc53cd18f05b345acea4b
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index cf415d8..4e01899 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -2588,15 +2588,15 @@
.name = "jpegd_dst",
.domain = CAMERA_DOMAIN,
},
- /* Rotator src*/
+ /* Rotator */
{
.name = "rot_src",
- .domain = ROTATOR_SRC_DOMAIN,
+ .domain = ROTATOR_DOMAIN,
},
- /* Rotator dst */
+ /* Rotator */
{
.name = "rot_dst",
- .domain = ROTATOR_DST_DOMAIN,
+ .domain = ROTATOR_DOMAIN,
},
/* Video */
{
@@ -2652,36 +2652,18 @@
},
};
-static struct mem_pool apq8064_display_read_pools[] = {
+static struct mem_pool apq8064_display_pools[] = {
[GEN_POOL] =
- /* One address space for display reads */
+ /* One address space for display */
{
.paddr = SZ_128K,
.size = SZ_2G - SZ_128K,
},
};
-static struct mem_pool apq8064_display_write_pools[] = {
+static struct mem_pool apq8064_rotator_pools[] = {
[GEN_POOL] =
- /* One address space for display writes */
- {
- .paddr = SZ_128K,
- .size = SZ_2G - SZ_128K,
- },
-};
-
-static struct mem_pool apq8064_rotator_src_pools[] = {
- [GEN_POOL] =
- /* One address space for rotator src */
- {
- .paddr = SZ_128K,
- .size = SZ_2G - SZ_128K,
- },
-};
-
-static struct mem_pool apq8064_rotator_dst_pools[] = {
- [GEN_POOL] =
- /* One address space for rotator dst */
+ /* One address space for rotator */
{
.paddr = SZ_128K,
.size = SZ_2G - SZ_128K,
@@ -2697,21 +2679,13 @@
.iova_pools = apq8064_camera_pools,
.npools = ARRAY_SIZE(apq8064_camera_pools),
},
- [DISPLAY_READ_DOMAIN] = {
- .iova_pools = apq8064_display_read_pools,
- .npools = ARRAY_SIZE(apq8064_display_read_pools),
+ [DISPLAY_DOMAIN] = {
+ .iova_pools = apq8064_display_pools,
+ .npools = ARRAY_SIZE(apq8064_display_pools),
},
- [DISPLAY_WRITE_DOMAIN] = {
- .iova_pools = apq8064_display_write_pools,
- .npools = ARRAY_SIZE(apq8064_display_write_pools),
- },
- [ROTATOR_SRC_DOMAIN] = {
- .iova_pools = apq8064_rotator_src_pools,
- .npools = ARRAY_SIZE(apq8064_rotator_src_pools),
- },
- [ROTATOR_DST_DOMAIN] = {
- .iova_pools = apq8064_rotator_dst_pools,
- .npools = ARRAY_SIZE(apq8064_rotator_dst_pools),
+ [ROTATOR_DOMAIN] = {
+ .iova_pools = apq8064_rotator_pools,
+ .npools = ARRAY_SIZE(apq8064_rotator_pools),
},
};
diff --git a/arch/arm/mach-msm/devices-8930.c b/arch/arm/mach-msm/devices-8930.c
index 03685da..c480bba 100644
--- a/arch/arm/mach-msm/devices-8930.c
+++ b/arch/arm/mach-msm/devices-8930.c
@@ -765,12 +765,12 @@
/* Rotator */
{
.name = "rot_src",
- .domain = ROTATOR_SRC_DOMAIN,
+ .domain = ROTATOR_DOMAIN,
},
/* Rotator */
{
.name = "rot_dst",
- .domain = ROTATOR_DST_DOMAIN,
+ .domain = ROTATOR_DOMAIN,
},
/* Video */
{
@@ -826,36 +826,18 @@
},
};
-static struct mem_pool msm8930_display_read_pools[] = {
+static struct mem_pool msm8930_display_pools[] = {
[GEN_POOL] =
- /* One address space for display reads */
+ /* One address space for display */
{
.paddr = SZ_128K,
.size = SZ_2G - SZ_128K,
},
};
-static struct mem_pool msm8930_display_write_pools[] = {
+static struct mem_pool msm8930_rotator_pools[] = {
[GEN_POOL] =
- /* One address space for display writes */
- {
- .paddr = SZ_128K,
- .size = SZ_2G - SZ_128K,
- },
-};
-
-static struct mem_pool msm8930_rotator_src_pools[] = {
- [GEN_POOL] =
- /* One address space for rotator src */
- {
- .paddr = SZ_128K,
- .size = SZ_2G - SZ_128K,
- },
-};
-
-static struct mem_pool msm8930_rotator_dst_pools[] = {
- [GEN_POOL] =
- /* One address space for rotator dst */
+ /* One address space for rotator */
{
.paddr = SZ_128K,
.size = SZ_2G - SZ_128K,
@@ -871,21 +853,13 @@
.iova_pools = msm8930_camera_pools,
.npools = ARRAY_SIZE(msm8930_camera_pools),
},
- [DISPLAY_READ_DOMAIN] = {
- .iova_pools = msm8930_display_read_pools,
- .npools = ARRAY_SIZE(msm8930_display_read_pools),
+ [DISPLAY_DOMAIN] = {
+ .iova_pools = msm8930_display_pools,
+ .npools = ARRAY_SIZE(msm8930_display_pools),
},
- [DISPLAY_WRITE_DOMAIN] = {
- .iova_pools = msm8930_display_write_pools,
- .npools = ARRAY_SIZE(msm8930_display_write_pools),
- },
- [ROTATOR_SRC_DOMAIN] = {
- .iova_pools = msm8930_rotator_src_pools,
- .npools = ARRAY_SIZE(msm8930_rotator_src_pools),
- },
- [ROTATOR_DST_DOMAIN] = {
- .iova_pools = msm8930_rotator_dst_pools,
- .npools = ARRAY_SIZE(msm8930_rotator_dst_pools),
+ [ROTATOR_DOMAIN] = {
+ .iova_pools = msm8930_rotator_pools,
+ .npools = ARRAY_SIZE(msm8930_rotator_pools),
},
};
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 0d417bd..550a283 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -3639,15 +3639,15 @@
.name = "jpegd_dst",
.domain = CAMERA_DOMAIN,
},
- /* Rotator src*/
+ /* Rotator */
{
.name = "rot_src",
- .domain = ROTATOR_SRC_DOMAIN,
+ .domain = ROTATOR_DOMAIN,
},
- /* Rotator dst */
+ /* Rotator */
{
.name = "rot_dst",
- .domain = ROTATOR_DST_DOMAIN,
+ .domain = ROTATOR_DOMAIN,
},
/* Video */
{
@@ -3703,36 +3703,18 @@
},
};
-static struct mem_pool msm8960_display_read_pools[] = {
+static struct mem_pool msm8960_display_pools[] = {
[GEN_POOL] =
- /* One address space for display reads */
+ /* One address space for display */
{
.paddr = SZ_128K,
.size = SZ_2G - SZ_128K,
},
};
-static struct mem_pool msm8960_display_write_pools[] = {
+static struct mem_pool msm8960_rotator_pools[] = {
[GEN_POOL] =
- /* One address space for display writes */
- {
- .paddr = SZ_128K,
- .size = SZ_2G - SZ_128K,
- },
-};
-
-static struct mem_pool msm8960_rotator_src_pools[] = {
- [GEN_POOL] =
- /* One address space for rotator src */
- {
- .paddr = SZ_128K,
- .size = SZ_2G - SZ_128K,
- },
-};
-
-static struct mem_pool msm8960_rotator_dst_pools[] = {
- [GEN_POOL] =
- /* One address space for rotator dst */
+ /* One address space for rotator */
{
.paddr = SZ_128K,
.size = SZ_2G - SZ_128K,
@@ -3748,21 +3730,13 @@
.iova_pools = msm8960_camera_pools,
.npools = ARRAY_SIZE(msm8960_camera_pools),
},
- [DISPLAY_READ_DOMAIN] = {
- .iova_pools = msm8960_display_read_pools,
- .npools = ARRAY_SIZE(msm8960_display_read_pools),
+ [DISPLAY_DOMAIN] = {
+ .iova_pools = msm8960_display_pools,
+ .npools = ARRAY_SIZE(msm8960_display_pools),
},
- [DISPLAY_WRITE_DOMAIN] = {
- .iova_pools = msm8960_display_write_pools,
- .npools = ARRAY_SIZE(msm8960_display_write_pools),
- },
- [ROTATOR_SRC_DOMAIN] = {
- .iova_pools = msm8960_rotator_src_pools,
- .npools = ARRAY_SIZE(msm8960_rotator_src_pools),
- },
- [ROTATOR_DST_DOMAIN] = {
- .iova_pools = msm8960_rotator_dst_pools,
- .npools = ARRAY_SIZE(msm8960_rotator_dst_pools),
+ [ROTATOR_DOMAIN] = {
+ .iova_pools = msm8960_rotator_pools,
+ .npools = ARRAY_SIZE(msm8960_rotator_pools),
},
};
diff --git a/arch/arm/mach-msm/include/mach/iommu_domains.h b/arch/arm/mach-msm/include/mach/iommu_domains.h
index 1d538f2..1a3a022 100644
--- a/arch/arm/mach-msm/include/mach/iommu_domains.h
+++ b/arch/arm/mach-msm/include/mach/iommu_domains.h
@@ -18,10 +18,8 @@
enum {
VIDEO_DOMAIN,
CAMERA_DOMAIN,
- DISPLAY_READ_DOMAIN,
- DISPLAY_WRITE_DOMAIN,
- ROTATOR_SRC_DOMAIN,
- ROTATOR_DST_DOMAIN,
+ DISPLAY_DOMAIN,
+ ROTATOR_DOMAIN,
MAX_DOMAINS
};
diff --git a/arch/arm/mach-msm/subsystem_map.c b/arch/arm/mach-msm/subsystem_map.c
index 5f5a02b..fcb8517 100644
--- a/arch/arm/mach-msm/subsystem_map.c
+++ b/arch/arm/mach-msm/subsystem_map.c
@@ -38,10 +38,8 @@
VIDEO_DOMAIN,
VIDEO_DOMAIN,
CAMERA_DOMAIN,
- DISPLAY_READ_DOMAIN,
- DISPLAY_WRITE_DOMAIN,
- ROTATOR_SRC_DOMAIN,
- ROTATOR_DST_DOMAIN,
+ DISPLAY_DOMAIN,
+ ROTATOR_DOMAIN,
0xFFFFFFFF
};