Commit a09d9a80 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: avoid including intel_drv.h via i915_drv.h->i915_trace.h



Disentangle i915_drv.h from intel_drv.h, which gets included via
i915_trace.h. This necessitates including i915_trace.h wherever it's
needed.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ed82bf259d3b725a1a1a3c3e9d6fb5c08bc4d489.1565085691.git.jani.nikula@intel.com
parent d0d392a8
......@@ -35,6 +35,7 @@
#include <drm/drm_fourcc.h>
#include <drm/drm_plane_helper.h>
#include "i915_trace.h"
#include "intel_atomic_plane.h"
#include "intel_drv.h"
#include "intel_pm.h"
......
......@@ -44,6 +44,7 @@
#include "i915_debugfs.h"
#include "i915_drv.h"
#include "i915_trace.h"
#include "intel_atomic.h"
#include "intel_audio.h"
#include "intel_connector.h"
......
......@@ -26,6 +26,7 @@
*/
#include "i915_drv.h"
#include "i915_trace.h"
#include "intel_drv.h"
#include "intel_fbc.h"
#include "intel_fifo_underrun.h"
......
......@@ -40,6 +40,7 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "i915_trace.h"
#include "intel_atomic_plane.h"
#include "intel_drv.h"
#include "intel_frontbuffer.h"
......
......@@ -8,6 +8,7 @@
#include "i915_drv.h"
#include "i915_gem_clflush.h"
#include "i915_trace.h"
static DEFINE_SPINLOCK(clflush_lock);
......
......@@ -13,6 +13,7 @@
#include "i915_gem_gtt.h"
#include "i915_gem_ioctls.h"
#include "i915_gem_object.h"
#include "i915_trace.h"
#include "i915_vma.h"
#include "intel_drv.h"
......
......@@ -29,6 +29,7 @@
#include "i915_gem_context.h"
#include "i915_gem_object.h"
#include "i915_globals.h"
#include "i915_trace.h"
static struct i915_global_object {
struct i915_global base;
......
......@@ -10,6 +10,7 @@
#include "i915_drv.h"
#include "i915_gem_object.h"
#include "i915_scatterlist.h"
#include "i915_trace.h"
/*
* Move pages to appropriate lru and release the pagevec, decrementing the
......
......@@ -27,6 +27,7 @@
#include <uapi/linux/sched/types.h>
#include "i915_drv.h"
#include "i915_trace.h"
static void irq_enable(struct intel_engine_cs *engine)
{
......
......@@ -136,6 +136,7 @@
#include "gem/i915_gem_context.h"
#include "i915_drv.h"
#include "i915_trace.h"
#include "i915_vgpu.h"
#include "intel_engine_pm.h"
#include "intel_gt.h"
......
......@@ -33,6 +33,7 @@
#include "intel_guc_submission.h"
#include "i915_drv.h"
#include "i915_trace.h"
enum {
GUC_PREEMPT_NONE = 0,
......
......@@ -44,6 +44,7 @@
#include "i915_debugfs.h"
#include "i915_irq.h"
#include "i915_trace.h"
#include "intel_csr.h"
#include "intel_drv.h"
#include "intel_pm.h"
......
......@@ -91,6 +91,7 @@
#include "i915_scheduler.h"
#include "gt/intel_timeline.h"
#include "i915_vma.h"
#include "i915_irq.h"
#include "intel_gvt.h"
......@@ -2352,8 +2353,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
#define HAS_DISPLAY(dev_priv) (INTEL_INFO(dev_priv)->num_pipes > 0)
#include "i915_trace.h"
static inline bool intel_vtd_active(void)
{
#ifdef CONFIG_INTEL_IOMMU
......
......@@ -28,6 +28,8 @@
#include <linux/bug.h>
#include <linux/interrupt.h>
#include <drm/drm_drv.h>
struct drm_i915_private;
#ifdef CONFIG_DRM_I915_DEBUG_GEM
......
......@@ -35,6 +35,7 @@
#include "i915_active.h"
#include "i915_drv.h"
#include "i915_globals.h"
#include "i915_trace.h"
#include "intel_pm.h"
struct execute_cb {
......
......@@ -32,6 +32,7 @@
#include "i915_drv.h"
#include "i915_globals.h"
#include "i915_trace.h"
#include "i915_vma.h"
static struct i915_global_vma {
......
......@@ -39,6 +39,7 @@
#include "i915_drv.h"
#include "i915_irq.h"
#include "i915_trace.h"
#include "intel_drv.h"
#include "intel_pm.h"
#include "intel_sideband.h"
......
......@@ -32,6 +32,7 @@
#include <drm/drm_print.h>
#include "i915_drv.h"
#include "i915_trace.h"
/**
* DOC: runtime pm
......
......@@ -25,6 +25,7 @@
#include <asm/iosf_mbi.h>
#include "i915_drv.h"
#include "i915_trace.h"
#include "i915_vgpu.h"
#include "intel_drv.h"
#include "intel_pm.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment