Skip to content

Commit

Permalink
drivers: Move iommu/ before gpu/ in Makefile
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Oded Gabbay committed Dec 22, 2014
1 parent 0cb989c commit 1bacc89
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ obj-$(CONFIG_RESET_CONTROLLER) += reset/
obj-y += tty/
obj-y += char/

# gpu/ comes after char for AGP vs DRM startup
# iommu/ comes before gpu as gpu are using iommu controllers
obj-$(CONFIG_IOMMU_SUPPORT) += iommu/

# gpu/ comes after char for AGP vs DRM startup and after iommu
obj-y += gpu/

obj-$(CONFIG_CONNECTOR) += connector/
Expand Down Expand Up @@ -141,7 +144,6 @@ obj-y += clk/

obj-$(CONFIG_MAILBOX) += mailbox/
obj-$(CONFIG_HWSPINLOCK) += hwspinlock/
obj-$(CONFIG_IOMMU_SUPPORT) += iommu/
obj-$(CONFIG_REMOTEPROC) += remoteproc/
obj-$(CONFIG_RPMSG) += rpmsg/

Expand Down

0 comments on commit 1bacc89

Please sign in to comment.