diff options
| author | Kuehling, Felix <Felix.Kuehling@amd.com> | 2018-12-07 17:07:20 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-12-07 17:53:47 -0500 |
| commit | 5634e38cda7ba47f9e0f372cf1e1729a845d3348 (patch) | |
| tree | a17fb3ee55da53aa5b4182b10ec0b25472166d95 /drivers/gpu/drm/amd/amdgpu | |
| parent | 9ed9203c3ee7acd3f6e2acb3f1f691366847c8b5 (diff) | |
drm/amdgpu: Workaround build failure due to trace conflict
Avoid including mmu_context.h in amdgpu_amdkfd.h since that may be
included in other header files that define traces. This leads to
conflicts due to traces defined in other headers included via
mmu_context.h.
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
4 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h index bcf587b4ba98..86cf1a432ad4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
| 30 | #include <linux/mmu_context.h> | ||
| 31 | #include <linux/workqueue.h> | 30 | #include <linux/workqueue.h> |
| 32 | #include <kgd_kfd_interface.h> | 31 | #include <kgd_kfd_interface.h> |
| 33 | #include <drm/ttm/ttm_execbuf_util.h> | 32 | #include <drm/ttm/ttm_execbuf_util.h> |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c index 72a357dae070..ff7fac7df34b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/fdtable.h> | 23 | #include <linux/fdtable.h> |
| 24 | #include <linux/uaccess.h> | 24 | #include <linux/uaccess.h> |
| 25 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
| 26 | #include <linux/mmu_context.h> | ||
| 26 | #include <drm/drmP.h> | 27 | #include <drm/drmP.h> |
| 27 | #include "amdgpu.h" | 28 | #include "amdgpu.h" |
| 28 | #include "amdgpu_amdkfd.h" | 29 | #include "amdgpu_amdkfd.h" |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c index 0e2a56b6a9b6..56ea929f524b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/fdtable.h> | 24 | #include <linux/fdtable.h> |
| 25 | #include <linux/uaccess.h> | 25 | #include <linux/uaccess.h> |
| 26 | #include <linux/firmware.h> | 26 | #include <linux/firmware.h> |
| 27 | #include <linux/mmu_context.h> | ||
| 27 | #include <drm/drmP.h> | 28 | #include <drm/drmP.h> |
| 28 | #include "amdgpu.h" | 29 | #include "amdgpu.h" |
| 29 | #include "amdgpu_amdkfd.h" | 30 | #include "amdgpu_amdkfd.h" |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c index 03b604c96d94..5c51d4910650 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/fdtable.h> | 26 | #include <linux/fdtable.h> |
| 27 | #include <linux/uaccess.h> | 27 | #include <linux/uaccess.h> |
| 28 | #include <linux/firmware.h> | 28 | #include <linux/firmware.h> |
| 29 | #include <linux/mmu_context.h> | ||
| 29 | #include <drm/drmP.h> | 30 | #include <drm/drmP.h> |
| 30 | #include "amdgpu.h" | 31 | #include "amdgpu.h" |
| 31 | #include "amdgpu_amdkfd.h" | 32 | #include "amdgpu_amdkfd.h" |