提交 5ed7a0cf 编写于 作者: M Michal Wajdeczko 提交者: Chris Wilson

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: NMichal 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: NChris Wilson <chris@chris-wilson.co.uk>
Acked-by: NLionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: NJani Nikula <jani.nikula@intel.com>
Reviewed-by: NUmesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190626123826.39760-1-michal.wajdeczko@intel.com
上级 63c9dae7
...@@ -212,6 +212,25 @@ i915-y += \ ...@@ -212,6 +212,25 @@ i915-y += \
display/vlv_dsi.o \ display/vlv_dsi.o \
display/vlv_dsi_pll.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 # Post-mortem debug and GPU hang state capture
i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
i915-$(CONFIG_DRM_I915_SELFTEST) += \ i915-$(CONFIG_DRM_I915_SELFTEST) += \
...@@ -226,23 +245,6 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ ...@@ -226,23 +245,6 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \
# virtual gpu code # virtual gpu code
i915-y += i915_vgpu.o 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) ifeq ($(CONFIG_DRM_I915_GVT),y)
i915-y += intel_gvt.o i915-y += intel_gvt.o
include $(src)/gvt/Makefile include $(src)/gvt/Makefile
......
...@@ -200,20 +200,20 @@ ...@@ -200,20 +200,20 @@
#include "gt/intel_lrc_reg.h" #include "gt/intel_lrc_reg.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_oa_hsw.h" #include "oa/i915_oa_hsw.h"
#include "i915_oa_bdw.h" #include "oa/i915_oa_bdw.h"
#include "i915_oa_chv.h" #include "oa/i915_oa_chv.h"
#include "i915_oa_sklgt2.h" #include "oa/i915_oa_sklgt2.h"
#include "i915_oa_sklgt3.h" #include "oa/i915_oa_sklgt3.h"
#include "i915_oa_sklgt4.h" #include "oa/i915_oa_sklgt4.h"
#include "i915_oa_bxt.h" #include "oa/i915_oa_bxt.h"
#include "i915_oa_kblgt2.h" #include "oa/i915_oa_kblgt2.h"
#include "i915_oa_kblgt3.h" #include "oa/i915_oa_kblgt3.h"
#include "i915_oa_glk.h" #include "oa/i915_oa_glk.h"
#include "i915_oa_cflgt2.h" #include "oa/i915_oa_cflgt2.h"
#include "i915_oa_cflgt3.h" #include "oa/i915_oa_cflgt3.h"
#include "i915_oa_cnl.h" #include "oa/i915_oa_cnl.h"
#include "i915_oa_icl.h" #include "oa/i915_oa_icl.h"
/* HW requires this to be a power of two, between 128k and 16M, though driver /* 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 * is currently generally designed assuming the largest 16M size is used such
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册