Commit 1bacc894c227fad8a727eb99728df708eba57654

Authored by Oded Gabbay
1 parent 0cb989c0c6

drivers: Move iommu/ before gpu/ in Makefile

AMD GPU devices are dependent on AMD IOMMU controller functionality to allow
the GPU to access a process's virtual memory address space, without the need
for pinning the memory.

This patch changes the order in the drivers makefile, so iommu/ subsystem is
linked before gpu/ subsystem. That way, if the gpu and iommu drivers are
compiled inside the kernel image (not as modules), the correct order of device
loading is still maintained (iommu module is loaded before gpu module).

Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

... ... @@ -50,7 +50,10 @@
50 50 obj-y += tty/
51 51 obj-y += char/
52 52  
53   -# gpu/ comes after char for AGP vs DRM startup
  53 +# iommu/ comes before gpu as gpu are using iommu controllers
  54 +obj-$(CONFIG_IOMMU_SUPPORT) += iommu/
  55 +
  56 +# gpu/ comes after char for AGP vs DRM startup and after iommu
54 57 obj-y += gpu/
55 58  
56 59 obj-$(CONFIG_CONNECTOR) += connector/
... ... @@ -141,7 +144,6 @@
141 144  
142 145 obj-$(CONFIG_MAILBOX) += mailbox/
143 146 obj-$(CONFIG_HWSPINLOCK) += hwspinlock/
144   -obj-$(CONFIG_IOMMU_SUPPORT) += iommu/
145 147 obj-$(CONFIG_REMOTEPROC) += remoteproc/
146 148 obj-$(CONFIG_RPMSG) += rpmsg/
147 149