Commit 5ed7a0cf authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Move OA files to separate folder 



OA files look to be auto-generated so we can keep them all in
dedicated subdirectory.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190626123826.39760-1-michal.wajdeczko@intel.com
parent 63c9dae7

drivers/gpu/drm/i915/Makefile

+19 −17
Original line number Diff line number Diff line
@@ -212,6 +212,25 @@ i915-y += \ 
	display/vlv_dsi.o \

	display/vlv_dsi_pll.o



# perf code

obj-y += oa/

i915-y += \

	oa/i915_oa_hsw.o \

	oa/i915_oa_bdw.o \

	oa/i915_oa_chv.o \

	oa/i915_oa_sklgt2.o \

	oa/i915_oa_sklgt3.o \

	oa/i915_oa_sklgt4.o \

	oa/i915_oa_bxt.o \

	oa/i915_oa_kblgt2.o \

	oa/i915_oa_kblgt3.o \

	oa/i915_oa_glk.o \

	oa/i915_oa_cflgt2.o \

	oa/i915_oa_cflgt3.o \

	oa/i915_oa_cnl.o \

	oa/i915_oa_icl.o

i915-y += i915_perf.o



# Post-mortem debug and GPU hang state capture

i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o

i915-$(CONFIG_DRM_I915_SELFTEST) += \
@@ -226,23 +245,6 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ 
# virtual gpu code

i915-y += i915_vgpu.o



# perf code

i915-y += i915_perf.o \

	  i915_oa_hsw.o \

	  i915_oa_bdw.o \

	  i915_oa_chv.o \

	  i915_oa_sklgt2.o \

	  i915_oa_sklgt3.o \

	  i915_oa_sklgt4.o \

	  i915_oa_bxt.o \

	  i915_oa_kblgt2.o \

	  i915_oa_kblgt3.o \

	  i915_oa_glk.o \

	  i915_oa_cflgt2.o \

	  i915_oa_cflgt3.o \

	  i915_oa_cnl.o \

	  i915_oa_icl.o



ifeq ($(CONFIG_DRM_I915_GVT),y)

i915-y += intel_gvt.o

include $(src)/gvt/Makefile

drivers/gpu/drm/i915/i915_perf.c

+14 −14
Original line number Diff line number Diff line
@@ -200,20 +200,20 @@ 
#include "gt/intel_lrc_reg.h"



#include "i915_drv.h"

#include "i915_oa_hsw.h"

#include "i915_oa_bdw.h"

#include "i915_oa_chv.h"

#include "i915_oa_sklgt2.h"

#include "i915_oa_sklgt3.h"

#include "i915_oa_sklgt4.h"

#include "i915_oa_bxt.h"

#include "i915_oa_kblgt2.h"

#include "i915_oa_kblgt3.h"

#include "i915_oa_glk.h"

#include "i915_oa_cflgt2.h"

#include "i915_oa_cflgt3.h"

#include "i915_oa_cnl.h"

#include "i915_oa_icl.h"

#include "oa/i915_oa_hsw.h"

#include "oa/i915_oa_bdw.h"

#include "oa/i915_oa_chv.h"

#include "oa/i915_oa_sklgt2.h"

#include "oa/i915_oa_sklgt3.h"

#include "oa/i915_oa_sklgt4.h"

#include "oa/i915_oa_bxt.h"

#include "oa/i915_oa_kblgt2.h"

#include "oa/i915_oa_kblgt3.h"

#include "oa/i915_oa_glk.h"

#include "oa/i915_oa_cflgt2.h"

#include "oa/i915_oa_cflgt3.h"

#include "oa/i915_oa_cnl.h"

#include "oa/i915_oa_icl.h"



/* HW requires this to be a power of two, between 128k and 16M, though driver

 * is currently generally designed assuming the largest 16M size is used such

drivers/gpu/drm/i915/oa/Makefile

0 → 100644
+0 −0

Empty file added.