Commit 2126d3e9 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: extract i915_debugfs.h from i915_drv.h 



It used to be handy that we only had a couple of headers, but over time
i915_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.

No functional changes.

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/2843b028d65e118dc40316aa84bf620a93f6c67b.1556809195.git.jani.nikula@intel.com
parent 4e49d35c

drivers/gpu/drm/i915/Makefile.header-test

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
# Test the headers are compilable as standalone units

header_test := \

	i915_active_types.h \

	i915_debugfs.h \

	i915_drv.h \

	i915_gem_context_types.h \

	i915_gem_pm.h \

drivers/gpu/drm/i915/i915_debugfs.c

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


#include "gt/intel_reset.h"



#include "i915_debugfs.h"

#include "i915_gem_context.h"

#include "i915_irq.h"

#include "intel_csr.h"

drivers/gpu/drm/i915/i915_debugfs.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2019 Intel Corporation

 */



#ifndef __I915_DEBUGFS_H__

#define __I915_DEBUGFS_H__



struct drm_i915_private;

struct drm_connector;



#ifdef CONFIG_DEBUG_FS

int i915_debugfs_register(struct drm_i915_private *dev_priv);

int i915_debugfs_connector_add(struct drm_connector *connector);

#else

static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) { return 0; }

static inline int i915_debugfs_connector_add(struct drm_connector *connector) { return 0; }

#endif



#endif /* __I915_DEBUGFS_H__ */

drivers/gpu/drm/i915/i915_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "gt/intel_reset.h"

#include "gt/intel_workarounds.h"



#include "i915_debugfs.h"

#include "i915_drv.h"

#include "i915_irq.h"

#include "i915_pmu.h"
@@ -66,6 +67,7 @@ 
#include "intel_fbdev.h"

#include "intel_hotplug.h"

#include "intel_overlay.h"

#include "intel_pipe_crc.h"

#include "intel_pm.h"

#include "intel_sprite.h"

#include "intel_uc.h"

drivers/gpu/drm/i915/i915_drv.h

+0 −12
Original line number Diff line number Diff line
@@ -3208,18 +3208,6 @@ u32 i915_gem_fence_size(struct drm_i915_private *dev_priv, u32 size, 
u32 i915_gem_fence_alignment(struct drm_i915_private *dev_priv, u32 size,

			     unsigned int tiling, unsigned int stride);



/* i915_debugfs.c */

#ifdef CONFIG_DEBUG_FS

int i915_debugfs_register(struct drm_i915_private *dev_priv);

int i915_debugfs_connector_add(struct drm_connector *connector);

void intel_display_crc_init(struct drm_i915_private *dev_priv);

#else

static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) {return 0;}

static inline int i915_debugfs_connector_add(struct drm_connector *connector)

{ return 0; }

static inline void intel_display_crc_init(struct drm_i915_private *dev_priv) {}

#endif



const char *i915_cache_level_str(struct drm_i915_private *i915, int type);



/* i915_cmd_parser.c */

CRA Git | Maintained and supported by SUSTech CRA and CCSE