Commit 926b005c authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: split out display debugfs to a separate file 



The i915_debugfs.c has grown more than a little unwieldy. Split out the
display related debugfs code to a file of its own under display/,
initialized with a separate call. No functional changes.

v2:
- Also moved i915_frontbuffer_tracking, i915_gem_framebuffer,
  i915_power_domain_info, i915_dmc_info, i915_ipc_status (Ville)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
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/20200211161451.6867-2-jani.nikula@intel.com
parent 06d3ff6e

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ i915-$(CONFIG_COMPAT) += i915_ioc32.o 
i915-$(CONFIG_DEBUG_FS) += \

	i915_debugfs.o \

	i915_debugfs_params.o \

	display/intel_display_debugfs.o \

	display/intel_pipe_crc.o

i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o

drivers/gpu/drm/i915/display/intel_display_debugfs.c

0 → 100644
+2120 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/display/intel_display_debugfs.h

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

/*

 * Copyright © 2020 Intel Corporation

 */



#ifndef __INTEL_DISPLAY_DEBUGFS_H__

#define __INTEL_DISPLAY_DEBUGFS_H__



struct drm_connector;

struct drm_i915_private;



#ifdef CONFIG_DEBUG_FS

int intel_display_debugfs_register(struct drm_i915_private *i915);

int intel_connector_debugfs_add(struct drm_connector *connector);

#else

static inline int intel_display_debugfs_register(struct drm_i915_private *i915) { return 0; }

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

#endif



#endif /* __INTEL_DISPLAY_DEBUGFS_H__ */

drivers/gpu/drm/i915/display/intel_dp.c

+2 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include "intel_audio.h"

#include "intel_connector.h"

#include "intel_ddi.h"

#include "intel_display_debugfs.h"

#include "intel_display_types.h"

#include "intel_dp.h"

#include "intel_dp_link_training.h"
@@ -5851,7 +5852,7 @@ intel_dp_connector_register(struct drm_connector *connector) 
	if (ret)

		return ret;



	i915_debugfs_connector_add(connector);

	intel_connector_debugfs_add(connector);



	DRM_DEBUG_KMS("registering %s bus for %s\n",

		      intel_dp->aux.name, connector->kdev->kobj.name);

drivers/gpu/drm/i915/display/intel_hdmi.c

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "intel_audio.h"

#include "intel_connector.h"

#include "intel_ddi.h"

#include "intel_display_debugfs.h"

#include "intel_display_types.h"

#include "intel_dp.h"

#include "intel_dpio_phy.h"
@@ -2818,7 +2819,7 @@ intel_hdmi_connector_register(struct drm_connector *connector) 
	if (ret)

		return ret;



	i915_debugfs_connector_add(connector);

	intel_connector_debugfs_add(connector);



	intel_hdmi_create_i2c_symlink(connector);

CRA Git | Maintained and supported by SUSTech CRA and CCSE