Commit 5634e38c authored by Kuehling, Felix's avatar Kuehling, Felix Committed by Alex Deucher
Browse files

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: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9ed9203c

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


#include <linux/types.h>

#include <linux/mm.h>

#include <linux/mmu_context.h>

#include <linux/workqueue.h>

#include <kgd_kfd_interface.h>

#include <drm/ttm/ttm_execbuf_util.h>

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/fdtable.h>

#include <linux/uaccess.h>

#include <linux/firmware.h>

#include <linux/mmu_context.h>

#include <drm/drmP.h>

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/fdtable.h>

#include <linux/uaccess.h>

#include <linux/firmware.h>

#include <linux/mmu_context.h>

#include <drm/drmP.h>

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/fdtable.h>

#include <linux/uaccess.h>

#include <linux/firmware.h>

#include <linux/mmu_context.h>

#include <drm/drmP.h>

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE