Skip to contentSkip to conversation

drm/msm: Fix link error with !MSM_IOMMU

PATCH In review Joerg Roedel 2 participants 5 messages Jan 7, 2014 – Jan 8, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/msm: Fix link error with !MSM_IOMMU

The DRM driver for MSM depends on symbols from the MSM IOMMU driver. Add this dependency to the Kconfig file.

Fixes this comile error:

Kernel: arch/arm/boot/zImage is ready
ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko] undefined!
make[2]: *** [__modpost] Error 1

---
 drivers/gpu/drm/msm/Kconfig |    1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/msm/Kconfig +1 -0
index f39ab75..d3de8e1 100644
@@ -4,6 +4,7 @@ config DRM_MSM
 	depends on DRM
 	depends on ARCH_MSM
 	depends on ARCH_MSM8960
+	depends on MSM_IOMMU
 	select DRM_KMS_HELPER
 	select SHMEM
 	select TMPFS
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 21 lines · Joerg Roedel

The DRM driver for MSM depends on symbols from the MSM IOMMU driver. Add this dependency to the Kconfig file.

Fixes this comile error:

Kernel: arch/arm/boot/zImage is ready
ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko] undefined!
make[2]: *** [__modpost] Error 1

---
 drivers/gpu/drm/msm/Kconfig |    1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/msm/Kconfig +0 -0
index f39ab75..d3de8e1 100644

drivers/gpu/drm/msm/Kconfig config DRM_MSM · line 10

Quoted 7 lines
drivers/gpu/drm/msm/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_MSM
 	depends on DRM
 	depends on ARCH_MSM
 	depends on ARCH_MSM8960
+	depends on MSM_IOMMU
 	select DRM_KMS_HELPER
 	select SHMEM
 	select TMPFS

FYI, I put the patch to my arm/msm branch meanwhile to get the build error fixed. Please let me know when there is another solution merged and I will drop it.

Joerg

#2 lore raw
Quoted 10 lines · Joerg Roedel
Quoted 9 lines · Joerg Roedel

The DRM driver for MSM depends on symbols from the MSM IOMMU driver. Add this dependency to the Kconfig file.

Fixes this comile error:

Kernel: arch/arm/boot/zImage is ready
ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko] undefined!
make[2]: *** [__modpost] Error 1

Thanks, I'll pull this into my pull req for 3.14 drm-next.. although, after chatting with Stephen Boyd, I think we should eventually be able to get rid of this (seems msm_iommu_get_ctx() was mainly for dealing with secure playback (?))

BR,
-R

Quoted 28 lines
Quoted 12 lines
---
 drivers/gpu/drm/msm/Kconfig |    1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/msm/Kconfig +0 -0
index f39ab75..d3de8e1 100644

drivers/gpu/drm/msm/Kconfig config DRM_MSM · line 10

Quoted 7 lines
drivers/gpu/drm/msm/Kconfig +1 -0
@@ -4,6 +4,7 @@ config DRM_MSM
      depends on DRM
      depends on ARCH_MSM
      depends on ARCH_MSM8960
+     depends on MSM_IOMMU
      select DRM_KMS_HELPER
      select SHMEM
      select TMPFS

FYI, I put the patch to my arm/msm branch meanwhile to get the build error fixed. Please let me know when there is another solution merged and I will drop it.

Joerg

#3 lore raw
Quoted 12 lines · Rob Clark
Quoted 10 lines · Joerg Roedel
Quoted 9 lines · Joerg Roedel

The DRM driver for MSM depends on symbols from the MSM IOMMU driver. Add this dependency to the Kconfig file.

Fixes this comile error:

Kernel: arch/arm/boot/zImage is ready
ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko] undefined!
make[2]: *** [__modpost] Error 1

Quoted 4 lines

Thanks, I'll pull this into my pull req for 3.14 drm-next.. although, after chatting with Stephen Boyd, I think we should eventually be able to get rid of this (seems msm_iommu_get_ctx() was mainly for dealing with secure playback (?))

It is already in my next-branch. So if you are ok with the approach for now there is no need for action. If you want it to go through your tree anyway please let me know and I will drop it from mine.

Joerg

#4 lore raw
Quoted 13 lines · Joerg Roedel
Quoted 12 lines · Rob Clark
Quoted 10 lines · Joerg Roedel
Quoted 9 lines · Joerg Roedel

The DRM driver for MSM depends on symbols from the MSM IOMMU driver. Add this dependency to the Kconfig file.

Fixes this comile error:

Kernel: arch/arm/boot/zImage is ready
ERROR: "msm_iommu_get_ctx" [drivers/gpu/drm/msm/msm.ko] undefined!
make[2]: *** [__modpost] Error 1

Quoted 8 lines
Quoted 4 lines

Thanks, I'll pull this into my pull req for 3.14 drm-next.. although, after chatting with Stephen Boyd, I think we should eventually be able to get rid of this (seems msm_iommu_get_ctx() was mainly for dealing with secure playback (?))

It is already in my next-branch. So if you are ok with the approach for now there is no need for action. If you want it to go through your tree anyway please let me know and I will drop it from mine.

probably will be a slight merge conflict if it goes through your branch.. although should be easy enough to resolve, basically the result should look something like:

  depends on (ARCH_MSM && ARCH_MSM8960 && MSM_IOMMU) || (ARM && COMPILE_TEST)

BR,
-R

Quoted 4 lines

Joerg